From owner-svn-ports-head@freebsd.org Sat Jun 15 07:27:29 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83EA715BED5D; Sat, 15 Jun 2019 07:27:29 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 24E1E6AE99; Sat, 15 Jun 2019 07:27:29 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC76D23D47; Sat, 15 Jun 2019 07:27:28 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5F7RSML024576; Sat, 15 Jun 2019 07:27:28 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5F7RSSZ024575; Sat, 15 Jun 2019 07:27:28 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201906150727.x5F7RSSZ024575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 15 Jun 2019 07:27:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504229 - head/multimedia/gstreamer-ffmpeg X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/multimedia/gstreamer-ffmpeg X-SVN-Commit-Revision: 504229 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 24E1E6AE99 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jun 2019 07:27:29 -0000 Author: tobik Date: Sat Jun 15 07:27:28 2019 New Revision: 504229 URL: https://svnweb.freebsd.org/changeset/ports/504229 Log: multimedia/gstreamer-ffmpeg: Drop FFMPEG option multimedia/ffmpeg0 has expired. PR: 215036 Modified: head/multimedia/gstreamer-ffmpeg/Makefile Modified: head/multimedia/gstreamer-ffmpeg/Makefile ============================================================================== --- head/multimedia/gstreamer-ffmpeg/Makefile Sat Jun 15 06:42:36 2019 (r504228) +++ head/multimedia/gstreamer-ffmpeg/Makefile Sat Jun 15 07:27:28 2019 (r504229) @@ -4,18 +4,20 @@ PORTNAME= gstreamer PORTVERSION= 0.10.13 -PORTREVISION= 6 +PORTREVISION= 7 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 +DISTFILES= gst-ffmpeg-${PORTVERSION}.tar.bz2:ffmpeg \ + libav-${LIBAV_VERSION}.tar.xz:libav MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams LICENSE= GPLv2 +BUILD_DEPENDS= yasm:devel/yasm LIB_DEPENDS= liborc-0.4.so:devel/orc PORTSCOUT= limit:0\.10\..* @@ -26,20 +28,15 @@ USES= compiler:features gmake libtool pkgconfig USE_LDCONFIG= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-system-ffmpeg \ + --with-ffmpeg-extra-configure="${FFMPEG_CONFIG}" PLIST_SUB= VERSION="${PORTVERSION:R}" + +LDFLAGS+= -Wl,-Bsymbolic LDFLAGS_i386= -Wl,-znotext -OPTIONS_DEFINE= FFMPEG -FFMPEG_DESC?= Use system ffmpeg instead of internal libav +NOPRECIOUSMAKEVARS= yes # ARCH -FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0 -FFMPEG_CONFIGURE_WITH=system-ffmpeg -FFMPEG_VARS_OFF=NOPRECIOUSMAKEVARS=yes # ARCH - -FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav -FFMPEG_BUILD_DEPENDS_OFF=yasm: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 @@ -59,13 +56,11 @@ WITHOUT_BUILTIN_VECTOR= yes # builtin vector, requires mmx and sse .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR) -FFMPEG_CFLAGS_OFF+=-msse +CFLAGS+= -msse .endif .include -.if ! ${PORT_OPTIONS:MFFMPEG} - .if ${ARCH} == powerpc64 FFMPEG_CONFIG+= --arch=ppc64 .endif @@ -79,7 +74,6 @@ post-extract: @${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/\