Bug 187018
| Summary: | [patch] multimedia/gstreamer-ffmpeg fails during configure with clang 3.4 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Don Lewis <truckman> | ||||
| Component: | Individual Port(s) | Assignee: | freebsd-multimedia (Nobody) <multimedia> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Don Lewis
2014-02-25 05:40:01 UTC
Responsible Changed From-To: freebsd-ports-bugs->freebsd-multimedia Over to maintainer (via the GNATS Auto Assign Tool) This is probably a better patch:
Index: Makefile
===================================================================
--- Makefile (revision 345674)
+++ Makefile (working copy)
@@ -22,7 +22,7 @@
LIBAV_VERSION= 0.7.7
WRKSRC= ${WRKDIR}/gst-ffmpeg-${PORTVERSION}
-USES= gmake pkgconfig
+USES= gmake pkgconfig compiler:features
USE_LDCONFIG= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
@@ -30,7 +30,6 @@
--enable-runtime-cpudetect \
--enable-pic
LDFLAGS+= -Wl,-Bsymbolic
-CFLAGS+= -fno-force-addr
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG}
PLIST_SUB= VERSION="${GST_VERSION}"
@@ -67,6 +66,10 @@
.endif
+.if ${COMPILER_TYPE} == "gcc"
+CFLAGS+= -fno-force-addr
+.endif
+
post-patch:
@${MV} ${WRKSRC}/gst-libs/ext/libav ${WRKSRC}/gst-libs/ext/libav.old
@${MV} ${WRKDIR}/libav-${LIBAV_VERSION} ${WRKSRC}/gst-libs/ext/libav
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@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 */ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" Author: kwm Date: Sun Mar 2 21:39:22 2014 New Revision: 346811 URL: http://svnweb.freebsd.org/changeset/ports/346811 QAT: https://qat.redports.org/buildarchive/r346811/ Log: Only set -fno-force-addr in CFLAGS when the compiler is gcc. [1] Fix the build on ppc64 by telling the libav bundled which arch we are on [2] PR: ports/187018 [1] ports/183129 [2] Submitted by: truckman@ [1] jhibbits@ [2] Modified: head/multimedia/gstreamer1-libav/Makefile Modified: head/multimedia/gstreamer1-libav/Makefile ============================================================================== --- head/multimedia/gstreamer1-libav/Makefile Sun Mar 2 21:35:56 2014 (r346810) +++ head/multimedia/gstreamer1-libav/Makefile Sun Mar 2 21:39:22 2014 (r346811) @@ -21,12 +21,11 @@ USE_XZ= yes USE_LDCONFIG= yes USE_GSTREAMER1= yes GNU_CONFIGURE= yes -USES= gmake pkgconfig +USES= compiler:features gmake pkgconfig LIBAV_CONFIG= --cc=${CC} \ --enable-runtime-cpudetect \ --enable-pic LDFLAGS+= -Wl,-Bsymbolic -CFLAGS+= -fno-force-addr PLIST_SUB= VERSION="1.0" @@ -57,6 +56,14 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PO 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-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0/libgstlibav.so _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed thanks |