From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 25 06:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B78E1C6C for ; Sun, 25 Aug 2013 06:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 961082BCC for ; Sun, 25 Aug 2013 06:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7P6o04k002535 for ; Sun, 25 Aug 2013 06:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7P6o0PC002534; Sun, 25 Aug 2013 06:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 25 Aug 2013 06:50:00 GMT Resent-Message-Id: <201308250650.r7P6o0PC002534@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jan Beich Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 66604C60 for ; Sun, 25 Aug 2013 06:48:39 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 53F762BC5 for ; Sun, 25 Aug 2013 06:48:39 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7P6mcsd090729 for ; Sun, 25 Aug 2013 06:48:38 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7P6mc8P090713; Sun, 25 Aug 2013 06:48:38 GMT (envelope-from nobody) Message-Id: <201308250648.r7P6mc8P090713@oldred.freebsd.org> Date: Sun, 25 Aug 2013 06:48:38 GMT From: Jan Beich To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181519: multimedia/gstreamer-ffmpeg: an option to build against system ffmpeg X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Aug 2013 06:50:00 -0000 >Number: 181519 >Category: ports >Synopsis: multimedia/gstreamer-ffmpeg: an option to build against system ffmpeg >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 25 06:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Jan Beich >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: for some reason internal libav doesn't work in my environment even before r325059 >Description: Allow users to build the port against multimedia/ffmpeg (0.7.x API). This makes it possible to choose a custom set of codecs, easier debugging with well-tested/patched ffmpeg version and faster build. >How-To-Repeat: >Fix: --- gst-ffmpeg_system.diff begins here --- Index: multimedia/gstreamer-ffmpeg/Makefile =================================================================== --- multimedia/gstreamer-ffmpeg/Makefile (revision 325092) +++ multimedia/gstreamer-ffmpeg/Makefile (working copy) @@ -6,11 +6,9 @@ PORTNAME= gstreamer PORTVERSION= 0.10.13 PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/:ffmpeg \ - http://libav.org/releases/:libav +MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/:gst PKGNAMESUFFIX= -ffmpeg -DISTFILES= gst-ffmpeg-${PORTVERSION}.tar.bz2:ffmpeg \ - libav-${LIBAV_VERSION}.tar.xz:libav +DISTFILES= gst-ffmpeg-${PORTVERSION}.tar.bz2:gst MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams @@ -17,27 +15,37 @@ COMMENT= GStreamer plug-in for manipulating MPEG v LICENSE= GPLv2 -BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm LIB_DEPENDS= liborc-0.4.so:${PORTSDIR}/devel/orc -LIBAV_VERSION= 0.7.7 -WRKSRC= ${WRKDIR}/gst-ffmpeg-${PORTVERSION} USES= gmake pkgconfig USE_LDCONFIG= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes + +PLIST_SUB= VERSION="${PORTVERSION:R}" + +LIBAV_VERSION= 0.7.7 +WRKSRC= ${WRKDIR}/gst-ffmpeg-${PORTVERSION} + +OPTIONS_DEFINE= FFMPEG +FFMPEG_DESC?= Use system ffmpeg instead of internal libav + +.include + +.if ${PORT_OPTIONS:MFFMPEG} +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+=--with-system-ffmpeg +.else +MASTER_SITES+= http://libav.org/releases/:libav +DISTFILES+= libav-${LIBAV_VERSION}.tar.xz:libav +BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm +CONFIGURE_ARGS+=--with-ffmpeg-extra-configure="${FFMPEG_CONFIG}" 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}" - -PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" -GST_VERSION=${PORTVERSION:C/..$//} - # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") WITH_BUILTIN_VECTOR= yes @@ -56,21 +64,23 @@ WITHOUT_BUILTIN_VECTOR= yes CFLAGS+= -msse .endif -CONFIGURE_ARGS+= --with-ffmpeg-extra-configure="${FFMPEG_CONFIG}" - -.include - .if ${OSVERSION} < 900033 - BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin - +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif -post-patch: +.endif # FFMPEG + +post-extract: @${MV} ${WRKSRC}/gst-libs/ext/libav ${WRKSRC}/gst-libs/ext/libav.old +.if ! ${PORT_OPTIONS:MFFMPEG} @${MV} ${WRKDIR}/libav-${LIBAV_VERSION} ${WRKSRC}/gst-libs/ext/libav @${CP} ${WRKSRC}/gst-libs/ext/libav.old/config.* \ ${WRKSRC}/gst-libs/ext/libav/ +.endif -.include +post-patch: + @${REINPLACE_CMD} '/sleep 15/d' ${WRKSRC}/configure + +.include --- gst-ffmpeg_system.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: