From 4abd676e170a3f90d2df4454f66f4855faa76f62a9ecc8f44908c45d03ffc00d Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 28 Nov 2022 13:11:49 +0000
Subject: [PATCH] Accepting request 1038670 from home:darix:branches:X11:XOrg

- Make sure make runs with verbose builds so we see the gcc
  cmdlines

- Added propagate-dpy.patch: (boo#1202828)
  Patch taken from https://github.com/intel/libva/issues/479

- Make sure make runs with verbose builds so we see the gcc
  cmdlines

- Added propagate-dpy.patch: (boo#1202828)
  Patch taken from https://github.com/intel/libva/issues/479

OBS-URL: https://build.opensuse.org/request/show/1038670
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libva?expand=0&rev=158
---
 libva-gl.changes    | 12 ++++++++++++
 libva-gl.spec       |  6 ++++--
 libva.changes       | 12 ++++++++++++
 libva.spec          |  6 ++++--
 propagate-dpy.patch | 16 ++++++++++++++++
 5 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 propagate-dpy.patch

diff --git a/libva-gl.changes b/libva-gl.changes
index 7c0064b..1507e66 100644
--- a/libva-gl.changes
+++ b/libva-gl.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 28 11:21:48 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Make sure make runs with verbose builds so we see the gcc
+  cmdlines 
+
+-------------------------------------------------------------------
+Mon Nov 28 11:17:51 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Added propagate-dpy.patch: (boo#1202828)
+  Patch taken from https://github.com/intel/libva/issues/479
+
 -------------------------------------------------------------------
 Mon Nov  7 12:52:38 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/libva-gl.spec b/libva-gl.spec
index 9cec4de..fd02ce9 100644
--- a/libva-gl.spec
+++ b/libva-gl.spec
@@ -31,6 +31,7 @@ Group:          Development/Libraries/C and C++
 URL:            https://01.org/linuxmedia
 Source0:        https://github.com/intel/libva/archive/%{version}.tar.gz#/libva-%{version}.tar.gz
 Source2:        baselibs.conf
+Patch1:         propagate-dpy.patch
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -140,6 +141,7 @@ This is the VA/X11 runtime library.
 #
 # fails on sle
 echo libva-wayland%{sover} >> $RPM_SOURCE_DIR/baselibs.conf
+%patch1 -p1
 
 %build
 [ -d m4 ]  || mkdir m4
@@ -150,10 +152,10 @@ autoreconf -v --install
            --enable-wayland \
 %endif
            --with-drivers-path=%{_libdir}/dri
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
+%makeinstall V=1
 find %{buildroot} -name '*.la' -delete -print
 
 %if %{build_gl}
diff --git a/libva.changes b/libva.changes
index 7c0064b..1507e66 100644
--- a/libva.changes
+++ b/libva.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 28 11:21:48 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Make sure make runs with verbose builds so we see the gcc
+  cmdlines 
+
+-------------------------------------------------------------------
+Mon Nov 28 11:17:51 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Added propagate-dpy.patch: (boo#1202828)
+  Patch taken from https://github.com/intel/libva/issues/479
+
 -------------------------------------------------------------------
 Mon Nov  7 12:52:38 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/libva.spec b/libva.spec
index 9c6e103..51f7a2e 100644
--- a/libva.spec
+++ b/libva.spec
@@ -31,6 +31,7 @@ Group:          Development/Libraries/C and C++
 URL:            https://01.org/linuxmedia
 Source0:        https://github.com/intel/libva/archive/%{version}.tar.gz#/libva-%{version}.tar.gz
 Source2:        baselibs.conf
+Patch1:         propagate-dpy.patch
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -140,6 +141,7 @@ This is the VA/X11 runtime library.
 #
 # fails on sle
 echo libva-wayland%{sover} >> $RPM_SOURCE_DIR/baselibs.conf
+%patch1 -p1
 
 %build
 [ -d m4 ]  || mkdir m4
@@ -150,10 +152,10 @@ autoreconf -v --install
            --enable-wayland \
 %endif
            --with-drivers-path=%{_libdir}/dri
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
+%makeinstall V=1
 find %{buildroot} -name '*.la' -delete -print
 
 %if %{build_gl}
diff --git a/propagate-dpy.patch b/propagate-dpy.patch
new file mode 100644
index 0000000..cc152a3
--- /dev/null
+++ b/propagate-dpy.patch
@@ -0,0 +1,16 @@
+Index: libva-2.16.0/va/va.c
+===================================================================
+--- libva-2.16.0.orig/va/va.c
++++ libva-2.16.0/va/va.c
+@@ -420,6 +420,11 @@ static char *va_getDriverPath(const char
+ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
+ {
+     VADriverContextP ctx = CTX(dpy);
++    /* workaround for broken dpy blocks returned by vaGetDisplayDRM */
++    if (NULL == ctx->native_dpy) {
++        ctx->native_dpy = dpy;
++    }
++
+     VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
+     char *search_path = NULL;
+     char *saveptr;