[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/

["Jimi Huotari" <chiitoo@gentoo.org>]

commit:     d4276dfca541e14f1c38f6cb20bcc307f238a3af
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 19:52:33 2023 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 15:51:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4276dfc

media-video/obs-studio: add version 30.0.0

- Qt 5 is no longer supported.
- Re-keywording needed due to Qt 6.
- CEF binary gets a couple of CVE commits (and one Qt/GTK related
  commit).

Bug: https://bugs.gentoo.org/918404
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 media-video/obs-studio/Manifest                                  | 4 ++++
 .../{obs-studio-9999.ebuild => obs-studio-30.0.0.ebuild}         | 9 +++++----
 media-video/obs-studio/obs-studio-9999.ebuild                    | 9 +++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index bf83729d1000..1450ed0eb773 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,9 @@
 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-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-websocket-6fd18a7ef1ecb149e8444154af1daab61d4241a9.tar.gz 245070 BLAKE2B 311037960ec230b76dfe2ae796d1897d42a2dc96cda7e9962209edfcd210e2af5d20a1ddfcffd8d4e6c9f7ac7d5cbb6818b864d53ce53acf2c6515f7dd2d33bf SHA512 94defd55e4a4dc65b4366d2e92c9604cff67cba2b24ed67d53fbd492605f339201e4d3896789c0ccb84b6fbff4b37be70475524fec5ca2b42f7b59b8596ce828
 DIST qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz 135863 BLAKE2B fa6fb9c9e5250b56bdf38f31aa4acaf4ce860c153012984d1266928bd7a62dcf43b271ff53b4322931304670742566dcb016ef65ff2f681bf76224f86eca567c SHA512 ba298de89411fecc8db3dc10850485da01f5183d68b6d91ea91a9e28c1f104eb110adbf143a37e5d1856abbba5d309ab8329a6359ca7225bacb033d8044fa72c

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-30.0.0.ebuild
similarity index 97%
copy from media-video/obs-studio/obs-studio-9999.ebuild
copy to media-video/obs-studio/obs-studio-30.0.0.ebuild
index 98bbc80af0b5..48a98e8a5a49 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-30.0.0.ebuild
@@ -9,10 +9,10 @@ PYTHON_COMPAT=( python3_{9..12} )
 
 inherit cmake lua-single optfeature python-single-r1 xdg
 
-CEF_DIR="cef_binary_5060_linux64"
+CEF_DIR="cef_binary_5060_linux_x86_64"
+CEF_REVISION="_v3"
 OBS_BROWSER_COMMIT="e397df52e70392ebb9146e0ab6317c0d1a30bce4"
 OBS_WEBSOCKET_COMMIT="4ff109b62bc221192943541010d055be9ae5dbba"
-QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -27,9 +27,9 @@ else
 		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"
+	KEYWORDS="~amd64"
 fi
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}${CEF_REVISION}.tar.xz )"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com"
@@ -131,6 +131,7 @@ DEPEND="
 		dev-cpp/asio
 		dev-cpp/nlohmann_json
 		dev-cpp/websocketpp
+		dev-libs/qr-code-generator
 	)
 "
 RDEPEND="${DEPEND}"

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 98bbc80af0b5..765049249677 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -9,10 +9,10 @@ PYTHON_COMPAT=( python3_{9..12} )
 
 inherit cmake lua-single optfeature python-single-r1 xdg
 
-CEF_DIR="cef_binary_5060_linux64"
-OBS_BROWSER_COMMIT="e397df52e70392ebb9146e0ab6317c0d1a30bce4"
+CEF_DIR="cef_binary_5060_linux_x86_64"
+CEF_REVISION="_v3"
+OBS_BROWSER_COMMIT="2ba72dbdfed60acd38fa1ac7a52cbc6617ae8fd1"
 OBS_WEBSOCKET_COMMIT="4ff109b62bc221192943541010d055be9ae5dbba"
-QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -29,7 +29,7 @@ else
 	"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}${CEF_REVISION}.tar.xz )"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com"
@@ -131,6 +131,7 @@ DEPEND="
 		dev-cpp/asio
 		dev-cpp/nlohmann_json
 		dev-cpp/websocketpp
+		dev-libs/qr-code-generator
 	)
 "
 RDEPEND="${DEPEND}"