From eb716233c8a72cc2d14c39e1aab27aca8aac11d7082bda6a0c376fb2b94c8edf Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 10 Mar 2022 19:23:11 +0000
Subject: [PATCH] Accepting request 960916 from home:iznogood:branches:X11:XOrg

- Add U_Support-AV1.patch: Add support for AV1 in vdpauinfo.
- Minor tweaks to spec.

OBS-URL: https://build.opensuse.org/request/show/960916
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libvdpau?expand=0&rev=29
---
 U_Support-AV1.patch | 26 ++++++++++++++++++++++++++
 libvdpau.changes    |  6 ++++++
 libvdpau.spec       | 10 ++++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 U_Support-AV1.patch

diff --git a/U_Support-AV1.patch b/U_Support-AV1.patch
new file mode 100644
index 0000000..ae35194
--- /dev/null
+++ b/U_Support-AV1.patch
@@ -0,0 +1,26 @@
+From da66af25aa327d21179d478f3a6d8c03b6c7f574 Mon Sep 17 00:00:00 2001
+From: ManojGuptaBonda <mbonda@nvidia.com>
+Date: Tue, 8 Feb 2022 23:25:04 +0530
+Subject: [PATCH] Add support for AV1 in vdpauinfo
+
+---
+ vdpauinfo.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/vdpauinfo.cpp b/vdpauinfo.cpp
+index 10dbdf3..cf83b4a 100644
+--- a/vdpauinfo.cpp
++++ b/vdpauinfo.cpp
+@@ -376,6 +376,9 @@ Desc decoder_profiles[] = {
+ {"HEVC_MAIN_444",               VDP_DECODER_PROFILE_HEVC_MAIN_444},
+ {"HEVC_MAIN_444_10",            VDP_DECODER_PROFILE_HEVC_MAIN_444_10},
+ {"HEVC_MAIN_444_12",            VDP_DECODER_PROFILE_HEVC_MAIN_444_12},
++{"AV1_MAIN",                    VDP_DECODER_PROFILE_AV1_MAIN},
++{"AV1_HIGH",                    VDP_DECODER_PROFILE_AV1_HIGH},
++{"AV1_PROFESSIONAL",            VDP_DECODER_PROFILE_AV1_PROFESSIONAL},
+ 
+ };
+ const size_t decoder_profile_count = sizeof(decoder_profiles)/sizeof(Desc);
+-- 
+GitLab
+
diff --git a/libvdpau.changes b/libvdpau.changes
index bfc0668..6b5ff77 100644
--- a/libvdpau.changes
+++ b/libvdpau.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 10 17:27:33 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add U_Support-AV1.patch: Add support for AV1 in vdpauinfo.
+- Minor tweaks to spec.
+
 -------------------------------------------------------------------
 Wed Mar  9 11:42:53 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/libvdpau.spec b/libvdpau.spec
index 4aa83b6..23a5b73 100644
--- a/libvdpau.spec
+++ b/libvdpau.spec
@@ -32,6 +32,7 @@ Source2:        README
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 Patch0:         n_UsrEtc.patch
+Patch1:         U_Support-AV1.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -87,7 +88,10 @@ Its usage is documented in the README.
 
 %prep
 %setup -q -b1
-%autopatch -p1
+%patch0 -p1
+pushd ../vdpauinfo-*
+%patch1 -p1
+popd
 
 %build
 %meson
@@ -105,7 +109,7 @@ autoreconf -fi
 VDPAU_CFLAGS=-I%{buildroot}%{_includedir} \
 VDPAU_LIBS="-L%{buildroot}/%{_libdir} -lvdpau -lX11"
 
-make %{?_smp_mflags}
+%make_build
 %make_install
 popd
 
@@ -116,7 +120,9 @@ cp %{_sourcedir}/README .
 
 %files -n libvdpau1
 %dir %{_libdir}/vdpau
+%if 0%{?suse_version} < 1550
 %dir %{_distconfdir}
+%endif
 %{_bindir}/vdpauinfo
 %{_libdir}/libvdpau.so.*
 %{_distconfdir}/vdpau_wrapper.cfg