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

[Koop Mast]

Author: kwm
Date: Sun Mar  2 21:24:00 2014
New Revision: 346807
URL: http://svnweb.freebsd.org/changeset/ports/346807
QAT: https://qat.redports.org/buildarchive/r346807/

Log:
  Only set -fno-force-addr in CFLAGS when the compiler is gcc. [1]
  Enable the mp3 decoder in gst-ffmpeg. [2]
  Fix the build on ppc64 by telling the libav bundled which arch we are on [3]
  
  PR:		ports/187018 [1]
  		ports/181521 [2]
  		ports/183129 [3]
  Submitted by:	truckman@ [1]
  		Jan Beich <jbech at tormail.org> [2]
  		jhibbits@ [3]

Added:
  head/multimedia/gstreamer-ffmpeg/files/
  head/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegdec.c   (contents, props changed)
Modified:
  head/multimedia/gstreamer-ffmpeg/Makefile

Modified: head/multimedia/gstreamer-ffmpeg/Makefile
==============================================================================
--- head/multimedia/gstreamer-ffmpeg/Makefile	Sun Mar  2 21:20:04 2014	(r346806)
+++ head/multimedia/gstreamer-ffmpeg/Makefile	Sun Mar  2 21:24:00 2014	(r346807)
@@ -22,7 +22,7 @@ LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/d
 
 LIBAV_VERSION=	0.7.7
 WRKSRC=		${WRKDIR}/gst-ffmpeg-${PORTVERSION}
-USES=		gmake pkgconfig
+USES=		compiler:features gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
@@ -30,7 +30,6 @@ FFMPEG_CONFIG=	--cc=${CC} \
 		--enable-runtime-cpudetect \
 		--enable-pic
 LDFLAGS+=	-Wl,-Bsymbolic
-CFLAGS+=	-fno-force-addr
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG}
 
 PLIST_SUB=	VERSION="${GST_VERSION}"
@@ -61,10 +60,16 @@ CONFIGURE_ARGS+=	--with-ffmpeg-extra-con
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900033
-
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 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-patch:

Added: head/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegdec.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegdec.c	Sun Mar  2 21:24:00 2014	(r346807)
@@ -0,0 +1,12 @@
+--- ext/ffmpeg/gstffmpegdec.c~
++++ ext/ffmpeg/gstffmpegdec.c
+@@ -3042,9 +3042,6 @@ gst_ffmpegdec_register (GstPlugin * plug
+       case CODEC_ID_SIPR:
+         rank = GST_RANK_SECONDARY;
+         break;
+-      case CODEC_ID_MP3:
+-        rank = GST_RANK_NONE;
+-        break;
+         /* TEMPORARILY DISABLING AC3/EAC3/DTS for 0.10.12 release
+          * due to downmixing failure.
+          * See Bug #608892 for more details */