Date: Sun, 1 Jan 2023 23:54:26 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d2a8bda64298 - main - multimedia/obs-studio: enable Wayland support Message-ID: <202301012354.301NsQZK017819@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2a8bda642980cdffff0fccbefd2fe10d15a2764 commit d2a8bda642980cdffff0fccbefd2fe10d15a2764 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-01-01 23:36:59 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-01-01 23:47:33 +0000 multimedia/obs-studio: enable Wayland support This is for obs UI. pipewire and wlrobs plugins work fine under Xwayland via QT_QPA_PLATFORM=xcb or env -u WAYLAND_DISPLAY. No impact under X11. Under Wayland requires qt6-wayland package to avoid Xwayland, similar to any other Qt6 application. --- multimedia/obs-studio/Makefile | 11 +++++++---- multimedia/obs-studio/distinfo | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index 17bd82cb4c54..33b48c5b77af 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -1,9 +1,10 @@ PORTNAME= obs-studio DISTVERSION= 28.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 1b8a69557113.patch:-p1 # https://github.com/obsproject/obs-studio/pull/7943 PATCHFILES+= e221bf8eedfc.patch:-p1 # https://github.com/obsproject/obs-studio/pull/7989 PATCHFILES+= 0dcc3a1696c0.patch:-p1 # https://github.com/obsproject/obs-studio/pull/7986 PATCHFILES+= 2cebc65ad7f8.patch:-p1 # https://github.com/obsproject/obs-studio/pull/7992 @@ -34,7 +35,6 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libsysinfo.so:devel/libsysinfo \ libudev.so:devel/libudev-devd \ libv4l2.so:multimedia/libv4l \ - libwayland-client.so:graphics/wayland \ libx264.so:multimedia/libx264 \ libxcb-ewmh.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ @@ -80,8 +80,8 @@ CMAKE_ARGS= -DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}" \ LDFLAGS+= -fPIC # pending https://github.com/obsproject/obs-studio/issues/3436 -OPTIONS_DEFINE= BROWSER PIPEWIRE VLC VST -OPTIONS_DEFAULT= PIPEWIRE VLC VST +OPTIONS_DEFINE= BROWSER PIPEWIRE VLC VST WAYLAND +OPTIONS_DEFAULT= PIPEWIRE VLC VST WAYLAND OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= JACK PULSEAUDIO SNDIO OPTIONS_DEFAULT+= ${OPTIONS_MULTI_AUDIO} @@ -116,6 +116,9 @@ VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc VST_DESC= Build VST submodule VST_CMAKE_BOOL= BUILD_VST +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland +WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND + .include <bsd.port.pre.mk> .if ${ARCH} != amd64 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != powerpc && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo index 3fa1ce3bcd64..0e05ba18ba2d 100644 --- a/multimedia/obs-studio/distinfo +++ b/multimedia/obs-studio/distinfo @@ -27,6 +27,8 @@ SHA256 (curl-curl-44b9b4d4f56d6f6de92c89636994c03984e9cd01_GH0.tar.gz) = e3b9aa0 SIZE (curl-curl-44b9b4d4f56d6f6de92c89636994c03984e9cd01_GH0.tar.gz) = 2705576 SHA256 (akheron-jansson-bc5741fb1ac730ead24e9bd08977fc6c248e04b0_GH0.tar.gz) = a285ed51c597b23d1f25de3bc5c9c128d55c6aa17af68e0680efa028f8b0437c SIZE (akheron-jansson-bc5741fb1ac730ead24e9bd08977fc6c248e04b0_GH0.tar.gz) = 127897 +SHA256 (1b8a69557113.patch) = f70e41b1a7674d3ed08efed9216b4506d4c9703f1066c949b3ad234a3b703a6f +SIZE (1b8a69557113.patch) = 1507 SHA256 (e221bf8eedfc.patch) = a8c1d4614f2d019e967eb04d9214548491989c78f6df42dbbab610d3123f4eb1 SIZE (e221bf8eedfc.patch) = 5766 SHA256 (0dcc3a1696c0.patch) = c3690cbb5a5e11f22db4c582fc72d17945ef554e587f78856703d30e0b32a271
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301012354.301NsQZK017819>