Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Oct 2024 08:23:08 GMT
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c9d2a05e0208 - main - graphics/gstreamer1-plugins-gl: Prevent fetch during build
Message-ID:  <202410230823.49N8N8et047068@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c9d2a05e0208992300ac5be4a84e99d675d801b4

commit c9d2a05e0208992300ac5be4a84e99d675d801b4
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-10-23 07:58:55 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-10-23 08:23:02 +0000

    graphics/gstreamer1-plugins-gl: Prevent fetch during build
    
    If git(1) was found on the system, the port would attempt to download
    OpenGL headers for a meson subproject from [1], which seems to only be
    necessary/intended for Windows. Add '--wrap-mode=nodownload' to
    MESON_ARGS to prevent this behavior. This only affects builds on live
    systems.
    
    While here: Remove unused glu dep from USE_GL and add jpeg dep as this
    will link to libjpeg if found on the system. Tiny Makefile order fix.
    
    [1] https://gitlab.freedesktop.org/gstreamer/meson-ports/gl-headers
    
    PR:             270184
    Reported by:    amdmi3
---
 graphics/gstreamer1-plugins-gl/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/graphics/gstreamer1-plugins-gl/Makefile b/graphics/gstreamer1-plugins-gl/Makefile
index 61d264a30b7d..aca512117815 100644
--- a/graphics/gstreamer1-plugins-gl/Makefile
+++ b/graphics/gstreamer1-plugins-gl/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	GStreamer GL graphics plugin
@@ -7,11 +7,12 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene \
 		libpng16.so:graphics/png
 
-USES=		gl
-USE_GL=		gl glu glesv2 egl
+USES=		gl jpeg
+USE_GL=		gl glesv2 egl
 USE_XORG+=	x11 xext xcb
 
-MESON_ARGS+=	-Dgl=enabled \
+MESON_ARGS+=	--wrap-mode=nodownload \
+		-Dgl=enabled \
 		-Dgl_winsys=${_GL_WINSYS:ts,} \
 		-Dgl_api=opengl,gles2 \
 		-Dgl_platform=glx,egl
@@ -24,9 +25,9 @@ OPTIONS_DEFINE=	WAYLAND
 OPTIONS_DEFAULT=WAYLAND
 OPTIONS_SUB=	yes
 
-WAYLAND_VARS=		_GL_WINSYS+=wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
+WAYLAND_VARS=		_GL_WINSYS+=wayland
 
 DIST=		base
 GST_PLUGIN=	gl



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