commit:     174acc622f94bd58f1ce9a892abe288e84c1ebd1
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 28 22:20:58 2025 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Mar 29 13:01:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174acc62

media-video/obs-studio: add version 31.0.3

Also update browser and websocket hashes on 9999, and add a
version restriction on 'dev-cpp/asio', since the websocket
plug-in does not build with 1.34.0 at this time.

- https://github.com/obsproject/obs-websocket/issues/1291

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 media-video/obs-studio/Manifest                              |  3 +++
 .../{obs-studio-9999.ebuild => obs-studio-31.0.3.ebuild}     | 12 +++++++-----
 media-video/obs-studio/obs-studio-9999.ebuild                |  8 +++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 8cefa119aa23..81b21d42ff4b 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -3,11 +3,14 @@ DIST cef_binary_6533_linux_aarch64.tar.xz 337489544 BLAKE2B 
f82cf2e8c80413c62315
 DIST cef_binary_6533_linux_x86_64.tar.xz 325687240 BLAKE2B 
5d34cac26cd35ebb1ce5c4f978cbc16766ad51696c800c1d2c999d50e9340420c580094e57dc9d06f0aa063708c0aef45cee2cdcaad5ba999c7b5c722423de90
 SHA512 
2539e3cd59b70511f438921348472298ad6cd55c20516b19fc6f200c44ab157b067ef557e2e8ba790635b7351ea553fed044abf979fc6bdf0220b210d95b883b
 DIST obs-browser-16ff0faef223959f6ab9dbfd4e8c6c1622a7991b.tar.gz 113861 
BLAKE2B 
15c6014ee1438bec4ef5b308db6e4825a51025b5fa273d3f92ed16459d2bda4390a973199daa0d1fcbc8596a3ac162b76d35ad1dacb5313c1429330b1e8604f0
 SHA512 
136b20eef0ef75ed7ee90da5f47746a8bae4387bc219d85395ecef60e17c23dec47f77f1b9fffa73bd7610abd32309cab9952c71044cf375335d676c2ef51818
 DIST obs-browser-a76b4d8810a0a33e91ac5b76a0b1af2f22bf8efd.tar.gz 113664 
BLAKE2B 
1079a11ac5865aee18c1e1768df31db56306ecbce9aa03b1869bbfc37934c13b24f9555e574fcb31f4f0c7d7a9841ea2dacf7b8ac614294c834ebce2026eb305
 SHA512 
70b428b5ab7e7d9e8c1402656530dbea590d122e098e4e1b3ca293061b3b5ee1f91d969f2c0bfc3efa581d539670e94a68c2ac80afce02b5ea0581fedc0fd243
+DIST obs-browser-b56fd78936761891475458447c1cc9058bb9c2d4.tar.gz 113837 
BLAKE2B 
e25b5f187d1316922e0cc53aafd44df6c4b6e5cbfc1a89c6f821912460887f3c5c5f62d3ca5a1e2f354704a073e286af245bf1bd5c3ccdf220b1d896349d1d11
 SHA512 
0244885ca8b64fc06108c57091474c5498c5b18755439119ebe58a387ec9a9a13a48c11149c9e8bbb64e4bdf897fdf28d67fa46fe76d1429669d140531bbf968
 DIST obs-browser-c710222ec9d7ef9aa5d7099e9019d636e2c89f00.tar.gz 112527 
BLAKE2B 
abfdd7cff3ec4479cc78d1f85a404ac48c2ebee1ba679a48e4e7abeb685ee08faa00059bda1cee2d5abf16b69ad0aa843898f612b3ee9d46f0950bd546aa6e44
 SHA512 
1ec2f48ce986c0d44cddf4332c8b58b8eb1fcb6a662504dd7ec580f9eb45b2a570542424d4c31ed6f96060746f21082661d43bf50b94469b4ef0c1f0b9190f7c
 DIST obs-studio-30.2.3.tar.gz 16150339 BLAKE2B 
b3ed65060881a731bd2e48d8b490cde4a0cf2886bfbdfb2f09536b4aae15c8230c6f6fc20eed3943b88c194b46509dca702d7e955b5b148b5f3577db410f0889
 SHA512 
1fea762b8fb4d5401516d9e547fe20db389633fb1abbdb52e4b9559ab6aaf3b9f4c25e055896b4063c6a693bfeb78e6463486b4c66e3994a6d1ceb0b7f65865f
 DIST obs-studio-31.0.0.tar.gz 16012774 BLAKE2B 
1cc70a755845700c7a59d096ff3ee5e5af2b4b737745d60154e53a3f56505ecbdd0ae4f2f6b80747131667457f1549e64eb80f52d05c37ea3a70eb9d596d5db3
 SHA512 
e3d4e495b971d471f4742c0d3101c5b2f06995579516920d96d16a7a521f0bf688bc8b5c1243f5266e186297c368189b0ee24e25989f38647dcff2a145b9685f
 DIST obs-studio-31.0.1.tar.gz 16033476 BLAKE2B 
91b92949c939089d789ff4f0efd574812d498acacb1bc60c1770528ef77c00d29c593f7d08e03d1cd81fad5d5543607aa3a4a03b60ed1a1372ba63685922c8a7
 SHA512 
f0f520befa7e6644e31614a3900175e6afc277117b128acd1165835cbcddda67e216ea484d8db54b7e6c79aac3d48cf873221dd24e807ed9d2d38c4501267f12
 DIST obs-studio-31.0.2.tar.gz 16033274 BLAKE2B 
a56c948619f1ff79d44e8a3a9d08ef42bb21bf4c903216606e71918084411bdbf0f72f075e389d799f22e511e786a08953c7ac70468151a87098381d76314d47
 SHA512 
d0f273e91b354523289eb0c295f45be80e1d0c6e383f28979375e243ace7e55da58e5c17cbfc64bdedf053a78fd39e520b8b704dfb4e1fe8dcf3814d0eb56705
+DIST obs-studio-31.0.3.tar.gz 16033846 BLAKE2B 
fa28a1c650735d93403193f41333a758365c40035305b7d133a0115fcc12cc01639b594b84b897643d9627410fa305825cb0cdeb664e4ea0a4b59b33021aeee6
 SHA512 
eeb59c0ccc530a04ead3389839efad6ae6b7b757ec5bf6df7b9bb0c393f0fa5fcec0e27e34c7e4801e11ef071518f423bb527cbf81fc3d29533d3757914706d8
 DIST obs-websocket-0548c7798a323fe5296c150e13b898a5ee62fc1e.tar.gz 250611 
BLAKE2B 
fefeab4a637528138152d6e1bd374d6e3f08e4a4e20698665adf4dd925e7831df5bdb1068e402def71b6e12e239db823dac2944e6549c00e914abca175d16fc0
 SHA512 
f24f520c4a08ad2b80d97c5dfba14421fcd48661d3b0fb694af5d11e063c711e7bf49a4baa95d9de8aff07b6fbbd4b4681ce10a4074506d98cf25c793cc2844d
 DIST obs-websocket-63e04d20daf84391955580579e6576dfb373fa7f.tar.gz 250603 
BLAKE2B 
39f36c2894d010aa45313698353ca5ac75c3464c6c0f1d71eff083bd2a2e22c6d689d19836feb7530fa19b02bd6ac18fa0455093d5000aa6619901fd98ff90bb
 SHA512 
d6a597185847c0983539960d4c032d25420cb2c3457e4fdf09d431c23ab961b0dea774109957f3b78031085a7d3d0ec4c913e4c27a58d9f972e0e3bfb5d019a5
+DIST obs-websocket-c542622d7b6d41ce5875f54efdab1d4ac2967ef4.tar.gz 250604 
BLAKE2B 
9f41a623ba0b27b4ac2a7e315bcd51e9d625636d16d98c855b9d62ed0eb8e90c1fa1ef8532a2c865af202296458e0c8c83751f1883b2100d1f553e1289328994
 SHA512 
3b22fc6b48a048ca3b29d52a8cf36218f686c6c09540aa104b183b128f39c2dcd532f6b91b01b71b058905ae62b6304d8bfb4ed982ed69ccc457cb1a6dd8e278
 DIST obs-websocket-eed8a49933786383d11f4868a4e5604a9ee303c6.tar.gz 250566 
BLAKE2B 
138041a2bdd5d7eb6b5c2636c17fe6ae8a30986ec55548556ce4a1762b2bcc3fee6e039840220d9d60d3314527647334bf7a408dc63e0ab3f0cc45f0e0e65a47
 SHA512 
21ff4a58465bcb8917f2e213b430dbcbfd56a1647e80c351f18479d7dd3ff2b4c64292132ca26b40054f2b994db9dd8d0a2cb97f32498cb5d59f2812272a6ec5

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild 
b/media-video/obs-studio/obs-studio-31.0.3.ebuild
similarity index 94%
copy from media-video/obs-studio/obs-studio-9999.ebuild
copy to media-video/obs-studio/obs-studio-31.0.3.ebuild
index 4d59e51302b8..3e44bcf494c9 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-31.0.3.ebuild
@@ -12,8 +12,8 @@ PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
 
 CEF_VERSION="cef_binary_6533_linux"
-OBS_BROWSER_COMMIT="16ff0faef223959f6ab9dbfd4e8c6c1622a7991b"
-OBS_WEBSOCKET_COMMIT="63e04d20daf84391955580579e6576dfb373fa7f"
+OBS_BROWSER_COMMIT="b56fd78936761891475458447c1cc9058bb9c2d4"
+OBS_WEBSOCKET_COMMIT="c542622d7b6d41ce5875f54efdab1d4ac2967ef4"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com";
@@ -61,6 +61,8 @@ 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
@@ -141,7 +143,7 @@ DEPEND="
                x11-libs/libxkbcommon
        )
        websocket? (
-               dev-cpp/asio
+               <dev-cpp/asio-1.34.0
                dev-cpp/websocketpp
                dev-libs/qr-code-generator
        )
@@ -253,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 4d59e51302b8..c4dcdfd3d6cd 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -12,8 +12,8 @@ PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
 
 CEF_VERSION="cef_binary_6533_linux"
-OBS_BROWSER_COMMIT="16ff0faef223959f6ab9dbfd4e8c6c1622a7991b"
-OBS_WEBSOCKET_COMMIT="63e04d20daf84391955580579e6576dfb373fa7f"
+OBS_BROWSER_COMMIT="b56fd78936761891475458447c1cc9058bb9c2d4"
+OBS_WEBSOCKET_COMMIT="c542622d7b6d41ce5875f54efdab1d4ac2967ef4"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com";
@@ -61,6 +61,8 @@ 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
@@ -141,7 +143,7 @@ DEPEND="
                x11-libs/libxkbcommon
        )
        websocket? (
-               dev-cpp/asio
+               <dev-cpp/asio-1.34.0
                dev-cpp/websocketpp
                dev-libs/qr-code-generator
        )

Reply via email to