commit:     3b3e4315aa5da662201437cfede7371dcebb9f97
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Feb  9 18:04:47 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 08:04:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3e4315

media-libs/nvidia-vaapi-driver: fix building with musl

Closes: https://bugs.gentoo.org/924146
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35247
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../nvidia-vaapi-driver-0.0.11_musl-support.patch  | 27 ++++++++++++++++++++++
 .../nvidia-vaapi-driver-0.0.11.ebuild              |  6 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

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" <[email protected]>
+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 <[email protected]>
+--- 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"
+)

Reply via email to