From owner-svn-ports-head@FreeBSD.ORG Fri Dec 5 18:13:23 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D94AE9F; Fri, 5 Dec 2014 18:13:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED7D791; Fri, 5 Dec 2014 18:13:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB5IDMvL059519; Fri, 5 Dec 2014 18:13:22 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB5IDM9n059516; Fri, 5 Dec 2014 18:13:22 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201412051813.sB5IDM9n059516@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 5 Dec 2014 18:13:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374072 - in head/multimedia/gstreamer-ffmpeg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Dec 2014 18:13:23 -0000 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@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