From owner-svn-ports-head@freebsd.org Fri Jan 8 10:28:29 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10F7BA6799E; Fri, 8 Jan 2016 10:28:29 +0000 (UTC) (envelope-from kwm@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 mx1.freebsd.org (Postfix) with ESMTPS id C665D14D0; Fri, 8 Jan 2016 10:28:28 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u08ASRrk092263; Fri, 8 Jan 2016 10:28:27 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u08ASRls092261; Fri, 8 Jan 2016 10:28:27 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201601081028.u08ASRls092261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Fri, 8 Jan 2016 10:28:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405541 - in head/multimedia: gstreamer-plugins-all gstreamer1-plugins-all X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 08 Jan 2016 10:28:29 -0000 Author: kwm Date: Fri Jan 8 10:28:27 2016 New Revision: 405541 URL: https://svnweb.freebsd.org/changeset/ports/405541 Log: Update gstreamer-plugins-all and gstreamer1-plugins-all * Filter out "unwanted" plugins before building the OPTIONS * Sync both Makefiles so they only have gstreamer version specifics * Bump portrevision for option changes. Now all bsd.gstreamer.mk elements where listed before. Submitted by: marino@ Modified: head/multimedia/gstreamer-plugins-all/Makefile head/multimedia/gstreamer1-plugins-all/Makefile Modified: head/multimedia/gstreamer-plugins-all/Makefile ============================================================================== --- head/multimedia/gstreamer-plugins-all/Makefile Fri Jan 8 10:21:01 2016 (r405540) +++ head/multimedia/gstreamer-plugins-all/Makefile Fri Jan 8 10:28:27 2016 (r405541) @@ -1,10 +1,9 @@ # Created by: Michael Johnson # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.8 2006/01/25 18:54:32 ahze Exp $ PORTNAME= gstreamer-plugins-all PORTVERSION= 1.3.${GST_VERSION}.${GST_SHLIB_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org @@ -15,30 +14,30 @@ USE_GSTREAMER= yes .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk" -.for all in ${_GSTREAMER_PLUGINS} -OPTIONS_DEFINE+= ${all:tu} -${all:tu}_DESC= ${all} plugin -OPTIONS_DEFAULT+= ${all:tu} -.endfor - -.include - +ALL_PLUGINS:= ${_GSTREAMER_PLUGINS} # Weed out gst-plugins that can not be packaged. or are broken. .if defined(PACKAGE_BUILDING) -PORT_OPTIONS:= ${PORT_OPTIONS:NFAAC} # Mp4 Dolby license , no package -PORT_OPTIONS:= ${PORT_OPTIONS:NLAME} # MP3 License , no package -PORT_OPTIONS:= ${PORT_OPTIONS:NPEG2ENC} # Broken -PORT_OPTIONS:= ${PORT_OPTIONS:NVDPAU} # Needs to be build agains running kernel -.endif - -.if ${ARCH} != "i386" -PORT_OPTIONS:= ${PORT_OPTIONS:NSPC} # i386 only +# FAAC: Mp4 Dolby license , no package +# LAME: MP3 License , no package +# VDPAU: Needs to be build agains running kernel +DEF_PLUGINS:= ${_GSTREAMER_PLUGINS:Nfaac:Nlame:Nvdpau} +.else +DEF_PLUGINS:= ${_GSTREAMER_PLUGINS} .endif -.for f in ${OPTIONS_DEFINE} -.if ${PORT_OPTIONS:M${f:tu}} -USE_GSTREAMER+= ${f:tl} -.endif +.for all in ${ALL_PLUGINS} +${all:tu}_DESC= ${all} plugin +${all:tu}_USE= GSTREAMER=${all} .endfor -.include +# Pull out i386-only plugins, add back conditionally +ALL_PLUGINS:= ${ALL_PLUGINS:Nspc} +DEF_PLUGINS:= ${DEF_PLUGINS:Nspc} + +OPTIONS_DEFINE= ${ALL_PLUGINS:tu} +OPTIONS_DEFAULT= ${DEF_PLUGINS:tu} + +OPTIONS_DEFAULT_i386= SPC +OPTIONS_DEFAULT_i386= SPC + +.include Modified: head/multimedia/gstreamer1-plugins-all/Makefile ============================================================================== --- head/multimedia/gstreamer1-plugins-all/Makefile Fri Jan 8 10:21:01 2016 (r405540) +++ head/multimedia/gstreamer1-plugins-all/Makefile Fri Jan 8 10:28:27 2016 (r405541) @@ -3,39 +3,41 @@ PORTNAME= gstreamer1-plugins-all PORTVERSION= ${GST1_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org COMMENT= Meta-port of all GStreamer 1.x plugins with options USES= metaport - USE_GSTREAMER1= yes .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk" -.for all in ${_GSTREAMER_PLUGINS} -OPTIONS_DEFINE+= ${all:tu} +ALL_PLUGINS:= ${_GSTREAMER_PLUGINS} +# Weed out gst-plugins that can not be packaged. or are broken. +.if defined(PACKAGE_BUILDING) +# FAAC: Mp4 Dolby license , no package +# LAME: MP3 License , no package +# VDPAU: Needs to be build agains running kernel +DEF_PLUGINS:= ${_GSTREAMER_PLUGINS:Nfaac:Nlame:Nvdpau} +.else +DEF_PLUGINS:= ${_GSTREAMER_PLUGINS} +.endif + +.for all in ${ALL_PLUGINS} ${all:tu}_DESC= ${all} plugin -OPTIONS_DEFAULT+= ${all:tu} +${all:tu}_USE= GSTREAMER1=${all} .endfor -.include +# Pull out i386-only plugins, add back conditionally +ALL_PLUGINS:= ${ALL_PLUGINS:Nspc} +DEF_PLUGINS:= ${DEF_PLUGINS:Nspc} -# Weed out gst-plugins that can not be packaged. or are broken. -.if defined(PACKAGE_BUILDING) -PORT_OPTIONS:= ${PORT_OPTIONS:NFAAC} # Mp4 Dolby license , no package -PORT_OPTIONS:= ${PORT_OPTIONS:NLAME} # MP3 License , no package -PORT_OPTIONS:= ${PORT_OPTIONS:NVDPAU} # Needs to be build agains running kernel -.endif +OPTIONS_DEFINE= ${ALL_PLUGINS:tu} +OPTIONS_DEFAULT= ${DEF_PLUGINS:tu} OPTIONS_DEFINE_i386= SPC - -.for f in ${OPTIONS_DEFINE} -.if ${PORT_OPTIONS:M${f:tu}} -USE_GSTREAMER1+=${f:tl} -.endif -.endfor +OPTIONS_DEFAULT_i386= SPC .include