gentoo auto-resync : 24:06:2024 - 00:11:52

5 files changed, 40 insertions, 99 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1c0e10476178..a227fdbf70f9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/roc-toolkit/Manifest b/media-libs/roc-toolkit/Manifest
index cb297e94dcc0..b1dd923fb68a 100644
--- a/media-libs/roc-toolkit/Manifest
+++ b/media-libs/roc-toolkit/Manifest
@@ -1,8 +1,7 @@
 AUX roc-toolkit-0.2.5-dont-force-O3.patch 626 BLAKE2B d8365e9bc957b5cd6729768c66034e5cc79df1c45157a6b24a954e2f1d8fc4524e3b3165bcdf3a540a0d83404c783ee2201014607d225e2745a190f050cf0c8e SHA512 d9fe4498388150bfc79a2c9eafe14e6f9a29d915989b53d670b05afad8d0b3dac4006f19777f07faba4d78696407a4517334db53ac8f72bc2748c36b51774038
-DIST roc-toolkit-0.2.5.tar.gz 1559917 BLAKE2B b75a2f101bd9bfecee28abc1dee0102c55a06f6432d66ed0b982b774e330209cdb9c22db442b9a49ec6e5623193de0c55fdb118a5285fb7de199b85eb6daea48 SHA512 45a524d7c29f2011eaa9f3e6d256ccf714e1abe2921c8ed276d97501cd2f7641bc14288f2f29c892a1c6740cf64049e3d143eb6b15dd2fb14e25a38a4ad23971
-DIST roc-toolkit-0.2.6.tar.gz 1570499 BLAKE2B 6fa38819fc675323585a0bd5f754b7325be0d9870a55b65636498822249fe1d53b23422b7fa6a0b7e7740aff4f7e62fed9b2681741fbd8912ef8ec2bcc375ee4 SHA512 ac0f18e8a8a60ae9e93f3dcb58e645f31440b6799dac063b246f5320978ac98192bb9c38bbfa7e38dbd537da169c1d525d93cf66c86b36976d37932e3c12f63b
+AUX roc-toolkit-0.4.0-dont-force-O3.patch 630 BLAKE2B a4895648b0826e7b1de3cf083afa14f7d8d365c45088f9cb87e94c4d737ca51db038225efe42fe351f150f3cd0ec752cad1c0a7124dc7407c0fb1d8dcf299cae SHA512 03c46f69e53b373c0fa9eef2cf43e5a12c51eebe1158be7ba21083c8af90174d73c2da9142621a0b8991fc16432438f5617e0dc54969f51d249c74390b4d12ee
 DIST roc-toolkit-0.3.0.tar.gz 1679439 BLAKE2B 31775d330bdfb3c42278d1ecbbbb5e14f695ca82f22929e435b6c9bf10c2e25c3367d11cf2913a81e6469876c255193be11eb78b775fad3b17f57c5be9c4bb39 SHA512 447532862dc1714054ebd03ce7fd101525c213a87bc7198a55c8e6068c28db318d59389bafd83681a4e6b34a61e68ac305c66b84e417a3f791b02340a821e6ec
-EBUILD roc-toolkit-0.2.5.ebuild 1976 BLAKE2B 0e2a035a6c2622c794b4b479ecb50384ee9a0c3af8d0f513727505be05e2692d69e3e4101402fdca30e78b0983c8684e043448316d7f7ef5700ac8b23f03edff SHA512 927c7728a17529908b91db475467eb4ddeab71f58d484aa1a8f03bff5992238bc8c83482247d9b5a54e7c65eaa653c7309b25e5a001ce7dea2663c21bce40fe7
-EBUILD roc-toolkit-0.2.6.ebuild 1976 BLAKE2B 64698006e162580dd126f6aa9baa22bae2b46a8b1bdfc21bd3ec2a46de57b0d7faa94a345e60b0facc582a4906d011029e5ca9f8465f36a374eba105aaffb2eb SHA512 196bc2d10c2b32cb3d0820fd84f047fdc5907121edc055ad8ecf942d89aa4ccfa344b91c4a0b62a6f6e7f497b99eeb79df34a3d7b31993f335de23d2324025ef
+DIST roc-toolkit-0.4.0.tar.gz 1895030 BLAKE2B 2ffcf6b1ca50fcae09c7aaa27939e23428feb21f330d578d731e494c62aa088c7e00de3b1a1b488d1bb13ffcc979fede1fc2726e2293a383a87174a4480e8aec SHA512 51763287ee825b6617273ededd9e77560f4223b8ba4a577855c3225908e848895a4f925163862cf6d19a8215245ec26f33d07d6cb80c51768d37eaa06ac02063
 EBUILD roc-toolkit-0.3.0.ebuild 1978 BLAKE2B fe5b0ecbb54ce0eaafe4abe9d63ac0dff29e7ac220a3227706c3a667ea566681f81decf51e1d0a3fbe415fadf7d38af881f9efcf70e7d458c1d2549c87dee87e SHA512 5d956260db827c0455f84ea714a24db7a8da0aa30b54f08fed25e6315b2d4b66c887b19624730eb27bff8c26ba31c6bcc2d398ebdce8570efac29a104ff0557c
+EBUILD roc-toolkit-0.4.0.ebuild 2156 BLAKE2B 5eb1e81ba46775d9afe73a62cc54e2167b1337835b4f4a4a1e71c1f374073fa517270849f5d761d1cd87709aedc55f5865b2e4f63f5d0d2596b728fc6c7746c4 SHA512 4aff9dcc4994f0a0e1fa032ea95e3fff9388a84651689f306db786de0f3a188d194fbd4d40a7aa658b5b1be35de8095c33b14b732003d9ed6ceccf487694ac73
 MISC metadata.xml 424 BLAKE2B 809444d92a63d99a23c18612cc9559138cdecad99b2af61370141f18e2d0acc0518f1bcee47cd435e26f096b49269b92a3c864e871ef7ae3e15de15f0bc09d6d SHA512 7dfdbb7a4be3022622e15bb263f493f0fdb17ea00c9f6b3711be4877993aaaabe05334dac14e290e602a663fd40dc3ac2f6697e979f0f4b8f9866befb7ac5ae3
diff --git a/media-libs/roc-toolkit/files/roc-toolkit-0.4.0-dont-force-O3.patch b/media-libs/roc-toolkit/files/roc-toolkit-0.4.0-dont-force-O3.patch
new file mode 100644
index 000000000000..7f069ffbd0da
--- /dev/null
+++ b/media-libs/roc-toolkit/files/roc-toolkit-0.4.0-dont-force-O3.patch
@@ -0,0 +1,22 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -972,7 +972,6 @@ if meta.compiler in ['gcc', 'clang']:
+         for var in ['CXXFLAGS', 'CFLAGS']:
+             env.Append(**{var: [
+                 '-fvisibility=hidden',
+-                '-O3',
+             ]})
+ 
+     if meta.compiler == 'gcc' and meta.compiler_ver[:2] < (4, 6):
+@@ -990,10 +989,7 @@ if meta.compiler in ['cc']:
+                 '-g',
+             ]})
+     else:
+-        for var in ['CXXFLAGS', 'CFLAGS']:
+-            env.Append(**{var: [
+-                '-O3',
+-            ]})
++        pass
+ 
+     for var in ['CXXFLAGS', 'CFLAGS']:
+         conf.env.Append(**{var: [
diff --git a/media-libs/roc-toolkit/roc-toolkit-0.2.5.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.2.5.ebuild
deleted file mode 100644
index e05dc881d770..000000000000
--- a/media-libs/roc-toolkit/roc-toolkit-0.2.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Real-time audio streaming over the network"
-HOMEPAGE="https://roc-streaming.org/toolkit/docs/ https://github.com/roc-streaming/roc-toolkit/"
-SRC_URI="https://github.com/roc-streaming/roc-toolkit/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="alsa llvm-libunwind pulseaudio sox ssl tools test unwind"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libuv:=
-	media-libs/openfec
-	media-libs/speexdsp
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-libs/libpulse )
-	sox? ( media-sound/sox )
-	ssl? ( dev-libs/openssl:= )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/ragel
-	virtual/pkgconfig
-	test? ( dev-util/cpputest )
-	tools? ( dev-util/gengetopt )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.5-dont-force-O3.patch
-)
-
-src_prepare() {
-	default
-
-	# These tests need network
-	rm -r \
-		src/tests/roc_netio \
-		src/tests/public_api/test_receiver.cpp \
-		|| die
-}
-
-src_compile() {
-	tc-export AR CXX CC LD RANLIB OBJCOPY PKG_CONFIG
-
-	# Can revisit these on request, but:
-	#
-	# * openfec is unconditionally enabled as upstream docs recommend it,
-	# see https://roc-streaming.org/toolkit/docs/building/user_cookbook.html.
-	#
-	# * speexdsp is unconditionally enabled as it's tiny.
-	scons_opts=(
-		$(usev !alsa '--disable-alsa')
-		$(usev !sox '--disable-sox')
-		$(usev !pulseaudio '--disable-pulseaudio')
-		$(usev !tools '--disable-tools')
-		$(usev test '--enable-tests')
-		$(usev !ssl '--disable-openssl')
-		$(usev !unwind '--disable-libunwind')
-	)
-
-	STRIP=true escons "${scons_opts[@]}"
-}
-
-src_test() {
-	STRIP=true escons "${scons_opts[@]}" test
-}
-
-src_install() {
-	STRIP=true escons DESTDIR="${D}" "${scons_opts[@]}" install
-}
diff --git a/media-libs/roc-toolkit/roc-toolkit-0.2.6.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
index f2fd8112d8fa..9fcb5e25b045 100644
--- a/media-libs/roc-toolkit/roc-toolkit-0.2.6.ebuild
+++ b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,22 +11,23 @@ HOMEPAGE="https://roc-streaming.org/toolkit/docs/ https://github.com/roc-streami
 SRC_URI="https://github.com/roc-streaming/roc-toolkit/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="alsa llvm-libunwind pulseaudio sox ssl tools test unwind"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa llvm-libunwind pulseaudio sox sndfile ssl tools test unwind"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-libs/libuv:=
-	media-libs/openfec
-	media-libs/speexdsp
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-libs/libpulse )
-	sox? ( media-sound/sox )
-	ssl? ( dev-libs/openssl:= )
+	>=dev-libs/libuv-1.35.0:=
+	>=media-libs/openfec-1.4.2.9
+	>=media-libs/speexdsp-1.2.0
+	alsa? ( >=media-libs/alsa-lib-1.1.9 )
+	pulseaudio? ( >=media-libs/libpulse-12.2 )
+	sox? ( >=media-sound/sox-14.4.2 )
+	sndfile? ( >=media-libs/libsndfile-1.0.28 )
+	ssl? ( >=dev-libs/openssl-3.0.8:= )
 	unwind? (
 		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-		!llvm-libunwind? ( sys-libs/libunwind:= )
+		!llvm-libunwind? ( >=sys-libs/libunwind-1.2.1:= )
 	)
 "
 RDEPEND="${DEPEND}"
@@ -38,7 +39,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.5-dont-force-O3.patch
+	"${FILESDIR}"/${PN}-0.4.0-dont-force-O3.patch
 )
 
 src_prepare() {
@@ -66,6 +67,7 @@ src_compile() {
 		$(usev !pulseaudio '--disable-pulseaudio')
 		$(usev !tools '--disable-tools')
 		$(usev test '--enable-tests')
+		$(usev !sndfile '--disable-sndfile')
 		$(usev !ssl '--disable-openssl')
 		$(usev !unwind '--disable-libunwind')
 	)