Date: Fri, 8 Jan 2016 10:28:27 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> 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 Message-ID: <201601081028.u08ASRls092261@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <ahze@FreeBSD.org> # $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 <bsd.port.pre.mk> - +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 <bsd.port.post.mk> +# 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 <bsd.port.mk> 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 <bsd.port.options.mk> +# 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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601081028.u08ASRls092261>