Index: head/multimedia/gstreamer-ffmpeg/Makefile =================================================================== --- head/multimedia/gstreamer-ffmpeg/Makefile (revision 433551) +++ head/multimedia/gstreamer-ffmpeg/Makefile (revision 433552) @@ -1,96 +1,88 @@ # 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= 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:devel/orc PORTSCOUT= limit:0\.10\..* 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:multimedia/ffmpeg0 FFMPEG_CONFIGURE_WITH=system-ffmpeg FFMPEG_VARS_OFF=NOPRECIOUSMAKEVARS=yes # ARCH FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav FFMPEG_BUILD_DEPENDS_OFF=yasm: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 ${ARCH} == aarch64 || ${ARCH} == armv6 -CONFIGURE_ENV+= ASFLAGS=-no-integrated-as -CFLAGS+= -no-integrated-as -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif - .if ! ${PORT_OPTIONS:MFFMPEG} .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 .include 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 (revision 433551) +++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S (revision 433552) @@ -1,25 +1,21 @@ --- gst-libs/ext/libav/libavcodec/arm/asm.S.orig 2013-02-02 09:03:32 UTC +++ gst-libs/ext/libav/libavcodec/arm/asm.S -@@ -26,6 +26,22 @@ - # define ELF @ - #endif +@@ -39,7 +39,6 @@ ELF .eabi_attribute 25, \val + .macro function name, export=0 + .macro endfunc + ELF .size \name, . - \name +- .endfunc + .purgem endfunc + .endm + .text +@@ -48,8 +47,9 @@ ELF .size \name, . - \name + EXTERN_ASM\name: + .endif + ELF .type \name, %function +- .func \name ++ .if \export == 0 + \name: ++ .endif + .endm -+#if HAVE_NEON -+ .arch armv7-a -+#elif HAVE_ARMV6T2 -+ .arch armv6t2 -+#elif HAVE_ARMV6 -+ .arch armv6 -+#elif HAVE_ARMV5TE -+ .arch armv5te -+#endif -+ -+#if HAVE_NEON -+ .fpu neon -+#elif HAVE_ARMVFP -+ .fpu vfp -+#endif -+ - .syntax unified - - .macro require8 val=1 + .macro const name, align=2 Index: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h =================================================================== --- head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h (nonexistent) +++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h (revision 433552) @@ -0,0 +1,20 @@ +--- gst-libs/ext/libav/libavcodec/arm/vp56_arith.h.orig 2017-01-23 16:31:45 UTC ++++ gst-libs/ext/libav/libavcodec/arm/vp56_arith.h +@@ -33,7 +33,7 @@ static inline int vp56_rac_get_prob_armv + + __asm__ ("adds %3, %3, %0 \n" + "cmpcs %7, %4 \n" +- "ldrcsh %2, [%4], #2 \n" ++ "ldrhcs %2, [%4], #2 \n" + "rsb %0, %6, #256 \n" + "smlabb %0, %5, %6, %0 \n" + "rev16cs %2, %2 \n" +@@ -65,7 +65,7 @@ static inline int vp56_rac_get_prob_bran + + __asm__ ("adds %3, %3, %0 \n" + "cmpcs %7, %4 \n" +- "ldrcsh %2, [%4], #2 \n" ++ "ldrhcs %2, [%4], #2 \n" + "rsb %0, %6, #256 \n" + "smlabb %0, %5, %6, %0 \n" + "rev16cs %2, %2 \n" Property changes on: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h ___________________________________________________________________ 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