Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Nov 2018 19:52:31 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r483908 - in head: graphics/gstreamer1-plugins-gl multimedia/gstreamer1-plugins
Message-ID:  <201811031952.wA3JqVtj066002@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sat Nov  3 19:52:31 2018
New Revision: 483908
URL: https://svnweb.freebsd.org/changeset/ports/483908

Log:
  Make the wayland dependency optional.
  
  Requested by:	Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>

Modified:
  head/graphics/gstreamer1-plugins-gl/Makefile
  head/graphics/gstreamer1-plugins-gl/pkg-plist
  head/multimedia/gstreamer1-plugins/Makefile.common

Modified: head/graphics/gstreamer1-plugins-gl/Makefile
==============================================================================
--- head/graphics/gstreamer1-plugins-gl/Makefile	Sat Nov  3 19:38:13 2018	(r483907)
+++ head/graphics/gstreamer1-plugins-gl/Makefile	Sat Nov  3 19:52:31 2018	(r483908)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	GStreamer GL graphics plugin
@@ -12,6 +12,12 @@ GL_GST_DIRS=	gst-libs/gst/allocators gst-libs/gst/vide
 PLIST=		${.CURDIR}/pkg-plist
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
+
+OPTIONS_DEFINE=	WAYLAND
+OPTIONS_SUB=	yes
+
+WAYLAND_CONFIGURE_ENABLE=	wayland
+WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland
 
 pre-build:
 .for dir in ${GL_GST_DIRS}

Modified: head/graphics/gstreamer1-plugins-gl/pkg-plist
==============================================================================
--- head/graphics/gstreamer1-plugins-gl/pkg-plist	Sat Nov  3 19:38:13 2018	(r483907)
+++ head/graphics/gstreamer1-plugins-gl/pkg-plist	Sat Nov  3 19:52:31 2018	(r483908)
@@ -50,7 +50,7 @@ include/gstreamer-%%VERSION%%/gst/gl/gstglupload.h
 include/gstreamer-%%VERSION%%/gst/gl/gstglutils.h
 include/gstreamer-%%VERSION%%/gst/gl/gstglviewconvert.h
 include/gstreamer-%%VERSION%%/gst/gl/gstglwindow.h
-include/gstreamer-%%VERSION%%/gst/gl/wayland/gstgldisplay_wayland.h
+%%WAYLAND%%include/gstreamer-%%VERSION%%/gst/gl/wayland/gstgldisplay_wayland.h
 include/gstreamer-%%VERSION%%/gst/gl/x11/gstgldisplay_x11.h
 lib/girepository-1.0/GstGL-%%VERSION%%.typelib
 lib/gstreamer-%%VERSION%%/include/gst/gl/gstglconfig.h

Modified: head/multimedia/gstreamer1-plugins/Makefile.common
==============================================================================
--- head/multimedia/gstreamer1-plugins/Makefile.common	Sat Nov  3 19:38:13 2018	(r483907)
+++ head/multimedia/gstreamer1-plugins/Makefile.common	Sat Nov  3 19:52:31 2018	(r483908)
@@ -275,10 +275,9 @@ gst_gdk_pixbuf_PLIST_FILES=	${GST_LIB_DIR}/libgstgdkpi
 gst_gl_USES=	gl
 gst_gl_USE_GL=	gl glu glesv2 egl
 gst_gl_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
-gst_gl_LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene \
-			libwayland-egl.so:graphics/wayland
+gst_gl_LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene
 gst_gl_CONFIGURE_ARGS=	--enable-gl --enable-glx \
-			--enable-egl --enable-gles2 --enable-wayland
+			--enable-egl --enable-gles2
 gst_gl_GST_PLUGIN_DIR=	gst-libs/gst/gl ext/gl
 gst_gl_PLIST_FILES=		#
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811031952.wA3JqVtj066002>