Upgrade obs-studio to 32.1.2 for Qt 6.10 compatibility.
Replace 31.1.2 with upstream 32.1.2, including CEF v6 and whip support. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
9f8d0a5b21
commit
fa3dcc70e7
@ -1,6 +1,6 @@
|
||||
DIST cef_binary_6533_linux_aarch64_v5.tar.xz 337410012 BLAKE2B c13514ea937146ba07b64e07d6f75d5523765cbfc9f46f26e9995d7abe53da92715fbdded6951edc4ce74aaab9ccb4a500873e566c09593bac46573050fe079f SHA512 38615baaae608e4a4e36ecadf2f15bbcba5ef7de6336cba69b7fdc496257251045148ac9190d38bd8dc94097bacb2490128b6734123e41b515fc194c28aa92cf
|
||||
DIST cef_binary_6533_linux_x86_64_v5.tar.xz 325396680 BLAKE2B ee2c53bb681b54b986b0f50511312012c2962aec86a73c61ea7d87c307e06f5eb87d0be358977f2eae820505ff1c1c586d370335e4d2ea11b75663a5a2204cb9 SHA512 e122d1c4ff1fc5f31fe8f40aafb1f32c09af3779a83bdb4f2b99d0e5aff3da513527946e4abf3ce94bd9e82b28ceecf9cc2215f0c41d1a4017b652c8a3505b30
|
||||
DIST obs-browser-bdabf8300ecefeb566b81f4a7ff75f8a8e21f62b.tar.gz 117046 BLAKE2B 119aa6e2f5de7c4d8d3d2f287e651e6b328106f5c97c2ac438f4116cd676d68dbfb238d906943685adb4962c573366a4a0a5b1b06489b31f055bd573ae8a4c9a SHA512 a77b8b42907ab25fe2a4cb8bb3780d577b9d526058429cc83f42366c7740f70a93eb43139ab3d03d7c40a95adfeb0523004dcc111bc79bc50e04bb5d201496a2
|
||||
DIST obs-studio-31.1.2.tar.gz 16120746 BLAKE2B 3df373f4dfae3502e9f12f4b330423e9615c87de401adec5fe174f52533b1fc99d3f0134d895d5535d7112ed5be69aad0105129e0aeeee44e4668841a485c466 SHA512 bee52406c2a0a2a1935d81e6eed76d6120d22c5b213bb807bfa414b6b063eb0a0ab0a6ad08db936bc0eadc0fa98a2d1adf18ff87fcc63472cb6a82c4b4f565ed
|
||||
DIST obs-websocket-40d26dbf4d29137bf88cd393a3031adb04d68bba.tar.gz 254383 BLAKE2B ccf4af62844a05c35083028d974c5cbd631e22e91e9d2a7dace75ca4543a85f2c32b0868a46545fe3c1b9bf2b20ec577517e262b14ad9a0da1ab02786f95989b SHA512 1436bca2110e46377b03fafa2711712959427e37d4bf96431e35f23c048dff53ab0c81d4607bcb01f9899ff3a5748e2ea9b7ee2b5fb88891ab05d55e1649e99b
|
||||
EBUILD obs-studio-31.1.2.ebuild 6989 BLAKE2B 81c5e31518b3727eaec06f63a52aeb766a9a469854cf0f776cabf09d87ec727396cc019a713324026f905a51cfbdc5bbd14773ca0c8cc283165ebf22899c8cc2 SHA512 8195434bbe2e7c53a4e58163b42dc1083ab699b09b0bb0a3ddad123c4f85f61e8806c2cb0b061ca62c17187c3204c748ab60ca03c7fcf2c92bfd3589fc9af701
|
||||
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-ea04212e4bbadd077f9e6038758c4e4779c24fa3.tar.gz 117820 BLAKE2B ef21fde3b0508e4753da4549ca48348c03b4a8509904ac0aa8a80e4e4f3c1547be610de5890e688f058bcb3d2bbeda9fac5eb0b4d71ed5f8cef3a56a7709b10c SHA512 2b8ffb22a78b3ac89d5742fac420d762fbf9a8631d97cfbe6001d9506206bc5ee0ba49c9dbf566c4d45955fcbb1ea9f90f7b9b6b228da9a05b62f04306684150
|
||||
DIST obs-studio-32.1.2.tar.gz 16150365 BLAKE2B eb611ab03b902c357b5cd1e80b14340d97c681ef027e794d9d0a79836b5d5997b0640b438203b65ae6ead680471e9fa7849edf38576ea714e8d999ebc48b4673 SHA512 5da9f659b433cc282d3fb10a52af01e9aa0e7eaaf5c61eb2f201d6f88c61fa14a46db5ba4b6c04347d75d3912e3d09d593b355f9d83e524d2df8c043acba6edc
|
||||
DIST obs-websocket-68bebc28be57a8ca371404182113e16eeac74cbf.tar.gz 261944 BLAKE2B e5a23d3b54b45f519226ad1c3483b024c2af9d02ccbfdec2c277ed82cd3b1eb247863e4a557f59c315e0220becb14b998beb938892519257f3aad2c89e603137 SHA512 8f5f17cd88c45e34606af8b5b410ce18a72d56f0b205b1b2d1433b16c3ac8e241845cf8de1e3d535869334912c16ad4a35e30086a0efa3a059ab17de6947bbf8
|
||||
EBUILD obs-studio-32.1.2.ebuild 7135 BLAKE2B ea152a7d473b404c7c24a20dcb3fd4b86df068443e45828255fd7948a6b43adb93c11bf893fa5e4cd2feb60488ffe81d4412ba3363956b264f77bed58bf17999 SHA512 975b1b5df21063d74f70a896c6c7f5535b592e6fffbe4b1010ac2d7ea7a7ce0cd99b71d912c33c594e516fd6239cfd04666ab0488a2e529d510ad1e456a58d2d
|
||||
|
||||
@ -1,22 +1,20 @@
|
||||
#Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CMAKE_REMOVE_MODULES_LIST=( FindMbedTLS )
|
||||
|
||||
LUA_COMPAT=( 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_{11..14} )
|
||||
|
||||
inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
|
||||
|
||||
CEF_AMD64="cef_binary_6533_linux_x86_64_v5"
|
||||
CEF_ARM64="cef_binary_6533_linux_aarch64_v5"
|
||||
OBS_BROWSER_COMMIT="bdabf8300ecefeb566b81f4a7ff75f8a8e21f62b"
|
||||
OBS_WEBSOCKET_COMMIT="40d26dbf4d29137bf88cd393a3031adb04d68bba"
|
||||
CEF_AMD64="cef_binary_6533_linux_x86_64_v6"
|
||||
CEF_ARM64="cef_binary_6533_linux_aarch64_v6"
|
||||
OBS_BROWSER_COMMIT="ea04212e4bbadd077f9e6038758c4e4779c24fa3"
|
||||
OBS_WEBSOCKET_COMMIT="68bebc28be57a8ca371404182113e16eeac74cbf"
|
||||
|
||||
DESCRIPTION="Software for Recording and Streaming Live Video Content"
|
||||
HOMEPAGE="https://obsproject.com"
|
||||
@ -49,12 +47,10 @@ SRC_URI+="
|
||||
|
||||
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 whip
|
||||
"
|
||||
|
||||
REQUIRED_USE="
|
||||
browser? ( || ( alsa pulseaudio ) )
|
||||
lua? ( ${LUA_REQUIRED_USE} )
|
||||
@ -66,14 +62,12 @@ BDEPEND="
|
||||
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
|
||||
@ -87,7 +81,7 @@ DEPEND="
|
||||
sys-apps/dbus
|
||||
sys-apps/pciutils
|
||||
sys-apps/util-linux
|
||||
sys-libs/zlib:=
|
||||
virtual/zlib:=
|
||||
x11-libs/libdrm
|
||||
x11-libs/libX11
|
||||
x11-libs/libxcb:=
|
||||
@ -140,19 +134,18 @@ DEPEND="
|
||||
media-libs/libv4l
|
||||
virtual/udev
|
||||
)
|
||||
vlc? ( media-video/vlc:= )
|
||||
vlc? ( <media-video/vlc-4.0:= )
|
||||
wayland? (
|
||||
dev-libs/wayland
|
||||
x11-libs/libxkbcommon
|
||||
)
|
||||
websocket? (
|
||||
<dev-cpp/asio-1.34.0
|
||||
dev-cpp/asio
|
||||
dev-cpp/websocketpp
|
||||
dev-libs/qr-code-generator
|
||||
)
|
||||
whip? ( dev-libs/libdatachannel[media] )
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QA_PREBUILT="
|
||||
@ -173,17 +166,23 @@ 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() {
|
||||
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
|
||||
@ -278,4 +277,3 @@ pkg_postinst() {
|
||||
optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
|
||||
optfeature "virtual camera support" media-video/v4l2loopback
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user