aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile2
-rw-r--r--multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S21
-rw-r--r--multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S12
3 files changed, 34 insertions, 1 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index ab17922d5624..772503a8e1bf 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.10.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/:ffmpeg \
http://libav.org/releases/:libav
diff --git a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S
new file mode 100644
index 000000000000..162ebf7011bf
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S
@@ -0,0 +1,21 @@
+--- gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S.orig 2014-11-28 14:36:09 UTC
++++ gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S
+@@ -37,14 +37,16 @@ function ff_ac3_bit_alloc_calc_bap_armv6
+ ldrb r10, [r4], #1
+ 1:
+ ldrsh r9, [r0], #2 @ mask[band]
+- movw r8, #0x1fe0
++ mov r8, #0xff0
+ sub r9, r9, r12 @ - snr_offset
+ mov r11, r10
+ ldrb r10, [r4], #1 @ band_start_tab[band++]
+ subs r9, r9, r5 @ - floor
++ it lt
+ movlt r9, #0
+ cmp r10, r3 @ - end
+- and r9, r9, r8 @ & 0x1fe0
++ and r9, r9, r8, lsl #1 @ & 0x1fe0
++ ite gt
+ subgt r8, r3, r11
+ suble r8, r10, r11
+ add r9, r9, r5 @ + floor => m
diff --git a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S
new file mode 100644
index 000000000000..109c50ce729f
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S
@@ -0,0 +1,12 @@
+--- gst-libs/ext/libav/libavcodec/arm/asm.S.orig 2013-02-02 09:03:32 UTC
++++ gst-libs/ext/libav/libavcodec/arm/asm.S
+@@ -28,6 +28,9 @@
+
+ .syntax unified
+
++ .cpu arm1176jzf-s
++ .fpu vfpv2
++
+ .macro require8 val=1
+ ELF .eabi_attribute 24, \val
+ .endm