Index: head/multimedia/gstreamer-ffmpeg/Makefile =================================================================== --- head/multimedia/gstreamer-ffmpeg/Makefile (revision 374071) +++ head/multimedia/gstreamer-ffmpeg/Makefile (revision 374072) @@ -1,96 +1,96 @@ # Created by: Koop Mast # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-ffmpeg/Makefile,v 1.14 2006/07/20 13:40:27 ahze Exp $ 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 PKGNAMESUFFIX= -ffmpeg DISTFILES= gst-ffmpeg-${PORTVERSION}.tar.bz2:ffmpeg MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams LICENSE= GPLv2 LIB_DEPENDS= liborc-0.4.so:${PORTSDIR}/devel/orc LIBAV_VERSION= 0.7.7 WRKSRC= ${WRKDIR}/gst-ffmpeg-${PORTVERSION} USES= compiler:features gmake libtool pkgconfig USE_LDCONFIG= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes PLIST_SUB= VERSION="${PORTVERSION:R}" OPTIONS_DEFINE= FFMPEG FFMPEG_DESC?= Use system ffmpeg instead of internal libav FFMPEG_LIB_DEPENDS=libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 FFMPEG_CONFIGURE_WITH=system-ffmpeg FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav FFMPEG_BUILD_DEPENDS_OFF=yasm:${PORTSDIR}/devel/yasm FFMPEG_LDFLAGS_OFF=-Wl,-Bsymbolic FFMPEG_CONFIGURE_OFF=--with-ffmpeg-extra-configure="${FFMPEG_CONFIG}" FFMPEG_CONFIG= --cc=${CC} \ --enable-runtime-cpudetect \ --enable-pic # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") WITH_BUILTIN_VECTOR= yes .else FFMPEG_CONFIG+= --disable-sse .endif # mmx support .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == "" FFMPEG_CONFIG+= --disable-mmx WITHOUT_BUILTIN_VECTOR= yes .endif # builtin vector, requires mmx and sse .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR) FFMPEG_CFLAGS_OFF+=-msse .endif .include .if ! ${PORT_OPTIONS:MFFMPEG} .if ${OSVERSION} < 900033 || ${ARCH} == ia64 BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .if ${ARCH} == powerpc64 FFMPEG_CONFIG+= --arch=ppc64 .endif .if ${COMPILER_TYPE} == "gcc" CFLAGS+= -fno-force-addr .endif post-extract: @${MV} ${WRKSRC}/gst-libs/ext/libav ${WRKSRC}/gst-libs/ext/libav.old @${MV} ${WRKDIR}/libav-${LIBAV_VERSION} ${WRKSRC}/gst-libs/ext/libav @${CP} ${WRKSRC}/gst-libs/ext/libav.old/config.* \ ${WRKSRC}/gst-libs/ext/libav/ .endif # FFMPEG post-patch: @${REINPLACE_CMD} -Ee '/sleep 15/d; /PKG_CONFIG/\ s/lib(av(format|codec|util)|postproc|swscale)/&0/g' \ ${WRKSRC}/configure @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \ ${WRKSRC}/gst-libs/ext/libav/Makefile \ ${WRKSRC}/gst-libs/ext/libav/common.mak \ ${WRKSRC}/gst-libs/ext/libav/configure \ ${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \ ${WRKSRC}/gst-libs/ext/libav/libavfilter/Makefile .include Index: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S =================================================================== --- head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S (nonexistent) +++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S (revision 374072) @@ -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 Property changes on: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_ac3dsp__armv6.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S =================================================================== --- head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S (nonexistent) +++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S (revision 374072) @@ -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 Property changes on: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property