diff options
| author | sbruno <sbruno@FreeBSD.org> | 2014-12-06 02:13:21 +0800 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2014-12-06 02:13:21 +0800 |
| commit | 70a10c707b40abfbfedd95e5887bb032e8cdb103 (patch) | |
| tree | e4ad3d3236a385d1b0925bf250102a0a1233eed7 /multimedia | |
| parent | 44f2644adca13ec5e07212ad1fa34f48e9bbd31d (diff) | |
| download | freebsd-ports-gnome-70a10c707b40abfbfedd95e5887bb032e8cdb103.tar.gz freebsd-ports-gnome-70a10c707b40abfbfedd95e5887bb032e8cdb103.tar.zst freebsd-ports-gnome-70a10c707b40abfbfedd95e5887bb032e8cdb103.zip | |
Fixup some asm code to support ARM. Fixes build on ARM platforms.
Bump portrevision to indicate this.
PR: 194186
Submitted by: mikael.urankar@gmail.com
Reviewed by: kwm
Approved by: mentors (implicit)
Diffstat (limited to 'multimedia')
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 |