commit: f47c65507914093d454f788caa64cd5bb905c329 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Mon May 5 18:44:31 2025 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Mon May 5 20:25:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47c6550
media-video/obs-studio: add 31.0.3-r1 - Depend on 'x11-libs/libdrm' unconditionally (on 9999). - Remove no longer needed 'dev-libs/wayland' from under USE="browser". - Update CEF revision. Bug: https://bugs.gentoo.org/923305 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> media-video/obs-studio/Manifest | 2 ++ ...{obs-studio-9999.ebuild => obs-studio-31.0.3-r1.ebuild} | 14 +++++++++----- media-video/obs-studio/obs-studio-9999.ebuild | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 4f8575b9a8f8..d03f187e110a 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,5 +1,7 @@ DIST cef_binary_6533_linux_aarch64.tar.xz 337489544 BLAKE2B f82cf2e8c80413c62315abd82f8565bbe4d4d056d9c8306bb08c3e6e9ce2920994b729cc27ddbbca4a206c8edcd9c5768410d6bdbe4e1e8e4887fe6da40010e3 SHA512 210567db67eaaaa0a2ff8718778aee90666e1a43ab7cb46832eae953e847d5e837445ee37d44701a0a546ab703b5ae298494d52e67eafc061c9eacb389a51b09 +DIST cef_binary_6533_linux_aarch64_v3.tar.xz 336702348 BLAKE2B 437c3e5aa19822b111c29b80c771009c5c5e05aaa1373d086eb2b0a9bd8c12790e3b3bb8c12e9e191d481a7c970a58d98165794d3b8786fdd380588ef0a1bffd SHA512 fef7387085f1c4e4b3ee7b179b637b34c1e5a68055ca17801e6c81bbb08edd9e14e493c4bb481afa3a7b0aac6a11d1412aab84c0adf47cd5e121f94c32e5de92 DIST cef_binary_6533_linux_x86_64.tar.xz 325687240 BLAKE2B 5d34cac26cd35ebb1ce5c4f978cbc16766ad51696c800c1d2c999d50e9340420c580094e57dc9d06f0aa063708c0aef45cee2cdcaad5ba999c7b5c722423de90 SHA512 2539e3cd59b70511f438921348472298ad6cd55c20516b19fc6f200c44ab157b067ef557e2e8ba790635b7351ea553fed044abf979fc6bdf0220b210d95b883b +DIST cef_binary_6533_linux_x86_64_v3.tar.xz 325417284 BLAKE2B 57838fc1250d07139a656cca37e7d2e6bd99e08288af573e85fe1063b5cc5e04ff3c1a299f8464ee845ea0bc98199b939868b97605fcf351126bef6434f849b0 SHA512 bbf33b8aa0fac828388ec09b526ac6ee7680bdf7983a2d88ff85640903a1819db06bd3d1edae63616631e94d74315ac17956ac9cb2e186668771becea2afc34d DIST obs-browser-b56fd78936761891475458447c1cc9058bb9c2d4.tar.gz 113837 BLAKE2B e25b5f187d1316922e0cc53aafd44df6c4b6e5cbfc1a89c6f821912460887f3c5c5f62d3ca5a1e2f354704a073e286af245bf1bd5c3ccdf220b1d896349d1d11 SHA512 0244885ca8b64fc06108c57091474c5498c5b18755439119ebe58a387ec9a9a13a48c11149c9e8bbb64e4bdf897fdf28d67fa46fe76d1429669d140531bbf968 DIST obs-studio-31.0.3.tar.gz 16033846 BLAKE2B fa28a1c650735d93403193f41333a758365c40035305b7d133a0115fcc12cc01639b594b84b897643d9627410fa305825cb0cdeb664e4ea0a4b59b33021aeee6 SHA512 eeb59c0ccc530a04ead3389839efad6ae6b7b757ec5bf6df7b9bb0c393f0fa5fcec0e27e34c7e4801e11ef071518f423bb527cbf81fc3d29533d3757914706d8 DIST obs-websocket-c542622d7b6d41ce5875f54efdab1d4ac2967ef4.tar.gz 250604 BLAKE2B 9f41a623ba0b27b4ac2a7e315bcd51e9d625636d16d98c855b9d62ed0eb8e90c1fa1ef8532a2c865af202296458e0c8c83751f1883b2100d1f553e1289328994 SHA512 3b22fc6b48a048ca3b29d52a8cf36218f686c6c09540aa104b183b128f39c2dcd532f6b91b01b71b058905ae62b6304d8bfb4ed982ed69ccc457cb1a6dd8e278 diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-31.0.3-r1.ebuild similarity index 95% copy from media-video/obs-studio/obs-studio-9999.ebuild copy to media-video/obs-studio/obs-studio-31.0.3-r1.ebuild index 99e1f5530bc7..61bb3fbe3d67 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-31.0.3-r1.ebuild @@ -12,6 +12,7 @@ PYTHON_COMPAT=( python3_{10..13} ) inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg CEF_VERSION="cef_binary_6533_linux" +CEF_REVISION="_v3" OBS_BROWSER_COMMIT="b56fd78936761891475458447c1cc9058bb9c2d4" OBS_WEBSOCKET_COMMIT="c542622d7b6d41ce5875f54efdab1d4ac2967ef4" @@ -39,8 +40,8 @@ fi SRC_URI+=" browser? ( - amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_x86_64.tar.xz ) - arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_aarch64.tar.xz ) + amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_x86_64${CEF_REVISION}.tar.xz ) + arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_aarch64${CEF_REVISION}.tar.xz ) ) " @@ -96,7 +97,6 @@ DEPEND=" dev-libs/glib dev-libs/nspr dev-libs/nss - dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] @@ -189,6 +189,10 @@ src_prepare() { use wayland && filter-lto cmake_src_prepare + + pushd deps/json11 &> /dev/null || die + eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch" + popd &> /dev/null || die } src_configure() { @@ -251,8 +255,8 @@ 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 + insinto /usr/include/obs/UI/obs-frontend-api + doins UI/obs-frontend-api/obs-frontend-api.h } pkg_postinst() { diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 99e1f5530bc7..888e33bd3c58 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -12,6 +12,7 @@ PYTHON_COMPAT=( python3_{10..13} ) inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg CEF_VERSION="cef_binary_6533_linux" +CEF_REVISION="_v3" OBS_BROWSER_COMMIT="b56fd78936761891475458447c1cc9058bb9c2d4" OBS_WEBSOCKET_COMMIT="c542622d7b6d41ce5875f54efdab1d4ac2967ef4" @@ -39,8 +40,8 @@ fi SRC_URI+=" browser? ( - amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_x86_64.tar.xz ) - arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_aarch64.tar.xz ) + amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_x86_64${CEF_REVISION}.tar.xz ) + arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_aarch64${CEF_REVISION}.tar.xz ) ) " @@ -81,6 +82,7 @@ DEPEND=" sys-apps/pciutils sys-apps/util-linux sys-libs/zlib:= + x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcomposite @@ -96,13 +98,11 @@ DEPEND=" 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
