6 files changed, 36 insertions, 4 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ee0cfc5d372e..c954227af296 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libmpd/Manifest b/media-libs/libmpd/Manifest
index b5993e0851e5..1431b93b0a2e 100644
--- a/media-libs/libmpd/Manifest
+++ b/media-libs/libmpd/Manifest
@@ -1,4 +1,4 @@
 AUX libmpd-11.8.17-remove-strndup.patch 439 BLAKE2B 35f5f6efc5233ea61ce7967c52bf69d3aa44814d3506534d4272ef3df454e93e14005cce25b929d066dd4e4d1c1c28a08e7d6b59c490c1926e46fa61d1bf8511 SHA512 0b0c3b28abd7aaf540d6133ad5a72f5e0fc2cca593bc870106c17d9b1828a2bb35880436a489261ef1c56bbb176e0809d6f09165108bf867f776902cd5757fff
 DIST libmpd-11.8.17.tar.gz 365015 BLAKE2B ed6afc3a90fa8a6b6e53ecfd67d195133a6bbecf4ddb3960247b5b2944624f0851d73229145a2ccb7eb3ca84b1d3a245dd3cc1de39f3bd9d5bd21f58f6576e18 SHA512 ffe2880834a4a39745a5327d628781e16eeb8cd1ec17402dda46ad96ff402bc0d8b4312ba058a39242ad9bb8c3a0bb6feb2c5ea2a30ef9be97652fdb5c02572d
-EBUILD libmpd-11.8.17-r1.ebuild 878 BLAKE2B b81b188c08e90804179dffa1b0157887065ce1504f7f3de84f2a76569ec660478a14494af21daa69994a17503dd955cc5cd6cf344542f1b1ce7f133bdee0ce33 SHA512 204b5595a3b539500288b454a16dcb7880da6eba162cd3fd77eaa9207505ece8f1e1196dc4fe7e7efb4ec57b68c4c348eee0effb761471824a53348312a273b9
+EBUILD libmpd-11.8.17-r1.ebuild 877 BLAKE2B 4f4a354614dddd8863090387c44d6ae9d5d1c1829d3a53bd0b5380f873571547821c28b2e95287e6d37489811adb99651b43afd6e8919ce3d429b3e2d133f386 SHA512 a4dfe2f01f4b9409e663b2d4adc168c4468e3ee4a98005f50f576fd7be756727c4aefa3626f41223daae278c872409f959b432c59da86668962dc2035b02611a
 MISC metadata.xml 252 BLAKE2B 648cca48f0a3b65ded6fd96d45d3f23cfae98bfa6b5f683383f1f49eedf763f99e034958d5a91ef3bf0904304eb7fa78dd7a582cf337762df4bd59c1eeaafb4e SHA512 cff6482e227806ef72806b8b925a4f5a3dfb87c26007a4614e1891524f18fb33c49d4d774d824676b02664d2703d8d8e8605e2f15983346868f4ba49405b75c4
diff --git a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
index 8d3bb12a8c0d..8703a2dfd0d2 100644
--- a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
+++ b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/media-libs/nvidia-vaapi-driver/Manifest b/media-libs/nvidia-vaapi-driver/Manifest
index 99828d00c8e6..41f7bde0fab6 100644
--- a/media-libs/nvidia-vaapi-driver/Manifest
+++ b/media-libs/nvidia-vaapi-driver/Manifest
@@ -1,3 +1,4 @@
+AUX nvidia-vaapi-driver-0.0.11_musl-support.patch 733 BLAKE2B 30f340231ccd3d83303094d04bf75035f069b487a7a617b224158764d68f677f11ab005251789b18df5eddc82f234d2eb2812d2aa52f111d0f8b1fd7089ab705 SHA512 546cf7680929aab8ec59b65a590e80e7a706fc6ed377dc769ab5aac21eaca4c50714576c7d68a3c5c42649e82ad6ec6faec558f0f478dfb535189d8964b30c36
 DIST nvidia-vaapi-driver-0.0.11.tar.gz 182479 BLAKE2B d025473e200097e7370a8fb0892374d09aa3966cc788d9aa39a8fcaca790df22b13aed6dfe7a69f8a002883248a6a6cfd606fe7c64d0f4bb05f5d567a55934ff SHA512 87eed3d40c891793abccb753af50f0a0ef26bd7be1ccc851fe90657918d3c8440855b3f9bb58c6f44cb2e92eddf222350d26669360f5b8cfd46b80d5691c1a83
-EBUILD nvidia-vaapi-driver-0.0.11.ebuild 592 BLAKE2B 4984edba177fc92539e6a1412c99748276e300e5bf2a27c8cb4f82d7ca97fb1770a237cc4a6bf99b3b8c24fa8cfd3a2674fe79e73769a85f8b13e79bc0238285 SHA512 457bbe279b05608190da81a114172a2ad940c6c49fd495dada0cd1f398f32b06d901a6c5c2803a81e6fe7f15177fee20a6e6d4046399db49435b5c4489ceaeea
+EBUILD nvidia-vaapi-driver-0.0.11.ebuild 671 BLAKE2B 462a3372b8a81c51809da0ff849565307caad0401807aa567f06ac6738b8b52397018e1e592a323fb5ee6cdff0b00c58aa12b40841c57b85d28db7c643adb607 SHA512 607ec2942e705a04f8fb6c0f4ff378d0ab0ed6f0fa468adef0dc95643e590f87d871dcdd724da5bd7392cd8e87fc2bd61b570aad66440bbcb1dbeee2042af383
 MISC metadata.xml 600 BLAKE2B 780e519992c02718417c1de7ca5c966c4795088bb649d862277959602ea6744c3d78589dc70e5c3eaefc989f9afd7eccded785b7e6e253fc8ae591731634c596 SHA512 5c43e6438c06d5631837711047ca2ccaccda39871af1eaef5ff997a5c35c2ec9f86a0188f44e961095c44823b11847289d04e16575e6061d4c894762a81b1c63
diff --git a/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.11_musl-support.patch b/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.11_musl-support.patch
new file mode 100644
index 000000000000..aa03fa825539
--- /dev/null
+++ b/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.11_musl-support.patch
@@ -0,0 +1,27 @@
+From https://github.com/elFarto/nvidia-vaapi-driver/pull/273
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Fri, 9 Feb 2024 20:54:17 +0300
+Subject: [PATCH] Fix building with musl
+
+qsort_r invocations uses `__compar_d_fn_t` typedef that defined only in
+glibc. Added missing typedef to fix compilation on musl systems.
+
+See: https://bugs.gentoo.org/924146
+
+Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+--- a/src/hevc.c
++++ b/src/hevc.c
+@@ -3,6 +3,10 @@
+ #include "vabackend.h"
+ #include <stdlib.h>
+ 
++#if !defined(__GLIBC__)
++typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
++#endif
++
+ static const uint8_t ff_hevc_diag_scan4x4_x[16] = {
+     0, 0, 1, 0,
+     1, 2, 0, 1,
+-- 
+2.43.0
+
diff --git a/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.11.ebuild b/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.11.ebuild
index c5b44786dba1..6911c8563e08 100644
--- a/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.11.ebuild
+++ b/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.11.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
@@ -20,3 +20,7 @@ RDEPEND="media-libs/gst-plugins-bad
 DEPEND="${RDEPEND}
 	>=media-libs/nv-codec-headers-11.1.5.1"
 BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/nvidia-vaapi-driver-0.0.11_musl-support.patch"
+)