From owner-svn-ports-all@FreeBSD.ORG Tue Sep 9 07:06:10 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id 3D30D9B8; Tue, 9 Sep 2014 07:06:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28A87AA1; Tue, 9 Sep 2014 07:06:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8976ArJ086031; Tue, 9 Sep 2014 07:06:10 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8976Abo086030; Tue, 9 Sep 2014 07:06:10 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201409090706.s8976Abo086030@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 9 Sep 2014 07:06:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367713 - head/multimedia/gstreamer-ffmpeg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2014 07:06:10 -0000 Author: riggs Date: Tue Sep 9 07:06:09 2014 New Revision: 367713 URL: http://svnweb.freebsd.org/changeset/ports/367713 QAT: https://qat.redports.org/buildarchive/r367713/ Log: - Ensure internal libavcodec builds correct architecture-dependent code - Introduce OPTION to use external ffmpeg instead of its own - Bump PORTREVISION PR: 181519, 181964 Submitted by: jbeich@vfemail.net Modified: head/multimedia/gstreamer-ffmpeg/Makefile Modified: head/multimedia/gstreamer-ffmpeg/Makefile ============================================================================== --- head/multimedia/gstreamer-ffmpeg/Makefile Tue Sep 9 06:16:35 2014 (r367712) +++ head/multimedia/gstreamer-ffmpeg/Makefile Tue Sep 9 07:06:09 2014 (r367713) @@ -4,20 +4,18 @@ PORTNAME= gstreamer PORTVERSION= 0.10.13 -PORTREVISION= 2 +PORTREVISION= 3 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 \ - libav-${LIBAV_VERSION}.tar.xz:libav +DISTFILES= gst-ffmpeg-${PORTVERSION}.tar.bz2:ffmpeg MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams LICENSE= GPLv2 -BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm LIB_DEPENDS= liborc-0.4.so:${PORTSDIR}/devel/orc LIBAV_VERSION= 0.7.7 @@ -26,16 +24,21 @@ USES= compiler:features gmake libtool p 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:${PORTSDIR}/multimedia/ffmpeg0 +FFMPEG_CONFIGURE_WITH=system-ffmpeg + +FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav +FFMPEG_BUILD_DEPENDS_OFF=yasm:${PORTSDIR}/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 -LDFLAGS+= -Wl,-Bsymbolic -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") @@ -52,16 +55,16 @@ WITHOUT_BUILTIN_VECTOR= yes # builtin vector, requires mmx and sse .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR) -CFLAGS+= -msse +FFMPEG_CFLAGS_OFF+=-msse .endif -CONFIGURE_ARGS+= --with-ffmpeg-extra-configure="${FFMPEG_CONFIG}" - .include +.if ! ${PORT_OPTIONS:MFFMPEG} .if ${OSVERSION} < 900033 || ${ARCH} == ia64 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 .if ${ARCH} == powerpc64 @@ -69,13 +72,25 @@ FFMPEG_CONFIG+= --arch=ppc64 .endif .if ${COMPILER_TYPE} == "gcc" -CFLAGS+= -fno-force-addr +CFLAGS+= -fno-force-addr .endif -post-patch: +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 + @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \ + ${WRKSRC}/gst-libs/ext/libav/Makefile \ + ${WRKSRC}/gst-libs/ext/libav/common.mak \ + ${WRKSRC}/gst-libs/ext/libav/configure \ + ${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \ + ${WRKSRC}/gst-libs/ext/libav/libavfilter/Makefile .include