gentoo auto-resync : 28:11:2023 - 16:53:39

4 files changed, 119 insertions, 2 deletions

diff --git a/media-libs/cubeb/Manifest b/media-libs/cubeb/Manifest
index 94d972cb430a..fe1a96fea118 100644
--- a/media-libs/cubeb/Manifest
+++ b/media-libs/cubeb/Manifest
@@ -1,9 +1,11 @@
 AUX cubeb-0.2_p20211213-automagic.patch 1378 BLAKE2B 4ecf503dce1cdfbfa44601dff21871755515452850ce720c83df5857b55ca8e6ee6b4e39ca204a7d411a6011ab272db50e4e407a59ae1c020609b8f59551fbb4 SHA512 ce7bf7954def11f95e8406bcb9e275680bcb9a072cd80ba49353322356142175317bb11482c912825c3c5e6e66c01b007d5adea8d6024ebb1d51b986d48f72d6
+AUX cubeb-0.2_p20231121-automagic.patch 628 BLAKE2B e4d834d5de2e04c974cb758591ae2a02c0d5dd1f628a35c7f69c30dd8a2ab7d234682a8b58e80bf349b89f37ce33f1a95729e32e6c1b8d0eee4a9e0fc636423e SHA512 e4948d9df5435da961f2b2eaabd51e347a2b024d0afc2e9a7fcc9f226335ef56956d8e71f571a79e98173944cf4c4ae35a2dd7d610d2987d3496a6e68ef5507e
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
 DIST cubeb-0.2_p20220922.tar.gz 223096 BLAKE2B 55e9bca6792a9e27e74ad29d0059b97997f15c58b04982a37e9afb0edeecfddf9ef41c40f934207883b46f3b669c5323ee9399fd4abd78b0bf91609ffda7d8ab SHA512 cbdaed8202649cd5ef6970457c412c94e3a7e12036017e551a2396d52ddd66061ed7cd9f5442418e5b410756836f1535bc957af92c2709c72a2a1c8e77f0678a
+DIST cubeb-0.2_p20231121.tar.gz 228779 BLAKE2B aa4b2a1e2f240efc67e827e1fda58c15d13ff9e4ced7c01bcbd4509c3853a247e7f1f77fad18b7622e20c65304550364e847829e34dc25b99a4b2ed6ed67111a SHA512 7ba1cd5b74d49512d2ebf9b07889ee3ad46559afe3293bcbebae0613661f7502f0baaa20b6723738c21b2d71f9d8f72ed1252703533507dec5d2b5ad84784017
 DIST cubeb-backend-0.10.1.crate 6359 BLAKE2B 5830be150dfa1dd2ece6dd1bbc3400c23d85867ca066107175f0da8e2cb2066e247f103f2cc4d523018f8ff98235b794fd68272798ee8e09c59a070bbb6b6ce2 SHA512 dd9d47af3f1b0a5af2e6bbccd42e8c8ea50cb995d82f0a090adb236a3759a5107c1b840da03701594181e63138e5d31ca3741262a7a4aa1ca1309e54c8aa50b2
 DIST cubeb-core-0.10.1.crate 10915 BLAKE2B e428637a4d0946a630b9a33c9ac856a8a92d4a8e30e33abf375e592bdc061a95c33414345b18c8c447d7753a8b0a1c8fcaa7b0b3e3b15593908816e029182871 SHA512 2d3f6c904c966adaf9fb886b42d33776ff5ad57600e1057a9b35e7cd9e2de34a028b0e33602db69d6f0bc038391ebbe6b102bf3a883e1fa9104f55e2ec124a62
 DIST cubeb-pulse-rs-f32b3ef708.tar.gz 37717 BLAKE2B f77cb42b32439025f4d1fbbd4558560b8420b24d8e13881f5280532860a495cc2ce95bd70d114de2777e3cacf785e55f6965b1a3aee9ba8fcca33d14e1a71956 SHA512 f801b24173f34b801b6e78fcec232736d353d78b4b8d3d690e69524c3b146aa0345e746dcb81aa8cf1fe17a85bf0e7f940f4b9c46d64de644e3b03d498af5f76
@@ -13,4 +15,5 @@ DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf
 DIST ringbuf-0.2.8.crate 19502 BLAKE2B e8f89e385c7bf6abca64861b7056327679cf6a969dbf2f2304c06fd1d67c99e246c647a58a13954cc8e0e16918fa544e8f25cc4610dfe5ba8879f22584356ea7 SHA512 8bf2d79c65451df9b22b696a6ddddd004768e8fd90920d624fccc77ff5c63067fb663b3cbff9e29e17b7d553f86e2016d754f3ff843f34dfd0a105ade2630f53
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
 EBUILD cubeb-0.2_p20220922.ebuild 2735 BLAKE2B 4391c4a119a6430c08f50c327fa2e663fb9495af618df62607c19b2ea12fe390fec3914c2935a98a40809db0ae6bdcb3bea4919ebe35ba042d4ac300c31616d0 SHA512 1b42857d333921dbf2682bafe787c123a1e0658313afedf83e20b2d2af973dd47ba272ac6f6353c3e75ab38841a52dc856db51474b7ab4494ce3576edbaafc31
-MISC metadata.xml 569 BLAKE2B 811caf3735182ee5d94f88c8b4b725deb0a64dda04e211759b2fd3c280a5f87e9c2fdb53dc2ef1fcaa50a83f6feb8ea5b58274815f97c05502144c7d372f8002 SHA512 7a8cd8ed6464e4249aa9ed97bf9f4ec9995b710c39cca631b6e42edbcfd85839815fba00db3577c60f343cb7b805fa97fd186542cd03cae05d58684415cc82a2
+EBUILD cubeb-0.2_p20231121.ebuild 1716 BLAKE2B eee118ab20bc62c9cd3e20c786f6a66c0dfab86211f3d6d6ebd86d1c5c865945102cabd4451bda786c374f3917789780b9ea7bc23079df042e067bc98c030982 SHA512 5716c3c8dedd0479b9c21535722f36d6e9553a294237597d24e4059555f6bca4fbb99298237b773efd8003dbdfcfcca4b85c6e23a59fdbe8e43bf7da9b818e0b
+MISC metadata.xml 507 BLAKE2B 734f29418763c52994126309d9e8fb621f23f94fe82c73c49366c14db49302ecac191a7f2ea5f0be54e3e5d2eee2e4c5febf9560de37c19523b64319f10cf20e SHA512 f90ccc806da30657df4f63db93e9c97b6df05b2e3a825bcd64bbb4e3b835df6ba2e9ad3353dfab98719ba16165ad2b29791bd6f6c56f1d0bdaf2cbb28ecf4a41
diff --git a/media-libs/cubeb/cubeb-0.2_p20231121.ebuild b/media-libs/cubeb/cubeb-0.2_p20231121.ebuild
new file mode 100644
index 000000000000..f743f23e580c
--- /dev/null
+++ b/media-libs/cubeb/cubeb-0.2_p20231121.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+HASH_CUBEB=54217bca3f3e0cd53c073690a23dd25d83557909
+
+DESCRIPTION="Cross-platform audio library"
+HOMEPAGE="https://github.com/mozilla/cubeb/"
+SRC_URI="
+	https://github.com/mozilla/cubeb/archive/${HASH_CUBEB}.tar.gz
+		-> ${P}.tar.gz
+"
+S=${WORKDIR}/${PN}-${HASH_CUBEB}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="alsa doc jack pulseaudio sndio test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/speexdsp
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2_p20231121-automagic.patch
+)
+
+CMAKE_SKIP_TESTS=(
+	# need access to real audio devices, and without sandbox
+	audio
+	callback_ret
+	devices
+	latency
+	sanity
+	tone
+	# fragile unless all backends are enabled
+	device_changed_callback
+	duplex
+	record
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# test currently does not build unless use static libs
+	sed -i '/cubeb_add_test(logging)/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUST_LIBS=no # leaving out unless becomes really needed
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_TOOLS=no # semi-broken without most backends and not needed
+		-DCHECK_ALSA=$(usex alsa)
+		-DCHECK_JACK=$(usex jack)
+		-DCHECK_PULSE=$(usex pulseaudio)
+		-DCHECK_SNDIO=$(usex sndio)
+		-DLAZY_LOAD_LIBS=no
+		-DUSE_SANITIZERS=no
+		$(cmake_use_find_package doc Doxygen)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/docs/html
+}
diff --git a/media-libs/cubeb/files/cubeb-0.2_p20231121-automagic.patch b/media-libs/cubeb/files/cubeb-0.2_p20231121-automagic.patch
new file mode 100644
index 000000000000..00d6ad3eb2d4
--- /dev/null
+++ b/media-libs/cubeb/files/cubeb-0.2_p20231121-automagic.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -182,3 +182,5 @@
+ 
++  if(CHECK_PULSE)
+   pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
++  endif()
+   if(libpulse_FOUND)
+@@ -189,3 +191,5 @@
+ 
++  if(CHECK_ALSA)
+   pkg_check_modules(alsa IMPORTED_TARGET alsa)
++  endif()
+   if(alsa_FOUND)
+@@ -196,3 +200,5 @@
+ 
++  if(CHECK_JACK)
+   pkg_check_modules(jack IMPORTED_TARGET jack)
++  endif()
+   if(jack_FOUND)
+@@ -203,3 +209,5 @@
+ 
++  if(CHECK_SNDIO)
+   check_include_files(sndio.h USE_SNDIO)
++  endif()
+   if(USE_SNDIO)
+@@ -209,3 +217,5 @@
+ 
++  if(0)
+   check_include_files(aaudio/AAudio.h USE_AAUDIO)
++  endif()
+   if(USE_AAUDIO)
diff --git a/media-libs/cubeb/metadata.xml b/media-libs/cubeb/metadata.xml
index 2d8dcbf48bf3..8f8c47fd0ccd 100644
--- a/media-libs/cubeb/metadata.xml
+++ b/media-libs/cubeb/metadata.xml
@@ -11,6 +11,5 @@
 	</use>
 	<upstream>
 		<remote-id type="github">mozilla/cubeb</remote-id>
-		<remote-id type="github">mozilla/cubeb-pulse-rs</remote-id>
 	</upstream>
 </pkgmetadata>