gentoo auto-resync : 10:12:2022 - 15:20:44

6 files changed, 47 insertions, 3 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2088648de739..87c452f3acd0 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index a9b13eafb3ed..31f49f0566e0 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
 DIST libopenmpt-0.6.6+release.autotools.tar.gz 1554516 BLAKE2B 21e2fc4252431235608a52d3a321e26eae5d45f2328ff3e3604d84c537d72e07d72346c504901b000af04dfc52b1dd91c79f576be4331ea8685e534a174b61cd SHA512 b634c556f13dc51d1008f4216936a9b7cab25a6fb0d5218da0b692ec848de21905ed1981223ac9ecdebea9ce6c5376e91ff92e1655dd0be491fce0114e3230bf
-EBUILD libopenmpt-0.6.6.ebuild 1553 BLAKE2B d0da9412d2484b1df2e738f57709edf93e23c076fb251ee4877ddf3609715dd5cf260eb5d9bdb35ad52d0b6301a95a2a7f2d8b9e83b25bb72ae9e1244f000062 SHA512 4a3696608cb68854b0a5c55fcb405d37dcfc9e737d13ba3a3fdd2caf2cd52e59bde98623de58a4f73b01a90619ac3033c16b73222a5e42c67c00dae2c2c2d1b8
+EBUILD libopenmpt-0.6.6.ebuild 1560 BLAKE2B 649dbcde7c2bc9aabf1b50f6d7e232e1173f6669e9b73afb34b9cf6273783f52193dda79aa52d54fc0e502fe3a978bbba79bf04c631d2141b91c8d456e8ec4ac SHA512 35cea07a2a46d8f316455e5115e6388b601bb5fe8218a4460e4b523e4401b8b771d2d1149fbb5f97462bd8361ea842034040d80a40ed91166056f24273288bb0
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild b/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild
index bf361001a1ec..6b839e1264b9 100644
--- a/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
 SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="examples mp3 ogg static-libs test vorbis zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index d45905230dd2..44a0bf7f4580 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,5 +1,6 @@
 AUX pulseaudio-16.1-memfd-cleanup.patch 988 BLAKE2B cbb25ef86099e1c13bd07c33c871b38d2d21015759569f6ed51c7f04a4997e85e3926ea573e76699d3615744ebfa3fd7cab20e3cb0a6a53f11975c0cd3314ef1 SHA512 62029ff446d005fb0d47b3c88694e0d4497321a8967802de2e915b5a885f596354310e6f5f5805cb352dbdf8a9339beca67377447a69b64c1916b4c3e6f14e31
+AUX pulseaudio-16.1-proplist-util-without-gdkx.patch 1486 BLAKE2B 74b6ed59dff2ab4c62bab9e218874ff4da1d651f8ff80d715965b7be61323d77436851f6f2ffb9f8667c9ee918d6eca315fea3f6fe2670798f1ef6ed58728a3c SHA512 a5b5ac40083237ea0cd916506eb490891937affc1d69f81399a6a1f8f0782ebe9654641463ab33931add749282880ab415dbf0f89bd1a1d6a0f88f2845886d13
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
 EBUILD libpulse-16.1-r1.ebuild 5779 BLAKE2B 4477cae3655af8ea4d2e0917cfe3fa4821f824affbefe77ee23f4d560e5c68bc1a8ac15c2fc94682311d466301afd0d9fea6e22e2cf4bf2016a1e1c090e876a9 SHA512 c4b40281466a4284128b5143c7e27ac30c198b562c79f1efe6c828ba9571d73d5d76c1821eda47fe8b6c978a14e15eeef9e0c5abce1cf71a300ad772886d58f4
-EBUILD libpulse-16.1-r2.ebuild 5837 BLAKE2B c7b972b513cdbbf69d9447a8a5796fd8f5eb66d43ba4491b531ab4b20bb973978519eb8fcbf4e71d94ec6f10476f4eebd2012dbe6faef7670ad55fdd2d4a3e19 SHA512 12a466ae82e428c6d524e7d5377e8da21807203d6f3c00c3ea4b6b694c80b971c17ca70bcd032dbe31f15c04b49f44516330c1ff58ba09e77d8a3618f88dde0f
+EBUILD libpulse-16.1-r2.ebuild 5901 BLAKE2B 15ffc9d6b5f49c55c5acab14e39c9da7c49fb4ff09c5b57899a3bdbe26a1713f75171a8827d7bdaac66df1f66361a8f3998d9fcb7167dfef8099b696bf58ea5d SHA512 9e3cf60e2f6a17ad58f0e76c14d0fc191173e83e2fdc9e14f3e4cfcada14c54ba68e7929a8a27dd555a484e36d152472abfdacb7a46aa4e72fed5d8b2df68868
 MISC metadata.xml 925 BLAKE2B 00eb044359e5cbbaa5fdd085a76be9582c1142dc7334ebcfca531975961bbe35bd4d7a3b1f06e760126b0422614103480c1199128a908567dbe477af017f5ae7 SHA512 9c244a9725fa5acf9d1c3e869cd794d0d70dbe29126af877ea5918adf12c9ebfe87576c074db8126d168368ca93bb0e5577912780eb467377ef58d4cf44895bb
diff --git a/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch b/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch
new file mode 100644
index 000000000000..a5e025ccb4dc
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch
@@ -0,0 +1,42 @@
+commit 89ce6321bd19452097392ddfb416bc51a280b63e
+Author: Mart Raudsepp <leio@gentoo.org>
+Date:   Wed Nov 30 09:25:22 2022 +0200
+
+    proplist-util: Don't assume gdkx is there as gtk could be built without it
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/757>
+
+diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
+index 16ea9e006..1330ef5ef 100644
+--- a/src/pulsecore/proplist-util.c
++++ b/src/pulsecore/proplist-util.c
+@@ -51,10 +51,12 @@ static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_applicati
+ #if defined(HAVE_GTK) && defined(PA_GCC_WEAKREF)
+ #pragma GCC diagnostic ignored "-Wstrict-prototypes"
+ #include <gtk/gtk.h>
+-#include <gdk/gdkx.h>
+ static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
++#ifdef GDK_WINDOWING_X11
++#include <gdk/gdkx.h>
+ static Display *_gdk_display PA_GCC_WEAKREF(gdk_display);
+ #endif
++#endif
+ 
+ #include "proplist-util.h"
+ 
+@@ -89,6 +91,7 @@ static void add_gtk_properties(pa_proplist *p) {
+                 pa_proplist_sets(p, PA_PROP_APPLICATION_ICON_NAME, t);
+         }
+ 
++#ifdef GDK_WINDOWING_X11
+     if (!pa_proplist_contains(p, PA_PROP_WINDOW_X11_DISPLAY))
+         if (&_gdk_display && _gdk_display) {
+             const char *t;
+@@ -99,6 +102,7 @@ static void add_gtk_properties(pa_proplist *p) {
+                 pa_proplist_sets(p, PA_PROP_WINDOW_X11_DISPLAY, t);
+         }
+ 
++#endif
+ #endif
+ }
+ 
diff --git a/media-libs/libpulse/libpulse-16.1-r2.ebuild b/media-libs/libpulse/libpulse-16.1-r2.ebuild
index 773e74668690..5ee6d6fdcbad 100644
--- a/media-libs/libpulse/libpulse-16.1-r2.ebuild
+++ b/media-libs/libpulse/libpulse-16.1-r2.ebuild
@@ -77,6 +77,7 @@ DOCS=( NEWS README )
 # patches merged upstream, to be removed with 16.2 or later bump
 PATCHES=(
 	"${FILESDIR}"/pulseaudio-16.1-memfd-cleanup.patch
+	"${FILESDIR}"/pulseaudio-16.1-proplist-util-without-gdkx.patch
 )
 
 src_prepare() {