Hello community,
here is the log from the commit of package intel-hybrid-driver for
openSUSE:Factory checked in at 2019-02-24 17:15:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/intel-hybrid-driver (Old)
and /work/SRC/openSUSE:Factory/.intel-hybrid-driver.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intel-hybrid-driver"
Sun Feb 24 17:15:59 2019 rev:3 rq:677710 version:1.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/intel-hybrid-driver/intel-hybrid-driver.changes
2019-01-28 20:49:51.753815472 +0100
+++
/work/SRC/openSUSE:Factory/.intel-hybrid-driver.new.28833/intel-hybrid-driver.changes
2019-02-24 17:16:01.104443946 +0100
@@ -1,0 +2,10 @@
+Tue Feb 19 11:08:21 UTC 2019 - [email protected]
+
+- Add n_libva-2.0-ABI-header-fix.patch: Load libva-x11.so.2 for
+ libva-2.0 ABI version. This is a reworked patch from an upstream
+ merge request. Patch in it's current form is not upstreamable,
+ but works for us since we only have libva-2.0 to care about.
+ See https://github.com/01org/intel-hybrid-driver/pull/26 for more
+ context.
+
+-------------------------------------------------------------------
New:
----
n_libva-2.0-ABI-header-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intel-hybrid-driver.spec ++++++
--- /var/tmp/diff_new_pack.f5dFHI/_old 2019-02-24 17:16:02.584443683 +0100
+++ /var/tmp/diff_new_pack.f5dFHI/_new 2019-02-24 17:16:02.608443679 +0100
@@ -24,8 +24,9 @@
License: MIT
Group: System/Libraries
URL: https://github.com/01org/intel-hybrid-driver
-Source0:
https://github.com/01org/intel-hybrid-driver/archive/%{version}/%{name}-%{version}.tar.gz
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: U_Update-the-dependency-to-libva-2.0.patch
+Patch1: n_libva-2.0-ABI-header-fix.patch
BuildRequires: gcc-c++
BuildRequires: libtool
++++++ n_libva-2.0-ABI-header-fix.patch ++++++
>From b3b4d9a3a08d48bf6022723908a22255cc271ab7 Mon Sep 17 00:00:00 2001
From: Daniel Charles <[email protected]>
Date: Fri, 4 May 2018 09:56:10 -0700
Subject: [PATCH] driver_init: load libva-x11.so for any ABI version
with libva > 2.0.0 hybrid driver can operate with it as well
so make this load generic to libva installed version
Signed-off-by: Daniel Charles <[email protected]>
---
src/media_drv_output_dri.c | 10 ++++++++++
src/media_drv_output_dri.h | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/media_drv_output_dri.c b/src/media_drv_output_dri.c
index 42299b8..bbd9713 100644
--- a/src/media_drv_output_dri.c
+++ b/src/media_drv_output_dri.c
@@ -105,6 +105,15 @@ media_output_dri_init (VADriverContextP ctx)
struct dri_vtable *dri_vtable;
static const struct dso_symbol symbols[] = {
+#if VA_CHECK_VERSION(1,0,0)
+ {"va_dri_get_drawable",
+ offsetof (struct dri_vtable, get_drawable)},
+ {"va_dri_get_rendering_buffer",
+ offsetof (struct dri_vtable, get_rendering_buffer)},
+ {"va_dri_swap_buffer",
+ offsetof (struct dri_vtable, swap_buffer)},
+ {NULL,}
+#else
{"dri_get_drawable",
offsetof (struct dri_vtable, get_drawable)},
{"dri_get_rendering_buffer",
@@ -112,6 +121,7 @@ media_output_dri_init (VADriverContextP ctx)
{"dri_swap_buffer",
offsetof (struct dri_vtable, swap_buffer)},
{NULL,}
+#endif
};
drv_ctx->dri_output =
diff --git a/src/media_drv_output_dri.h b/src/media_drv_output_dri.h
index 0d6ccf0..889861c 100644
--- a/src/media_drv_output_dri.h
+++ b/src/media_drv_output_dri.h
@@ -30,7 +30,7 @@
#define _MEDIA__DRIVER_OUT_DRI_H
#include <stdbool.h>
#include "media_drv_defines.h"
-#define LIBVA_X11_NAME "libva-x11.so.1"
+#define LIBVA_X11_NAME "libva-x11.so.2"
VOID media_output_dri_terminate (VADriverContextP ctx);
BOOL media_output_dri_init (VADriverContextP ctx);
