svn commit: r374072 - in head/multimedia/gstreamer-ffmpeg: . files

[Sean Bruno]

Author: sbruno
Date: Fri Dec  5 18:13:21 2014
New Revision: 374072
URL: https://svnweb.freebsd.org/changeset/ports/374072
QAT: https://qat.redports.org/buildarchive/r374072/

Log:
  Fixup some asm code to support ARM. Fixes build on ARM platforms.
  
  Bump portrevision to indicate this.
  
  PR:		194186
  Submitted by:	mikael.urankar at gmail.com
  Reviewed by:	kwm
  Approved by:	mentors (implicit)

Added:
  head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S   (contents, props changed)
  head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S   (contents, props changed)
Modified:
  head/multimedia/gstreamer-ffmpeg/Makefile

Modified: head/multimedia/gstreamer-ffmpeg/Makefile
==============================================================================
--- head/multimedia/gstreamer-ffmpeg/Makefile	Fri Dec  5 18:10:08 2014	(r374071)
+++ head/multimedia/gstreamer-ffmpeg/Makefile	Fri Dec  5 18:13:21 2014	(r374072)
@@ -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

Added: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S	Fri Dec  5 18:13:21 2014	(r374072)
@@ -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

Added: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S	Fri Dec  5 18:13:21 2014	(r374072)
@@ -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