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
This commit is contained in:
2022-11-28 13:11:49 +00:00
committed by Git OBS Bridge
parent e1413e4557
commit 4abd676e17
5 changed files with 48 additions and 4 deletions

View File

@@ -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>

View File

@@ -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}

View File

@@ -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>

View File

@@ -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}

16
propagate-dpy.patch Normal file
View File

@@ -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;