From nobody Sun Jan 1 23:54:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NlbSf50Dwz1LgQC; Sun, 1 Jan 2023 23:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NlbSf4STKz4J1Z; Sun, 1 Jan 2023 23:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672617266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U76rL1kvS0HqgGb3AD8NzMnREY3w0Dmx/VAOtz+I+ro=; b=T3EHfMHejvI8P2NbeI5oXIPzaECrCLDYclQH/HPk9gaacuPR4vReUgdMI1XXLg+9m/ozBN PasBg7uxBH6kYtMYYxIX9xGmjAnuapsy4g+FNj+W/obqsJ6Cm6c8z5MLWdis0en9V3GCYh KVFw3ntjuPO2iC88wZo4UD7mknAF9iw8gvOrtrmkTpllYq8Cgm0UeYe3PH8a51vjUHnrjl pOjMKF15M5CChQOroev0dbcStaFn9x8vg4KazrlzEIEjKKeqcwVYY87AaB+zZya8TsESuB sbHEpiYridY5W1brn8joZesdFXkABq1jFqLT3X1KnpcdIuzU2paroeNywfY3Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672617266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U76rL1kvS0HqgGb3AD8NzMnREY3w0Dmx/VAOtz+I+ro=; b=OpQQUGmBnBwNnrwYIZPzNlPdCrMSLttI955tJ2GEMlzXoCwpI7XiCa++B7DDzzEoDMm3mo v+Yh1AwZilAcIrHkQx4mY3TbZwSSGdYMcP/xQB+vIcOVYH7ru4ns/F5s24/ykQFjIhdhAb aES1/7cxazIMeVIfa+IF2Jd4nldSgXP6T4lKU0K8urxFw/GU1x7bj/7tzPGbcqpyKpFkca mqtnhBIzoAMVClVvTsnR3qhWroQK4e6pc2GA2rXk3/9qgzZwORiFepRvqM5M6a+4oqlwNx ZMO0o75r3hxiylMbHGTZJ/RyVPCrDAZrzD6MumZSQqDS40vx+JZwvdyMGsmPTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672617266; a=rsa-sha256; cv=none; b=QMRDYs/isQ9Uu1uKNUicEh0WoE24n11w6WH+3Udbm+YOO2lOYBpSPKQj7nbG7R62E5eCB/ 1zOFwoaelXQkLuUOx3nUm+h3TYewfHGvwdO7KNmWJuzktFqzZY6HrJVhl3ZB/d6PmnFClE RB+aBpkzisrKg173UI4P3RdcJuW6qOBb8FZgwHA2A55DvHx04bKCr+sx0ET1AFaOJtmWJG NEQoUvovz6TPC1rokilHave8CGy6MN3jJ9V32vpm4o5xSlN/baC0+WBGwbgjxGT/qyl0sq IIpuqyf7spZYg/slFrhKH6o85z540uWOpnrjMX8PZQyizTFOIQORxsF1BhXusg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NlbSf3CxvzmfR; Sun, 1 Jan 2023 23:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 301NsQZ6017820; Sun, 1 Jan 2023 23:54:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 301NsQZK017819; Sun, 1 Jan 2023 23:54:26 GMT (envelope-from git) Date: Sun, 1 Jan 2023 23:54:26 GMT Message-Id: <202301012354.301NsQZK017819@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d2a8bda64298 - main - multimedia/obs-studio: enable Wayland support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2a8bda642980cdffff0fccbefd2fe10d15a2764 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2a8bda642980cdffff0fccbefd2fe10d15a2764 commit d2a8bda642980cdffff0fccbefd2fe10d15a2764 Author: Jan Beich AuthorDate: 2023-01-01 23:36:59 +0000 Commit: Jan Beich 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 .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