gentoo resync : 12.05.2022

2 files changed, 41 insertions, 33 deletions

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 5b697de6db14..74e7e75d7a7f 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -4,5 +4,5 @@ DIST obs-studio-27.2.3.tar.gz 16383685 BLAKE2B 76802ba67dcebccabd9b2a1f09f505a4a
 DIST obs-studio-27.2.4.tar.gz 16385399 BLAKE2B 00c05ecd055d707b7132ca4b20e1c4946b682c0f79f1477167ae55aba3ec367c97b05aac190b07260f936e68f79f2d58e19dcc0602f70408f4c056eb733a6fdd SHA512 575341dd3d9240b21881517a16d01ca11f833e08b40ca7990f0360b4cd1076e8217a9bb8dddf174eca5429e6eadaadb6cfdbd61d24e0eb13ebeaa7f29cfad8bf
 EBUILD obs-studio-27.2.3-r1.ebuild 4912 BLAKE2B 60d4bd7ab7e3f24796d5353dceb428855493847cbd480e82bc8b39ab9c745ebbe665849048b29f5614b624c9ccc9fd87ec3dd1742215ed527d64581d3933ac1a SHA512 1bd27589d22bc5d6cf17e37340e1c48bacfed68e1ce94c33f5213ae99594bf3ee75e7fdab1c1084f89e0381d57aceb10db2d26222d4b10033f0de69e843e9552
 EBUILD obs-studio-27.2.4.ebuild 4912 BLAKE2B 60d4bd7ab7e3f24796d5353dceb428855493847cbd480e82bc8b39ab9c745ebbe665849048b29f5614b624c9ccc9fd87ec3dd1742215ed527d64581d3933ac1a SHA512 1bd27589d22bc5d6cf17e37340e1c48bacfed68e1ce94c33f5213ae99594bf3ee75e7fdab1c1084f89e0381d57aceb10db2d26222d4b10033f0de69e843e9552
-EBUILD obs-studio-9999.ebuild 4912 BLAKE2B 60d4bd7ab7e3f24796d5353dceb428855493847cbd480e82bc8b39ab9c745ebbe665849048b29f5614b624c9ccc9fd87ec3dd1742215ed527d64581d3933ac1a SHA512 1bd27589d22bc5d6cf17e37340e1c48bacfed68e1ce94c33f5213ae99594bf3ee75e7fdab1c1084f89e0381d57aceb10db2d26222d4b10033f0de69e843e9552
+EBUILD obs-studio-9999.ebuild 5099 BLAKE2B 09bde333c1f3398d65b09e571fc9210b11d092afdead70372f31a5c61227cf48167bef07d28bed6d0e78b9b3af4121cb19e595d2ae36c657a6ee6d079a341713 SHA512 b20147de9d7c6266929aa826d17b42e8586e60b77d879c1f85847c19552369286eb9c923777b15117b58ce1faec1c25eb0ff490cad9c52748e1b262f4702cd62
 MISC metadata.xml 1415 BLAKE2B 0dda0116d11846076fba50dbb159af34dd1c8cf1f77dadeab5b280d5190b99dae3d73a20bbd5ef52d63d96958a078c0d2ae61f5e8b32a64126a579a47e5cbd5e SHA512 7327bd2d7ecff1db9fbd721fc34e41fcafbde30b898381406da9ee3837410c05f95d64f124a7b616ec7b96d7b2d450dd5fdae6df0b1afb30837ef55864c329b0
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index b9550e6de3df..f42ddb8941af 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake lua-single python-single-r1 xdg
 
-OBS_BROWSER_COMMIT="915761778ec1eae99e740ad4bf63b40db3142ee2"
+OBS_BROWSER_COMMIT="b798763ae75b538e405c2d7e2ab3a1edfe59ed0c"
 CEF_DIR="cef_binary_4638_linux64"
 
 if [[ ${PV} == 9999 ]]; then
@@ -46,15 +46,11 @@ DEPEND="
 	dev-libs/glib:2
 	dev-libs/jansson:=
 	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5[wayland?]
-	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/libglvnd
 	media-libs/x264:=
@@ -63,12 +59,9 @@ DEPEND="
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/zlib:=
-	virtual/udev
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXrandr
 	x11-libs/libxcb:=
 	alsa? ( media-libs/alsa-lib )
 	browser? (
@@ -85,13 +78,17 @@ DEPEND="
 		net-print/cups
 		x11-libs/cairo
 		x11-libs/libdrm
-		x11-libs/libXScrnSaver
 		x11-libs/libXcursor
 		x11-libs/libXdamage
 		x11-libs/libXext
 		x11-libs/libXi
+		x11-libs/libxkbcommon
+		x11-libs/libXrandr
 		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libxshmfence
 		x11-libs/libXtst
+		x11-libs/pango
 	)
 	fdk? ( media-libs/fdk-aac:= )
 	jack? ( virtual/jack )
@@ -105,9 +102,15 @@ DEPEND="
 		media-libs/fontconfig
 		media-libs/freetype
 	)
-	v4l? ( media-libs/libv4l )
+	v4l? (
+		media-libs/libv4l
+		virtual/udev
+	)
 	vlc? ( media-video/vlc:= )
-	wayland? ( dev-libs/wayland )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
 "
 RDEPEND="${DEPEND}"
 
@@ -138,30 +141,35 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	# We have not enabled VST before, but now it will be looked for unconditionally if
+	# any plugins are enabled, so make the VST part a warning instead of fatal for now.
+	sed -i 's/FATAL_ERROR "obs-vst submodule not available/WARNING "obs-vst submodule not available/' \
+		plugins/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
-		-DBUILD_BROWSER=$(usex browser)
-		-DBUILD_VST=no
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_DECKLINK=$(usex !decklink)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AJA=OFF
+		-DENABLE_BROWSER=$(usex browser)
+		-DENABLE_DECKLINK=$(usex decklink)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_JACK=$(usex jack)
+		-DENABLE_LIBFDK=$(usex fdk)
 		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DDISABLE_VLC=$(usex !vlc)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_RTMPS=$(usex ssl ON OFF)
+		-DENABLE_SPEEXDSP=$(usex speex)
+		-DENABLE_V4L2=$(usex v4l)
+		-DENABLE_VLC=$(usex vlc)
+		-DENABLE_WAYLAND=$(usex wayland)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DUNIX_STRUCTURE=1
-		-DWITH_RTMPS=$(usex ssl)
-
-		# deprecated and currently cause issues
-		# https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
-		-DLIBOBS_PREFER_IMAGEMAGICK=no
 	)
 
 	if [[ ${PV} != 9999 ]]; then
@@ -172,12 +180,12 @@ src_configure() {
 
 	if use lua || use python; then
 		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !lua)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
+			-DENABLE_SCRIPTING_LUA=$(usex lua)
+			-DENABLE_SCRIPTING_PYTHON=$(usex python)
+			-DENABLE_SCRIPTING=ON
 		)
 	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
 	fi
 
 	cmake_src_configure