diff options
| author | kwm <kwm@FreeBSD.org> | 2014-03-03 05:24:00 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2014-03-03 05:24:00 +0800 |
| commit | 773e04c8da1598afa9c90b48189731caf1117c4b (patch) | |
| tree | 7f62aba85fc6fe8b60c1e555441ec104c3bdc243 /multimedia | |
| parent | d0a2d2389fdecd0070dda72f72b960543b693ce7 (diff) | |
| download | freebsd-ports-gnome-773e04c8da1598afa9c90b48189731caf1117c4b.tar.gz freebsd-ports-gnome-773e04c8da1598afa9c90b48189731caf1117c4b.tar.zst freebsd-ports-gnome-773e04c8da1598afa9c90b48189731caf1117c4b.zip | |
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@tormail.org> [2]
jhibbits@ [3]
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gstreamer-ffmpeg/Makefile | 11 | ||||
| -rw-r--r-- | multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegdec.c | 12 |
2 files changed, 20 insertions, 3 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 15b64a49db78..af015e006fc6 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= liborc-0.4.so:${PORTSDIR}/devel/orc 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-configure="${FFMPEG_CONFIG}" .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: diff --git a/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegdec.c b/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegdec.c new file mode 100644 index 000000000000..3a693fa3113a --- /dev/null +++ b/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegdec.c @@ -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 */ |