From owner-svn-ports-all@freebsd.org Sat Nov 3 19:52:33 2018 Return-Path: Delivered-To: svn-ports-all@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 E8E7610E27A1; Sat, 3 Nov 2018 19:52:32 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E5188EF44; Sat, 3 Nov 2018 19:52:32 +0000 (UTC) (envelope-from tijl@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 654331E4A9; Sat, 3 Nov 2018 19:52:32 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA3JqWxq066005; Sat, 3 Nov 2018 19:52:32 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA3JqVtj066002; Sat, 3 Nov 2018 19:52:31 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201811031952.wA3JqVtj066002@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 3 Nov 2018 19:52:31 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head: graphics/gstreamer1-plugins-gl multimedia/gstreamer1-plugins X-SVN-Commit-Revision: 483908 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2018 19:52:33 -0000 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 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= #