Adding metadata

4 files changed, 13 insertions, 299 deletions

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index d171ef15867d..7743edd2a85b 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,8 @@
 DIST cef_binary_6533_linux_aarch64_v6.tar.xz 337362980 BLAKE2B e1f3dde6ea6623ccdb1159b04314d5698a92656cabfd37b26cec86fad16ec679b997d7354fc68710b572d489d10419cabbbda9d1bc085ae011f8f6b61795d4b5 SHA512 c26952ed77fbbc315628b55482848fa0b310e2910235a20f268683027bcaac2b188f2f91ae99517345cf71cdaf5e610aff8b4524d22e5df43a939ce3a476342c
 DIST cef_binary_6533_linux_x86_64_v6.tar.xz 325417128 BLAKE2B 6e2d1082fcc1bac22a3dc506469b62f07a8bced44f2bbd4e1294fe30aa2801985d902038b7038cc4e3b4d2fedbfa040102ae2f0883091cd9c3e4451165de496c SHA512 790da9bf3a2495eb6d4d155ae89adea88a45f496b5996278d72df47a1dea662241b2b73d93be7fc56f83186805c591dcd718266575a74d1b25b6b93379ce74b3
-DIST obs-browser-4056a311780ef0129ca099f1fb6e113ac3ed0032.tar.gz 115612 BLAKE2B cbb96eb4b37b63216cb2f9218b1d22cb08d9b7acf108040d7304a23b5bd3b1289c0a6590cd559b54aaec901c66af4d1e404bf2b8b0b2b9f44e1c3a23ae8bc0b7 SHA512 f0d809226b587fb1f479f9caeaa98581acf027b71c7d218fe6ed9034b2def301ba1bb58d89a7e7a951338e56090b19adddc5dec027f71922aa41c04858454482
 DIST obs-browser-a776dd6a1a0ded4a8a723f2f572f3f8a9707f5a8.tar.gz 115576 BLAKE2B 5ddff9e0fc8c8788e600bf6a40d7b835331e54e234d5bf3efc820080f381f91eb5fe7b8ae03dcde512dea88c79e427a2cfc12e81b22cbf1ceb3ed75364ecdda4 SHA512 aaf791ad6c7c84a9399c968009044d67d79ae296168b9aef8e24d02bcdeac1f01faf24b1a2c6291012ad8e48df77545c025b50147f93fd28ff286e7008672a73
-DIST obs-studio-32.0.1.tar.gz 16017153 BLAKE2B 416f503c312e5b1f94939c731844c52d445a991846b85491e12f2afa8531afb068122c41fa1232d37b12a168fd87e20c10cd4b4f6b12b2a7b3da8dcaa0edf061 SHA512 4e82e1582e9ed83b84adf2e19ad345a0c954b495ba69e8210e845d3ae4bd15bc0bfcd2343ce7943cdd549e51b8a6954badb359a5c1c727d1763585000c6d4d82
-DIST obs-studio-32.0.2.tar.gz 16017242 BLAKE2B f6f1d33ab0494ad1b6f24a71064221be43cc813a86320815b90e711be1ff9aea5adf32d1bde28a3d9dcc1b298e1136e8fe607a5accbccfe9c13fbf4a5b2a0dce SHA512 f057a5601ad8e78bd13e70a3fc68b7a642c372c0f1e0a225d0853347e9eaa9f25bab11d9d026640b74810289076106faba0145df63374c1cd3e4e5019ac42f6b
+DIST obs-browser-ea04212e4bbadd077f9e6038758c4e4779c24fa3.tar.gz 117820 BLAKE2B ef21fde3b0508e4753da4549ca48348c03b4a8509904ac0aa8a80e4e4f3c1547be610de5890e688f058bcb3d2bbeda9fac5eb0b4d71ed5f8cef3a56a7709b10c SHA512 2b8ffb22a78b3ac89d5742fac420d762fbf9a8631d97cfbe6001d9506206bc5ee0ba49c9dbf566c4d45955fcbb1ea9f90f7b9b6b228da9a05b62f04306684150
 DIST obs-studio-32.0.4.tar.gz 16019714 BLAKE2B 1faed52b99a01cdec392bc544f35b606b0fbe73edd26adb6bc746cb364aee633149407000bb49b1654ee475760a19a7d09b0ff153f6811ce5e58f6307f358190 SHA512 217b311463bb41c966056a0e7658e00fe8a7e09f926e46c89d9a3c77e344b83c2839b9ff38aa00705d63944a0df4a800e2b801c6518bffdb9b0aee8ac2808ede
+DIST obs-studio-32.1.0.tar.gz 16135327 BLAKE2B ba99a388bbd2b0c516d322aeefa16be77c2896ebdb36c8d6b505054ec1932473fd4929cea356a0626534f771fdd82cae5218230d6f862f8bbc1b280a943a4d2c SHA512 7f3a8fbb3ab38cbb442d88e7f2553ae19626ce2b051af12fb653f6e4f8170cfbc0feaa9336e118a98ec5850b033b6a12873d95210cf377e8032e4d143a8b21de
 DIST obs-websocket-1c9306b1e200704ebe192e06c893dfc06b097c43.tar.gz 255758 BLAKE2B edb05c8ef3d142790511daa8739e6fbb3ce57f14daa3b855cc4f0042529923781870162dc50c6d80497c756d2781035f164470872f7944b2bd889286ef225030 SHA512 7a35aac249cf2148a553003dea09744eac10dc7d34be30a90f16b02e6f80893ef6b2f21336ccae1bf8d89430c99801966a603a062de33f1410a25f741155b06f
+DIST obs-websocket-68bebc28be57a8ca371404182113e16eeac74cbf.tar.gz 261944 BLAKE2B e5a23d3b54b45f519226ad1c3483b024c2af9d02ccbfdec2c277ed82cd3b1eb247863e4a557f59c315e0220becb14b998beb938892519257f3aad2c89e603137 SHA512 8f5f17cd88c45e34606af8b5b410ce18a72d56f0b205b1b2d1433b16c3ac8e241845cf8de1e3d535869334912c16ad4a35e30086a0efa3a059ab17de6947bbf8
diff --git a/media-video/obs-studio/obs-studio-32.0.2-r1.ebuild b/media-video/obs-studio/obs-studio-32.0.2-r1.ebuild
deleted file mode 100644
index 57510b5f7764..000000000000
--- a/media-video/obs-studio/obs-studio-32.0.2-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindMbedTLS )
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-# For the time being upstream supports up to Python 3.12 only.
-# Any issues found with 3.13+ should be reported as a Gentoo bug.
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
-
-CEF_AMD64="cef_binary_6533_linux_x86_64_v6"
-CEF_ARM64="cef_binary_6533_linux_aarch64_v6"
-OBS_BROWSER_COMMIT="a776dd6a1a0ded4a8a723f2f572f3f8a9707f5a8"
-OBS_WEBSOCKET_COMMIT="1c9306b1e200704ebe192e06c893dfc06b097c43"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-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
-	)
-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/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? (
-		amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_AMD64}.tar.xz )
-		arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_ARM64}.tar.xz )
-	)
-"
-
-LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
-SLOT="0"
-IUSE="
-	+alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio
-	python qsv sndio speex test-input truetype v4l vlc wayland websocket
-"
-REQUIRED_USE="
-	browser? ( || ( alsa pulseaudio ) )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-# media-video/ffmpeg[opus] required due to bug 909566
-# The websocket plug-in fails to build with 'dev-cpp/asio-1.34.0':
-#   https://github.com/obsproject/obs-websocket/issues/1291
-DEPEND="
-	dev-cpp/nlohmann_json
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/simde
-	dev-libs/uthash
-	dev-qt/qtbase:6[network,widgets,X,xml(+)]
-	dev-qt/qtsvg:6
-	media-libs/libglvnd[X]
-	media-libs/libva
-	media-libs/rnnoise
-	media-libs/x264:=
-	>=media-video/ffmpeg-6.1:=[nvenc?,opus,x264]
-	net-misc/curl
-	net-libs/mbedtls:3=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-apps/util-linux
-	virtual/zlib:=
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	alsa? ( media-libs/alsa-lib )
-	browser? (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		dev-libs/expat
-		dev-libs/glib
-		dev-libs/nspr
-		dev-libs/nss
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/mesa[gbm(+)]
-		net-print/cups
-		x11-libs/cairo
-		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} )
-	mpegts? (
-		net-libs/librist
-		net-libs/srt
-	)
-	nvenc? ( >=media-libs/nv-codec-headers-12 )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( media-libs/libpulse )
-	python? ( ${PYTHON_DEPS} )
-	qsv? ( media-libs/libvpl )
-	sndio? ( media-sound/sndio )
-	speex? ( media-libs/speexdsp )
-	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-1.34.0
-		dev-cpp/websocketpp
-		dev-libs/qr-code-generator
-	)
-"
-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
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/966051
-	"${FILESDIR}/${PN}-32.0.2-fix-build-with-qt-6.10.patch"
-)
-
-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
-	fi
-}
-
-src_prepare() {
-	# Un-comment after all patches are gone.
-	#default
-
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/867250
-	# https://github.com/obsproject/obs-studio/issues/8988
-	use wayland && filter-lto
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCCACHE_PROGRAM=OFF
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AJA=OFF
-		-DENABLE_BROWSER=$(usex browser)
-		-DENABLE_DECKLINK=$(usex decklink)
-		-DENABLE_FFMPEG_NVENC=$(usex nvenc)
-		-DENABLE_FREETYPE=$(usex truetype)
-		-DENABLE_JACK=$(usex jack)
-		-DENABLE_LIBFDK=$(usex fdk)
-		-DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
-		-DENABLE_NVENC=$(usex nvenc)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QSV11=$(usex qsv)
-		-DENABLE_RNNOISE=ON
-		-DENABLE_SNDIO=$(usex sndio)
-		-DENABLE_SPEEXDSP=$(usex speex)
-		-DENABLE_TEST_INPUT=$(usex test-input)
-		-DENABLE_V4L2=$(usex v4l)
-		-DENABLE_VLC=$(usex vlc)
-		-DENABLE_VST=ON
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_WEBRTC=OFF # Requires libdatachannel.
-		-DENABLE_WEBSOCKET=$(usex websocket)
-	)
-
-	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; then
-		use amd64 && mycmakeargs+=( -DCEF_ROOT_DIR=../cef_binary_6533_linux_x86_64 )
-		use arm64 && mycmakeargs+=( -DCEF_ROOT_DIR=../cef_binary_6533_linux_aarch64 )
-		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/frontend/api
-	doins 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-32.0.1.ebuild b/media-video/obs-studio/obs-studio-32.1.0.ebuild
index f45a08070189..65bd7234cb9a 100644
--- a/media-video/obs-studio/obs-studio-32.0.1.ebuild
+++ b/media-video/obs-studio/obs-studio-32.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,8 +13,8 @@ inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
 
 CEF_AMD64="cef_binary_6533_linux_x86_64_v6"
 CEF_ARM64="cef_binary_6533_linux_aarch64_v6"
-OBS_BROWSER_COMMIT="4056a311780ef0129ca099f1fb6e113ac3ed0032"
-OBS_WEBSOCKET_COMMIT="1c9306b1e200704ebe192e06c893dfc06b097c43"
+OBS_BROWSER_COMMIT="ea04212e4bbadd077f9e6038758c4e4779c24fa3"
+OBS_WEBSOCKET_COMMIT="68bebc28be57a8ca371404182113e16eeac74cbf"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com"
@@ -63,8 +63,6 @@ BDEPEND="
 	python? ( dev-lang/swig )
 "
 # media-video/ffmpeg[opus] required due to bug 909566
-# The websocket plug-in fails to build with 'dev-cpp/asio-1.34.0':
-#   https://github.com/obsproject/obs-websocket/issues/1291
 DEPEND="
 	dev-cpp/nlohmann_json
 	dev-libs/glib:2
@@ -142,7 +140,7 @@ DEPEND="
 		x11-libs/libxkbcommon
 	)
 	websocket? (
-		<dev-cpp/asio-1.34.0
+		dev-cpp/asio
 		dev-cpp/websocketpp
 		dev-libs/qr-code-generator
 	)
@@ -182,6 +180,8 @@ src_unpack() {
 src_prepare() {
 	default
 
+	sed -i 's/-Werror //' libobs/cmake/linux/libobs.pc.in || die
+
 	# -Werror=lto-type-mismatch
 	# https://bugs.gentoo.org/867250
 	# https://github.com/obsproject/obs-studio/issues/8988
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index d52016372daa..65bd7234cb9a 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,8 +13,8 @@ inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
 
 CEF_AMD64="cef_binary_6533_linux_x86_64_v6"
 CEF_ARM64="cef_binary_6533_linux_aarch64_v6"
-OBS_BROWSER_COMMIT="a776dd6a1a0ded4a8a723f2f572f3f8a9707f5a8"
-OBS_WEBSOCKET_COMMIT="1c9306b1e200704ebe192e06c893dfc06b097c43"
+OBS_BROWSER_COMMIT="ea04212e4bbadd077f9e6038758c4e4779c24fa3"
+OBS_WEBSOCKET_COMMIT="68bebc28be57a8ca371404182113e16eeac74cbf"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com"
@@ -63,8 +63,6 @@ BDEPEND="
 	python? ( dev-lang/swig )
 "
 # media-video/ffmpeg[opus] required due to bug 909566
-# The websocket plug-in fails to build with 'dev-cpp/asio-1.34.0':
-#   https://github.com/obsproject/obs-websocket/issues/1291
 DEPEND="
 	dev-cpp/nlohmann_json
 	dev-libs/glib:2
@@ -142,7 +140,7 @@ DEPEND="
 		x11-libs/libxkbcommon
 	)
 	websocket? (
-		<dev-cpp/asio-1.34.0
+		dev-cpp/asio
 		dev-cpp/websocketpp
 		dev-libs/qr-code-generator
 	)