gentoo auto-resync : 18:06:2023 - 07:47:30

6 files changed, 41 insertions, 4 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bb2ba9f1b5c6..3231698dc921 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 482a6bd8a541..795c0b7b3730 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,6 +1,7 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
 AUX guitarix-0.41.0-py3.11.patch 774 BLAKE2B 21a0f9caff1faf18cb68b04abd2e5658cac7997ac5155550accae9dee295d79b9c5d01cce0c6c08bdba3d92ec04a7abb8d13183f60f8ba60d169c71b0e3f2450 SHA512 97d18fa4112a3998cbcc353c02df51593baa18f97a487d301fbaab360ba90d73cb091029184a9eee62dc1fb5d8bc33d74fae18ba13243fb220899fe62fff70e2
+AUX guitarix-0.44.1-zita-resampler-1.10.patch 1021 BLAKE2B c92edef916bc2b3feddd473a1d5ce12de8d21f041ecfe44d38d04fcee2a2fb6a30bd3645684a3c0e93c29f76ed5a75872bf63ed07ba237e3473aaafd634f999a SHA512 bddb09a30768237ecf865d8afc4438421fe6777a58e700a347eb2099862aefec9e8d107fb237a548722e29ccf98382d94c42b408f8d549cfa85c7c6070471617
 DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1
-EBUILD guitarix-0.44.1.ebuild 1847 BLAKE2B 0b776e42ebc98d13b7df91912b438feb4a2cf54cf8e061cd40297f374fb36bbcb386640bdaff2fc1891f12a14062841470696e09b284ce56c1cb703893a45d88 SHA512 b6cf2dd1fba4e20f6cb5767dc67e3221fdd170af1f359df9b0892c0adc0d715105fcc5ffd650080d5cd6bd0f6e6e4dd167f2497a292650c88e68a9668c646f6c
+EBUILD guitarix-0.44.1.ebuild 1901 BLAKE2B 5b500ffd571d889e227632e4b2d725cfbcee465e7e836e5b9f78b9a8d6743dc3438c21afea88afff13ee70cf0f4bb7a6c9c86172f089b56e26f4dfdef8bd6b00 SHA512 c9aef2ac769a0528ec2651dddd0e70d3f9ab225d8260764bfc757164490184f5b7717852b19b13e50075a7bc205fb4ad9d5c8861924ad61338104db158cbaadb
 EBUILD guitarix-9999.ebuild 1867 BLAKE2B 638655f7f0187d725978f139d0bff282dc698ba49f275e34cde06b4951cf00d25d289a800ad06131e50646a10a53a9ff6a088fd6d53f6f3469ae36ab9d8604cd SHA512 6eaf0cc3020f54cfc4a7473fcb1006f46f67c5366bbab9c1e1014aed5825189853d99da6327a8d017498a2a592f24778c344ef72ed9e795cfa5cc499b620ec2b
 MISC metadata.xml 775 BLAKE2B 9d259fec3163a9b8150ed287c8ed803314620ba60c60dd479051ae980d5c25a007b38b2d6712720af834b90ff91c72962d55bb539983001f98bb4ed549511c35 SHA512 6ad0963c139caaffa1b58a60fa30a797b69a7ed74a8924606e60c75b2ae6751954c179ab0ff40a83288c0ad7655c9ed499e38c7bf0a88928e2dcddf5ab6a5826
diff --git a/media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch b/media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch
new file mode 100644
index 000000000000..1eed9bafda27
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch
@@ -0,0 +1,35 @@
+From 4c15aea1425ef19a5d68387e60abfab830fed20b Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Thu, 15 Jun 2023 22:05:29 +0300
+Subject: [PATCH] Fix major version detection of zita-resampler >=1.10
+
+https://github.com/brummer10/guitarix/pull/129
+
+Fixes #122
+---
+ waftools/zita-resampler.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/waftools/zita-resampler.py b/waftools/zita-resampler.py
+index 1cd49a2a..ba5bbc7c 100644
+--- a/waftools/zita-resampler.py
++++ b/waftools/zita-resampler.py
+@@ -18,10 +18,11 @@ def configure(conf):
+     code="""
+     #include <zita-resampler/resampler.h>
+     #include <zita-resampler/resampler-table.h>
+-    #if ZITA_RESAMPLER_MAJOR_VERSION != %d
+-    #error
+-    #endif
+-    int main(){ return 0; }
++    int main() {
++        int maj = zita_resampler_major_version();
++        if (maj == %d) { return 0; };
++        return 1;
++    }
+     """ % expected_zita_resampler_version
+     conf.check_cxx(
+         fragment=code,
+-- 
+2.39.3
+
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 04e6a893b200..5529fdc46ede 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -64,6 +64,7 @@ DOCS=( changelog README )
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
 	"${FILESDIR}"/${PN}-0.41.0-py3.11.patch
+	"${FILESDIR}"/${PN}-0.44.1-zita-resampler-1.10.patch
 )
 
 src_configure() {
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 2af1be06f5c2..1a2206e245b6 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,6 +1,6 @@
 DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93
 DIST playerctl-2.4.1.tar.gz 77371 BLAKE2B ae9f691d714d6235bd7dc3e3d9a2ed21190482bd2aa8642c108ade0c09902ccb20196d0180ed3b1ffe680ca4e6a4ee293de1a6f10d54878589e3d8c81ca81c53 SHA512 2d84f657b07c948cd6990d9e79c4eb6e83f97c387ac53c2322fc0adbeb853950fa935332233329e7555db7d157f3ced6498cc102edaffd78849ca1f7d4c49bdc
 EBUILD playerctl-2.3.1.ebuild 1202 BLAKE2B a6aa753d25f13e67f3c07ad2c84eb5a8cfca681fdf79b104697e775495fdcd79834a0f455bf9975713768e15b37c3d895468f897dc58dcb5cb6501f9fc1d7542 SHA512 d542fecca06ef234072c715be3ccca5771864eeb05112750ac30376e95655e4833d6fe1d44f060a4f556b853f1d27f7cfdc956f1179ac1a0f3639a8eba33b418
-EBUILD playerctl-2.4.1-r1.ebuild 2361 BLAKE2B 8af9d735a9d2e7d818dea55fdeff55816bada0ee1e9476a8a5e6b0db18eacf271de759bc85cc9c99c467f2b1e821570d3da6f0c83c2581ea12555fca38fcbc34 SHA512 bb586f4b92f0f084844fc6ba23e5056553109e34ffb53462fa34d1532245ad57f5825462d626f3ba27457fa0a5c4aa41d298e6623b6f653117f29da9b14179e6
+EBUILD playerctl-2.4.1-r1.ebuild 2376 BLAKE2B ef7557f81356b43be9a36ace8bfaf44e0d6f4ba04e593ba7e646169e4ef9a1f4e6948e6c0fb2ef5ba206f245ffd7616c9a82a39b36cb8e5c27956d2ec336141a SHA512 c140c7d4fac663bcc68009a58af0349bf981b8759b695fe7089dd5c073c882c8a32c1baa9cf4b89ef4ee06f8bfacc1d7787ca8893ec53d4722300e7a0a6f5a0f
 EBUILD playerctl-2.4.1.ebuild 1212 BLAKE2B a4e2c1675096a87e8c44b3d9bd48a71f5f5da1fb9a2ddc8205b97cc4b4c463017d7639c99a5a7e0f688ac493e05dbf0dca3f3fa8a1dcaae62ffe35d820872c65 SHA512 fdaea7744cac060bc85b341f738a16c8ec5d5fb5681f96bd9a38f106f8c1e994f176e41b1ed56fea547a3d6f5973521ce1e2c74a5b8d6aec09f3ffa77bfbc9eb
 MISC metadata.xml 344 BLAKE2B 291e21642ebc0aed630579a079c007dc54669960a8b2e68f8a62f199a1cf308f0d020118fedfbd5693010d2de61f1c7b6488acf720508422493cf3e83f1ac466 SHA512 d7df9fd6e2a27888c608dd8a39461145489bbaef13fe83d0bde941adba3a496106b62ae33562a89bbb0dfa718785104f57a11fba3cc73a18edbeb5990a7c6a5f
diff --git a/media-sound/playerctl/playerctl-2.4.1-r1.ebuild b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
index e1337e2c4146..c206e29e4724 100644
--- a/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
+++ b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc introspection test"
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
@@ -81,7 +81,7 @@ src_test() {
 
 	export PATH="${BUILD_DIR}/playerctl/:${PATH}"
 
-	virtx epytest
+	virtx epytest --asyncio-mode=auto
 
 	kill "${dbus_params[1]}" || die
 }