gentoo auto-resync : 17:12:2023 - 02:56:05

8 files changed, 56 insertions, 281 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b5dddc47a4c3..4ac79048a793 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 3736cbea02b3..f2caea8fe060 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,8 +1,9 @@
 AUX mpv-0.36.0-sub-match-audio.patch 1621 BLAKE2B aa774960703d3b5f2f5a8c3dc327bba0fa8865fdc676c68fdaf79cf46f7209fd629db5e523f4f845ce0aaf17d0a8c910c6c1c2c8fabe98340e5c61a31d8c4d36 SHA512 c260ad68a7e003f43b0b4525fb7eff5f5784851beba303a934b90b0e69476c5912cc75217a78820884d1fdcc1e7431574bdb6b55cb9e434735cdfbdeadfb3a0e
 AUX mpv-0.36.0-tests-odr.patch 1118 BLAKE2B 8a87385922af6ee08adc3972ce2271f1f700842dba8415ac27f04ba7147b070b665279c7b4d50e06b85d258a9ab47db23a82a9f9a4db444efb97a677ef2f6317 SHA512 8ccec2ce0108468c8fc048d3e892b1c8f177f434809d899f38a00526515b1453e0cb5cd2bfd5843568a025fda314fd172c94c548c8e144514353904066b917f3
+AUX mpv-0.37.0-drm-fix.patch 1444 BLAKE2B e0645e9b12ebbd0088b10aed34cabadbdb1b06d9cab14c40e9108c09d068c1ccba133dd91ba4c1d0735c67d0a8010003c77b85466343504cb220498fa24ac964 SHA512 8ce946f6043abb274b3051e787f5445ad40a3ea404cb2effcf9a4415a589483861381e54762e31f72d03c4975d01b67b662b6fb8a8a9194d7cd7d8acb4cab084
 DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1 SHA512 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
 DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
 EBUILD mpv-0.36.0-r1.ebuild 7515 BLAKE2B 4803c6c650526632de3cb55ebaf1fe20c4f427c3890135e0c2a43a2787fb381cf872a0fee551b152ce6dc5318650d399a57e51ad27e4ed840e6ada0ecd51f08c SHA512 f6319c75533f9285dba3c69687ab313c4e0dbb18e6e36f4449072d434fb5da94f9c41d384b4e22c1270cac46d7872f92d95b25e66e79ab7a834227bdb3ef2404
-EBUILD mpv-0.37.0.ebuild 7031 BLAKE2B cbab37b63e7084940e955b8219ec0ed82e69c0cab488010fd40d4cb516232454fc153225b57657ca5756e932a55dcdfd5f6d26a6c847a6bb18d36300d141fd61 SHA512 ffdbd0938646c66d9023c3d4f814d4034585c694c98103250bfe4ad02d3cf6f067a164341562c39881ba2d8d105ffb683b1e3729b400cef8071dc1af5fbb0ea4
+EBUILD mpv-0.37.0.ebuild 7086 BLAKE2B d2596f1b39498e24458c9cda74c02d06e0ed0d24c9f2617542400b63c9405ffa585de82a6ba1fbd645442b39afca54f18fc4c5074f6da44585bf406fe8079637 SHA512 5cd4ec83b393f157bf6740005b32d91e85baaab2575b7708176f5959300971c8934c2f3024d72845386ff1979c7a32b40b1bdbfefdff914e6886bf0105169982
 EBUILD mpv-9999.ebuild 6988 BLAKE2B f5d21ef9e426a8289c2db8e4c390b1e9e46a9063927b5c46bb088ee34a1ce3fdf04e6fa6cfff4fd3aaef08d22094cf47987bc95effba76d8ff33d1603de7128f SHA512 e3a31d09eaa2c71f8a6f82fb6e22bdb69609520cc268d0eec449bf613c5b8d316c44d325cd4295f1f81ced39e530004173f920ca893a128f063906192906c48a
 MISC metadata.xml 2324 BLAKE2B 6fe57270fef9275f47b0d7f282fbf4ff5c4a76c74e43820a8e0a4d56348eb72dc89dfdb06a9ff9a2b6f73d35102f861200d6c8c6f4dc41cfb4e42ff69d70da8a SHA512 0418e3315b4ded29714099d80075f61f6d1b38d9109bbb3bc372abbaceb14f705d5798eac2c14ef0fd0e1c557785291a4acb5e773dffb46f0b7f7962bf38d041
diff --git a/media-video/mpv/files/mpv-0.37.0-drm-fix.patch b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
new file mode 100644
index 000000000000..7e10c07eebc1
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
@@ -0,0 +1,41 @@
+From e575ec4fc3654387c7358bd3640877ef32628d2c Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Wed, 22 Nov 2023 19:44:13 +0100
+Subject: [PATCH] meson: also expose present_sync for VT-only after
+ a96d04f19d73
+
+$ meson setup --auto-features=disabled -Ddrm=enabled -Degl=enabled -Dgbm=enabled -Degl-drm=enabled /tmp/mpv_build
+$ meson compile -C /tmp/mpv_build
+[...]
+ld: error: undefined symbol: mp_present_initialize
+>>> referenced by drm_common.c
+>>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(vo_drm_init)
+
+ld: error: undefined symbol: present_sync_update_values
+>>> referenced by drm_common.c
+>>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_swap
+>>> referenced by drm_common.c
+>>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_get_info
+>>> referenced by vo_drm.c
+>>>               libmpv.so.2.2.0.p/video_out_vo_drm.c.o:(get_vsync)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a3c3430dd47b..6fd5afa5122a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1049,7 +1049,7 @@ if features['xv']
+     sources += files('video/out/vo_xv.c')
+ endif
+ 
+-if features['wayland'] or features['x11']
++if features['wayland'] or features['x11'] or features['drm']
+     sources += ('video/out/present_sync.c')
+ endif
+ 
diff --git a/media-video/mpv/mpv-0.37.0.ebuild b/media-video/mpv/mpv-0.37.0.ebuild
index 8e95724ccf24..36d77d771326 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -134,6 +134,10 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.37.0-drm-fix.patch
+)
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 0337c41c1de3..e7b38cdb426a 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,14 +1,13 @@
 DIST cef_binary_5060_linux64.tar.bz2 132839531 BLAKE2B f7d342cf12bf435aab3873b666a47c42c6583a88f140c28dabfd2dd860cd0d5c96cc51cc034703bffc6f1094a738bd77008c01839fa5ea53b848bc1c483a0ae4 SHA512 c99ce53858c57becd7822e39ff81d59b7296374fa61b29dfd4a572c2ed8f9ab155114ed179764ea05586e0edb2f1654f0b73c471f1cd9b233660e7f1c8b462c4
 DIST cef_binary_5060_linux_x86_64_v3.tar.xz 91352460 BLAKE2B 443f4b1bc638d3fe462fd8b8dd167e96f65aebb2b8de3616beac298449e2786c746f9a1fa4a0dbe2e3ef2d593139938e97538890d3ca3b74018b3afb9c7fc661 SHA512 1fbdf1d4ed117f3b8af20476c57502145d652b451ba8e0a544081403d292cc7a78642e9071b8f0283a19ef7ad507ef6e0d9df32b00afc51605ab74f650a7d755
 DIST obs-browser-594115a27d40f0916e55db97cb61f7c7130cbe28.tar.gz 116455 BLAKE2B 8158bdd9fcc689c3b0024c9da26c3f39b44c9dac7fb031470470a2697f66af122552a19beb389faa96001a8f35bf06580ad3c5e00f616900e7ca960d3e1c1450 SHA512 ff1e5cbe76a1a4a7224b1b01f0f45df51dd60c7426a73008a744fb17be3e4c7a96dd3833f237a480dd4ec2dd3e544d847aced2256453919d8442f7857354afb2
-DIST obs-browser-e397df52e70392ebb9146e0ab6317c0d1a30bce4.tar.gz 109235 BLAKE2B 0885fb02aa5928e0e6d8e8413a47ef6537ad6780cf38f3dc87ef6fa941521385a89d944175dc94aebd9d89966a52b78bb30fee8b356b3158fd71daf9e61aab21 SHA512 a9b9406ff9371b40ef3257bf51cceac02ff6e0a38864c7b656d9b4c1072eb322cad385f25ee8cac179b401482c59c93bd35a4b8ff1274b449fec2393dd53473d
+DIST obs-browser-a3ae78b5c6ce6d4ddb29d49b29f2f60014d554e1.tar.gz 109427 BLAKE2B 0630da6c762fcca62f31a239b37807eabf30a8c8b4683942391b7b6ae198b50cdbdd8166bd68eaf3ac3fcdf9e331ea480c0774400906c2c4f08ea7f477c4eba9 SHA512 00b4efb6fa43aa6af0bc09848eeb9da79234899720817a8d918a508d3d1c8608f8074db2c37a4798de5aae5cdba227e68ef9f6610013adfa0c39e3758b25c4f8
 DIST obs-studio-29.1.3.tar.gz 26315797 BLAKE2B c8d7824ca280a9be566c075a6238141b00ad8a2efbd5d010ff5c92c7c12c225f473fd331a9654e23924ffb0d883734dc2d2afad5065f8c9b1486298dbe2c5a0a SHA512 563a9b71ebe273b604807b9c43be8bde58fb326e8a0b741afb84a481a99176c96bf63da2aa26b6dcc026573b7fb0bf53e0a296e2db0b93c28f0d4710cd7cf019
-DIST obs-studio-30.0.0.tar.gz 15850826 BLAKE2B 210ddd873d50eb2d0e6038c1da87eea77c8507826c826c820e4eb942fb5e2b2e5c7b3ce56d2324b8d5890e39ed38b68e50bb66a8c090da99cfb2138ffd8ff739 SHA512 a99ec286dddea46e95a90b16b52bfb8033ce017faae039128509c561fef9bc71e02a9e55d1fee428c456dc48ce03ba7939e2488eaec35f791116ab4dfd1f34d0
-DIST obs-websocket-4ff109b62bc221192943541010d055be9ae5dbba.tar.gz 240603 BLAKE2B d558de3b7fc353f711d9313086ff0ac98ca45c74670ba4a49c0d1f21cfac99d2f50a5a6698235ab7e3bcfa9154b0f369ec8e7eb5f9fc14d58be30f875626b41b SHA512 38a8d396528853535440027ef39851e98b3e24c7fc8d27bca941cca6766e0c57f1a5bba9130d535a8a2843962351e880784c2984b0cd4be1b864ff1f8dab1f08
+DIST obs-studio-30.0.2.tar.gz 15861643 BLAKE2B d21e990d116e304af0a47f0f9523928723acb939114666fab66250aea98f8dce9b7c216710f695f806947c3390e8bfa9411f4cbca466a6db679294ff1e48fe73 SHA512 04a9944a0c008033368cb833f847464caa8aeea6157ed07c2ecf2d1a85ca8bbbd6fe8729dd8d7f6bec2f7b9706fd631ae649d0782526b3036f1011b244b84819
 DIST obs-websocket-6fd18a7ef1ecb149e8444154af1daab61d4241a9.tar.gz 245070 BLAKE2B 311037960ec230b76dfe2ae796d1897d42a2dc96cda7e9962209edfcd210e2af5d20a1ddfcffd8d4e6c9f7ac7d5cbb6818b864d53ce53acf2c6515f7dd2d33bf SHA512 94defd55e4a4dc65b4366d2e92c9604cff67cba2b24ed67d53fbd492605f339201e4d3896789c0ccb84b6fbff4b37be70475524fec5ca2b42f7b59b8596ce828
+DIST obs-websocket-ede66a68cbc043a6fc7c8af683ae0924d4068941.tar.gz 241053 BLAKE2B 58d79d17ad20271f831dacd7bb251286d4ba91f62a7848bc9866deddc9ad7c1924fb54cce513d3e1f240eee0d9d87c63ad3898b44910a7b207503989b366e42a SHA512 30e5f9ab940cb5c9ff38cdfd2484a59d8440c3670999521fd6d856911e04a1fd718cbb1d6243343884143274485630e96cd6e2f5e8f6ef8f070c0b4e4036971a
 DIST qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz 135863 BLAKE2B fa6fb9c9e5250b56bdf38f31aa4acaf4ce860c153012984d1266928bd7a62dcf43b271ff53b4322931304670742566dcb016ef65ff2f681bf76224f86eca567c SHA512 ba298de89411fecc8db3dc10850485da01f5183d68b6d91ea91a9e28c1f104eb110adbf143a37e5d1856abbba5d309ab8329a6359ca7225bacb033d8044fa72c
-EBUILD obs-studio-29.1.3-r1.ebuild 6736 BLAKE2B e2be8cc0ecad8cc4ba49f351a1e2b1c68f69595407864ce1e023a16c1b1c1d80498bc284468439e361c159ee485595b15735b99f377d0af0a8d9996dc18c6231 SHA512 59cc1803e9ca1f88da406b446e6181354f6b0c2e784d8f1057f5e93d67aaa11fbfaa1db0cbc58a3ec407a1ba1c054c080fbb17ef43d153fc46b91bbc3639a1d9
 EBUILD obs-studio-29.1.3-r2.ebuild 6704 BLAKE2B 59cf7406b827df8f8c467f486f6f1a1a78dafd8c2e3b898bccde08827e4e510533971b6eb7b84cb4d52be938768124265765e18b5709025a7242563cd02c0fd2 SHA512 2b5a56d9f1bb64559449fc06efcc1a06e200a1ac29946a29cbe56c29a8c391e219357fd43aff95c78c0b35505464de9895752f7d43ace1a4a38fe3598aa0e2b9
-EBUILD obs-studio-30.0.0.ebuild 6363 BLAKE2B ae811eb2c4fed6a434683c9c8869357bcb14b3f88a70b7160e6663c811b9784b21ae61f6536f07e369db8ef51f7242f1db99cafde676a24aec9d3c981b0ee58b SHA512 9f09777a3de6d9acab2eb6fc1770e4516c8e700df850d162503dc3cb5a4dbfe8cf3c816138da7bf12e5933c0506c90003753e7dcf2cfc310aa8c1c73436d9150
-EBUILD obs-studio-9999.ebuild 6382 BLAKE2B 2555f15efa2a8643f79481e8411850d191f157908aecb90cd974423b58ce925887c7cc72090b90c2d275ad8f7cdf3517dd56cf0c20a6361ce836d63baec921f3 SHA512 c4a55a6971510db8b80de388edc3c353fdcbabc23906b320f7a02bc20ba53e9510d7d3f0984cd06bc5fe277b6a731d1920b9030e3e306e03d24f4baf0d159d93
+EBUILD obs-studio-30.0.2.ebuild 6363 BLAKE2B 8c2a38f1e17d4155b3d2e28ccab167e88348a2d5ad3a179bb8e22700bf85e000549a0e8dfe5b897fa1d97a7fe15982bdf1287705e4bc89373a1e55ca3fd725ed SHA512 669b0d895d4e00f49d07ad48f7c560f73a8b8a8eee6a2fac3f42914d837c5670192c99e4e5d0e050e7f060a7ba3b2613b1822a3a9102272b391bc70057f8b188
+EBUILD obs-studio-9999.ebuild 6382 BLAKE2B 18de178cd439043c8ad5c47c5de8a97d2b3e7aff0a6bea71911b4d96d5e39da6a099a1eb6728cb080175d6aa3d5a5df475c5484b3b210ba49c99711990c4d927 SHA512 3b99012d09f8cf307c24a729194923eb8ee00963f27a52109dcfd225ed30a6d9c5870e1f47cedeb91d3213544146adbb74bef669e7f352622964ce305a838924
 MISC metadata.xml 1470 BLAKE2B ce34216dcee69e90450a9cce810db3a494db1cafe6a8cd1029b0a749a7d69e0503fc5c5f6f298bebc2422e57f623ef63e17ac3814fd495e14c2b6e02bba1a9bd SHA512 0479dd3a4de659f8ce00b663129ca20ca31b837cd29bfca43bf7cca02d6762dabf0778c96c1b47d9814e3f6045c4793cc8f47f74d2a8940c8b2a1969ed69e895
diff --git a/media-video/obs-studio/obs-studio-29.1.3-r1.ebuild b/media-video/obs-studio/obs-studio-29.1.3-r1.ebuild
deleted file mode 100644
index 5481a17aefca..000000000000
--- a/media-video/obs-studio/obs-studio-29.1.3-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake lua-single optfeature python-single-r1 xdg
-
-CEF_DIR="cef_binary_5060_linux64"
-OBS_BROWSER_COMMIT="594115a27d40f0916e55db97cb61f7c7130cbe28"
-OBS_WEBSOCKET_COMMIT="6fd18a7ef1ecb149e8444154af1daab61d4241a9"
-QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=(
-		plugins/obs-browser
-		plugins/obs-websocket
-		plugins/obs-websocket/deps/asio
-		plugins/obs-websocket/deps/json
-		plugins/obs-websocket/deps/qr
-		plugins/obs-websocket/deps/websocketpp
-	)
-else
-	SRC_URI="
-		https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
-		https://github.com/nayuki/QR-Code-generator/archive/${QR_COMMIT}.tar.gz -> qr-${QR_COMMIT}.tar.gz
-		https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
-SLOT="0"
-IUSE="
-	+alsa browser decklink fdk jack lua nvenc pipewire pulseaudio
-	python qt6 speex +ssl truetype v4l vlc wayland websocket
-"
-REQUIRED_USE="
-	browser? ( || ( alsa pulseaudio ) )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-# media-video/ffmpeg[opus] required due to bug 909566
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	media-libs/libglvnd
-	media-libs/libva
-	media-libs/x264:=
-	media-video/ffmpeg:=[nvenc?,opus,x264]
-	net-misc/curl
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libxcb:=
-	alsa? ( media-libs/alsa-lib )
-	browser? (
-		|| (
-			>=app-accessibility/at-spi2-core-2.46.0:2
-			( app-accessibility/at-spi2-atk dev-libs/atk )
-		)
-		dev-libs/expat
-		dev-libs/glib
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/wayland
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/mesa[gbm(+)]
-		net-print/cups
-		x11-libs/cairo
-		x11-libs/libdrm
-		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 )
-	lua? ( ${LUA_DEPS} )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( media-libs/libpulse )
-	python? ( ${PYTHON_DEPS} )
-	qt6? (
-		dev-qt/qtbase:6[network,widgets,xml(+)]
-		dev-qt/qtsvg:6
-		x11-libs/libxkbcommon
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[wayland?]
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? (
-		media-libs/libv4l
-		virtual/udev
-	)
-	vlc? ( media-video/vlc:= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	websocket? (
-		dev-cpp/asio
-		dev-cpp/nlohmann_json
-		dev-cpp/websocketpp
-	)
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	usr/lib*/obs-plugins/chrome-sandbox
-	usr/lib*/obs-plugins/libcef.so
-	usr/lib*/obs-plugins/libEGL.so
-	usr/lib*/obs-plugins/libGLESv2.so
-	usr/lib*/obs-plugins/libvk_swiftshader.so
-	usr/lib*/obs-plugins/libvulkan.so.1
-	usr/lib*/obs-plugins/swiftshader/libEGL.so
-	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
-"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		rm -d ${P}/plugins/obs-browser || die
-		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
-
-		rm -d ${P}/plugins/obs-websocket || die
-		mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die
-
-		rm -d ${P}/plugins/obs-websocket/deps/qr || die
-		mv QR-Code-generator-${QR_COMMIT} ${P}/plugins/obs-websocket/deps/qr || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
-		-DCALM_DEPRECATION=ON
-		-DCCACHE_SUPPORT=OFF
-		-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_NEW_MPEGTS_OUTPUT=OFF # Requires librist and libsrt.
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
-		-DENABLE_SPEEXDSP=$(usex speex)
-		-DENABLE_V4L2=$(usex v4l)
-		-DENABLE_VLC=$(usex vlc)
-		-DENABLE_VST=ON
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_WEBSOCKET=$(usex websocket)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DQT_VERSION=$(usex qt6 6 5)
-		-DUNIX_STRUCTURE=1
-	)
-
-	if [[ ${PV} != 9999 ]]; then
-		mycmakeargs+=(
-			-DOBS_VERSION_OVERRIDE=${PV}
-		)
-	fi
-
-	if use lua || use python; then
-		mycmakeargs+=(
-			-DENABLE_SCRIPTING_LUA=$(usex lua)
-			-DENABLE_SCRIPTING_PYTHON=$(usex python)
-			-DENABLE_SCRIPTING=ON
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
-	fi
-
-	if use browser && use ssl; then
-		mycmakeargs+=( -DENABLE_WHATSNEW=ON )
-	else
-		mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if use v4l && has_version media-video/v4l2loopback; then
-		elog
-		elog "Depending on system configuration, the v4l2loopback kernel module"
-		elog "may need to be loaded manually, and needs to be re-built after"
-		elog "kernel changes."
-		elog
-	fi
-
-	optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
-	optfeature "virtual camera support" media-video/v4l2loopback
-}
diff --git a/media-video/obs-studio/obs-studio-30.0.0.ebuild b/media-video/obs-studio/obs-studio-30.0.2.ebuild
index 48a98e8a5a49..55a19f2112ae 100644
--- a/media-video/obs-studio/obs-studio-30.0.0.ebuild
+++ b/media-video/obs-studio/obs-studio-30.0.2.ebuild
@@ -11,8 +11,8 @@ inherit cmake lua-single optfeature python-single-r1 xdg
 
 CEF_DIR="cef_binary_5060_linux_x86_64"
 CEF_REVISION="_v3"
-OBS_BROWSER_COMMIT="e397df52e70392ebb9146e0ab6317c0d1a30bce4"
-OBS_WEBSOCKET_COMMIT="4ff109b62bc221192943541010d055be9ae5dbba"
+OBS_BROWSER_COMMIT="a3ae78b5c6ce6d4ddb29d49b29f2f60014d554e1"
+OBS_WEBSOCKET_COMMIT="ede66a68cbc043a6fc7c8af683ae0924d4068941"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 765049249677..1a062e5a1f6a 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -11,8 +11,8 @@ inherit cmake lua-single optfeature python-single-r1 xdg
 
 CEF_DIR="cef_binary_5060_linux_x86_64"
 CEF_REVISION="_v3"
-OBS_BROWSER_COMMIT="2ba72dbdfed60acd38fa1ac7a52cbc6617ae8fd1"
-OBS_WEBSOCKET_COMMIT="4ff109b62bc221192943541010d055be9ae5dbba"
+OBS_BROWSER_COMMIT="211f851bb3f203483a1f7571dd40fa66d0dfceb8"
+OBS_WEBSOCKET_COMMIT="ede66a68cbc043a6fc7c8af683ae0924d4068941"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3