Date: Thu, 13 Jun 2024 10:36:02 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: 8238768a7990 - main - multimedia/vlc: Link to libOpenGL instead of libGL Message-ID: <202406131036.45DAa2QM061456@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=8238768a799033f2bbca7b3a80b6f9fe8e5daeb7 commit 8238768a799033f2bbca7b3a80b6f9fe8e5daeb7 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-06-13 09:39:51 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-06-13 10:30:56 +0000 multimedia/vlc: Link to libOpenGL instead of libGL This fixes a dependency problem if the X11 option is off in graphics/libglvnd for whatever reason. Reported by: olgeni (via private mail) --- multimedia/vlc/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 67f44e0135fd..75a9df8eca32 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,5 +1,6 @@ PORTNAME= vlc DISTVERSION= 3.0.21 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= multimedia audio net www MASTER_SITES= https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -30,7 +31,7 @@ RUN_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg USES= compiler:c++17-lang cpe desktop-file-utils elfctl gettext-tools \ gl gmake gnome iconv:wchar_t libtool localbase pathfix pkgconfig \ tar:xz -USE_GL= gl +USE_GL= opengl CPE_VENDOR= videolan @@ -364,8 +365,8 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CONFIGURE_ENABLE= wayland X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms -X11_USES= gl xorg -X11_USE= GL=gl XORG=xcb,xorgproto,sm,ice,x11 +X11_USES= xorg +X11_USE= XORG=xcb,xorgproto,sm,ice,x11 X11_CONFIGURE_ENABLE= xcb xvideo X11_CONFIGURE_WITH= x @@ -393,6 +394,7 @@ post-patch: @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ -e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \ + -e '/PKG_CONFIG/s|\"gl\"|"opengl"|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406131036.45DAa2QM061456>