svn commit: r517751 - in head/multimedia: gstreamer-plugins gstreamer-plugins-good gstreamer1-plugins

[Tobias Kortkamp]

Author: tobik
Date: Sat Nov 16 15:19:50 2019
New Revision: 517751
URL: https://svnweb.freebsd.org/changeset/ports/517751

Log:
  */gstreamer*: Prevent false QA warnings about missing USES
  
  gstreamer1?-plugins/Makefile.common can under some circumstances
  create empty USE_XORG, USE_GNOME, etc. which trigger the warnings.
  
  gstreamer-plugins-good triggers the USE_XORG warning because
  USES is overwritten again after including the master Makefile.
  
  gstreamer-plugin-sdl was missing USES=sdl
  
  Approved by:	multimedia (kwm)
  Differential Revision:	https://reviews.freebsd.org/D22406

Modified:
  head/multimedia/gstreamer-plugins-good/Makefile
  head/multimedia/gstreamer-plugins/Makefile
  head/multimedia/gstreamer-plugins/Makefile.common
  head/multimedia/gstreamer1-plugins/Makefile.common

Modified: head/multimedia/gstreamer-plugins-good/Makefile
==============================================================================
--- head/multimedia/gstreamer-plugins-good/Makefile	Sat Nov 16 15:11:06 2019	(r517750)
+++ head/multimedia/gstreamer-plugins-good/Makefile	Sat Nov 16 15:19:50 2019	(r517751)
@@ -15,8 +15,7 @@ MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugi
 BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
 RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
 
-USES+=		xorg
-USE_XORG+=	xdamage
+USE_XORG=	xdamage
 
 gst_good_DIST=	good
 GOOD_GST_DIRS=	gst sys po

Modified: head/multimedia/gstreamer-plugins/Makefile
==============================================================================
--- head/multimedia/gstreamer-plugins/Makefile	Sat Nov 16 15:11:06 2019	(r517750)
+++ head/multimedia/gstreamer-plugins/Makefile	Sat Nov 16 15:19:50 2019	(r517751)
@@ -46,6 +46,9 @@ SHLIB_VERSION=	1
 VERSION=	${GST_VERSION}
 WANT_GSTREAMER=	yes
 USES=		gettext gmake gnome libtool:keepla pathfix pkgconfig shebangfix tar:bzip2
+.if defined(USE_XORG)
+USES+=		xorg
+.endif
 USE_GNOME+=	introspection:build
 GNU_CONFIGURE=	yes
 GST_PLUGIN?=	base

Modified: head/multimedia/gstreamer-plugins/Makefile.common
==============================================================================
--- head/multimedia/gstreamer-plugins/Makefile.common	Sat Nov 16 15:11:06 2019	(r517750)
+++ head/multimedia/gstreamer-plugins/Makefile.common	Sat Nov 16 15:19:50 2019	(r517751)
@@ -449,6 +449,7 @@ gst_resindvd_PLIST_FILES=	${GST_LIB_DIR}/libresindvd.l
 gst_resindvd_DIST=		bad
 
 # sdl
+gst_sdl_USES=		sdl
 gst_sdl_USE_SDL+=	sdl
 gst_sdl_PLIST_FILES=	${GST_LIB_DIR}/libgstsdl.la \
 		${GST_LIB_DIR}/libgstsdl.so
@@ -622,7 +623,9 @@ USES+=		${gst_${GST_PLUGIN}_USES}
 PLIST_FILES=	${gst_${GST_PLUGIN}_PLIST_FILES}
 PLIST_DIRS=	${gst_${GST_PLUGIN}_PLIST_DIRS}
 EXTRA_LIBS+=	${gst_${GST_PLUGIN}_EXTRA_LIBS}
+.if ${gst_${GST_PLUGIN}_USE_GNOME}!=""
 USE_GNOME+=	${gst_${GST_PLUGIN}_USE_GNOME}
+.endif
 CONFIGURE_ENV+=	${gst_${GST_PLUGIN}_CONFIGURE_ENV}
 .if ${gst_${GST_PLUGIN}_GCONF_SCHEMAS}!=""
 GCONF_SCHEMAS=	${gst_${GST_PLUGIN}_GCONF_SCHEMAS}

Modified: head/multimedia/gstreamer1-plugins/Makefile.common
==============================================================================
--- head/multimedia/gstreamer1-plugins/Makefile.common	Sat Nov 16 15:11:06 2019	(r517750)
+++ head/multimedia/gstreamer1-plugins/Makefile.common	Sat Nov 16 15:19:50 2019	(r517751)
@@ -539,8 +539,10 @@ gst_${GST_PLUGIN}_EXTRA_LIBS?=
 gst_${GST_PLUGIN}_PREBUILD_DIR?=
 gst_${GST_PLUGIN}_GST_PLUGIN_DIR?=	ext/${GST_PLUGIN}
 gst_${GST_PLUGIN}_POSTBUILD_DIR?=
+gst_${GST_PLUGIN}_USE_XORG?=
 gst_${GST_PLUGIN}_USE_GNOME?=
 gst_${GST_PLUGIN}_CONFIGURE_ENV?=
+gst_${GST_PLUGIN}_USE_GL?=
 gst_${GST_PLUGIN}_GLIB_SCHEMAS?=
 gst_${GST_PLUGIN}_CONFIGURE_ARGS?=
 gst_${GST_PLUGIN}_USE_SDL?=
@@ -552,10 +554,16 @@ RUN_DEPENDS+=	${gst_${GST_PLUGIN}_RUN_DEPENDS}
 USES+=		${gst_${GST_PLUGIN}_USES}
 PLIST_FILES=	${gst_${GST_PLUGIN}_PLIST_FILES}
 EXTRA_LIBS+=	${gst_${GST_PLUGIN}_EXTRA_LIBS}
+.if ${gst_${GST_PLUGIN}_USE_XORG}!=""
 USE_XORG+=	${gst_${GST_PLUGIN}_USE_XORG}
+.endif
+.if ${gst_${GST_PLUGIN}_USE_GNOME}!=""
 USE_GNOME+=	${gst_${GST_PLUGIN}_USE_GNOME}
+.endif
 CONFIGURE_ENV+=	${gst_${GST_PLUGIN}_CONFIGURE_ENV}
+.if ${gst_${GST_PLUGIN}_USE_GL}!=""
 USE_GL+=	${gst_${GST_PLUGIN}_USE_GL}
+.endif
 
 .if ${gst_${GST_PLUGIN}_GLIB_SCHEMAS}!=""
 GLIB_SCHEMAS=	${gst_${GST_PLUGIN}_GLIB_SCHEMAS}