* [gentoo-commits] repo/gentoo:master commit in: media-libs/nvidia-vaapi-driver/files/, media-libs/nvidia-vaapi-driver/
@ 2023-08-23 11:37 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-08-23 11:37 UTC (permalink / raw
To: gentoo-commits
commit: 2363cae9cac76eb514faca1995b58a4ee957b231
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Jul 11 08:23:13 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 11:36:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2363cae9
media-libs/nvidia-vaapi-driver: new package, add 0.0.10
A VA-API implemention using NVIDIA's NVDEC.
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31829
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/nvidia-vaapi-driver/Manifest | 1 +
.../nvidia-vaapi-driver-0.0.10-driverpath.patch | 49 ++++++++++++++++++++++
media-libs/nvidia-vaapi-driver/metadata.xml | 19 +++++++++
.../nvidia-vaapi-driver-0.0.10.ebuild | 29 +++++++++++++
4 files changed, 98 insertions(+)
diff --git a/media-libs/nvidia-vaapi-driver/Manifest b/media-libs/nvidia-vaapi-driver/Manifest
new file mode 100644
index 000000000000..8926b2f59551
--- /dev/null
+++ b/media-libs/nvidia-vaapi-driver/Manifest
@@ -0,0 +1 @@
+DIST nvidia-vaapi-driver-0.0.10.tar.gz 182313 BLAKE2B 45913c0ca29051d817513288041a73c2d65580ab5bb7f4d269c74ec5092460657eba30a0b6e38089dcb3966f9a01f71ca574c170cdcfe78ff6843a3dadc67a5e SHA512 0c0c718a452495b9750838f5625bce66be549aced165778ce2074becc95e4bb7f084d5af16000f61530c9b3059256cec5270759ffc2a53a35b5f237ab09a0ece
diff --git a/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.10-driverpath.patch b/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.10-driverpath.patch
new file mode 100644
index 000000000000..bae86cb9a68f
--- /dev/null
+++ b/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.10-driverpath.patch
@@ -0,0 +1,49 @@
+From 60ab79608ae35bd929d3e1387d226547d18e6bed Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 11 Jul 2023 02:24:12 +0300
+Subject: [PATCH] Use libva's driverdir path instead hardcoded
+
+In some systems libva may expects driver location in different path.
+Reusing driverdir variable from pkg-config to provide correct one.
+---
+ meson.build | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 6fd72da..990c2b2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -18,10 +18,12 @@ deps = [
+ cc.find_library('dl', required : false),
+ dependency('egl'),
+ dependency('ffnvcodec', version: '>= 11.1.5.1'),
+- dependency('libva', version: '>= 1.8.0').partial_dependency(compile_args: true),
+ dependency('libdrm', version: '>=2.4.60').partial_dependency(compile_args: true),
+ dependency('threads'),
+ ]
++libva_deps = dependency('libva', version: '>= 1.8.0').partial_dependency(compile_args: true)
++deps += [libva_deps]
++
+ gst_codecs_deps = dependency('gstreamer-codecparsers-1.0', required: false)
+
+ if cc.get_argument_syntax() == 'gcc'
+@@ -69,6 +71,7 @@ if gst_codecs_deps.found()
+ endif
+
+ nvidia_incdir = include_directories('nvidia-include')
++nvidia_install_dir = libva_deps.get_variable(pkgconfig: 'driverdir')
+
+ shared_library(
+ 'nvidia_drv_video',
+@@ -77,7 +80,7 @@ shared_library(
+ dependencies: deps,
+ include_directories: nvidia_incdir,
+ install: true,
+- install_dir: get_option('libdir') / 'dri',
++ install_dir: nvidia_install_dir,
+ gnu_symbol_visibility: 'hidden',
+ )
+
+--
+2.41.0
+
diff --git a/media-libs/nvidia-vaapi-driver/metadata.xml b/media-libs/nvidia-vaapi-driver/metadata.xml
new file mode 100644
index 000000000000..90ad8a3e885d
--- /dev/null
+++ b/media-libs/nvidia-vaapi-driver/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>azamat.hackimov@gmail.com</email>
+ <name>Azamat H. Hackimov</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">elFarto/nvidia-vaapi-driver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.10.ebuild b/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.10.ebuild
new file mode 100644
index 000000000000..3dda1c5670e0
--- /dev/null
+++ b/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="A VA-API implemention using NVIDIA's NVDEC"
+HOMEPAGE="https://github.com/elFarto/nvidia-vaapi-driver"
+SRC_URI="https://github.com/elFarto/nvidia-vaapi-driver/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ media-libs/gst-plugins-bad
+ media-libs/libglvnd
+ >=media-libs/libva-1.8.0
+ >=x11-libs/libdrm-2.4.60
+"
+DEPEND="${RDEPEND}
+ >=media-libs/nv-codec-headers-11.1.5.1
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES="
+ ${FILESDIR}/nvidia-vaapi-driver-0.0.10-driverpath.patch
+"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/nvidia-vaapi-driver/files/, media-libs/nvidia-vaapi-driver/
@ 2023-12-08 6:50 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-12-08 6:50 UTC (permalink / raw
To: gentoo-commits
commit: d43629a281c24da66ef0d0f403bc6747777c8b39
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 06:49:03 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 06:49:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43629a2
media-libs/nvidia-vaapi-driver: drop 0.0.10
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/nvidia-vaapi-driver/Manifest | 1 -
.../nvidia-vaapi-driver-0.0.10-driverpath.patch | 49 ----------------------
.../nvidia-vaapi-driver-0.0.10.ebuild | 29 -------------
3 files changed, 79 deletions(-)
diff --git a/media-libs/nvidia-vaapi-driver/Manifest b/media-libs/nvidia-vaapi-driver/Manifest
index 550c8670bb6e..4ef70216937c 100644
--- a/media-libs/nvidia-vaapi-driver/Manifest
+++ b/media-libs/nvidia-vaapi-driver/Manifest
@@ -1,2 +1 @@
-DIST nvidia-vaapi-driver-0.0.10.tar.gz 182313 BLAKE2B 45913c0ca29051d817513288041a73c2d65580ab5bb7f4d269c74ec5092460657eba30a0b6e38089dcb3966f9a01f71ca574c170cdcfe78ff6843a3dadc67a5e SHA512 0c0c718a452495b9750838f5625bce66be549aced165778ce2074becc95e4bb7f084d5af16000f61530c9b3059256cec5270759ffc2a53a35b5f237ab09a0ece
DIST nvidia-vaapi-driver-0.0.11.tar.gz 182479 BLAKE2B d025473e200097e7370a8fb0892374d09aa3966cc788d9aa39a8fcaca790df22b13aed6dfe7a69f8a002883248a6a6cfd606fe7c64d0f4bb05f5d567a55934ff SHA512 87eed3d40c891793abccb753af50f0a0ef26bd7be1ccc851fe90657918d3c8440855b3f9bb58c6f44cb2e92eddf222350d26669360f5b8cfd46b80d5691c1a83
diff --git a/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.10-driverpath.patch b/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.10-driverpath.patch
deleted file mode 100644
index bae86cb9a68f..000000000000
--- a/media-libs/nvidia-vaapi-driver/files/nvidia-vaapi-driver-0.0.10-driverpath.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 60ab79608ae35bd929d3e1387d226547d18e6bed Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Tue, 11 Jul 2023 02:24:12 +0300
-Subject: [PATCH] Use libva's driverdir path instead hardcoded
-
-In some systems libva may expects driver location in different path.
-Reusing driverdir variable from pkg-config to provide correct one.
----
- meson.build | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 6fd72da..990c2b2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -18,10 +18,12 @@ deps = [
- cc.find_library('dl', required : false),
- dependency('egl'),
- dependency('ffnvcodec', version: '>= 11.1.5.1'),
-- dependency('libva', version: '>= 1.8.0').partial_dependency(compile_args: true),
- dependency('libdrm', version: '>=2.4.60').partial_dependency(compile_args: true),
- dependency('threads'),
- ]
-+libva_deps = dependency('libva', version: '>= 1.8.0').partial_dependency(compile_args: true)
-+deps += [libva_deps]
-+
- gst_codecs_deps = dependency('gstreamer-codecparsers-1.0', required: false)
-
- if cc.get_argument_syntax() == 'gcc'
-@@ -69,6 +71,7 @@ if gst_codecs_deps.found()
- endif
-
- nvidia_incdir = include_directories('nvidia-include')
-+nvidia_install_dir = libva_deps.get_variable(pkgconfig: 'driverdir')
-
- shared_library(
- 'nvidia_drv_video',
-@@ -77,7 +80,7 @@ shared_library(
- dependencies: deps,
- include_directories: nvidia_incdir,
- install: true,
-- install_dir: get_option('libdir') / 'dri',
-+ install_dir: nvidia_install_dir,
- gnu_symbol_visibility: 'hidden',
- )
-
---
-2.41.0
-
diff --git a/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.10.ebuild b/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.10.ebuild
deleted file mode 100644
index 3dda1c5670e0..000000000000
--- a/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-DESCRIPTION="A VA-API implemention using NVIDIA's NVDEC"
-HOMEPAGE="https://github.com/elFarto/nvidia-vaapi-driver"
-SRC_URI="https://github.com/elFarto/nvidia-vaapi-driver/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- media-libs/gst-plugins-bad
- media-libs/libglvnd
- >=media-libs/libva-1.8.0
- >=x11-libs/libdrm-2.4.60
-"
-DEPEND="${RDEPEND}
- >=media-libs/nv-codec-headers-11.1.5.1
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="
- ${FILESDIR}/nvidia-vaapi-driver-0.0.10-driverpath.patch
-"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/nvidia-vaapi-driver/files/, media-libs/nvidia-vaapi-driver/
@ 2024-02-10 8:04 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2024-02-10 8:04 UTC (permalink / raw
To: gentoo-commits
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" <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"
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-10 8:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-23 11:37 [gentoo-commits] repo/gentoo:master commit in: media-libs/nvidia-vaapi-driver/files/, media-libs/nvidia-vaapi-driver/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-12-08 6:50 Joonas Niilola
2024-02-10 8:04 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox