Stefan Dirsch
5a41c7b304
(boo#1234858) * intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch * intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch * intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch * intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch * intel-hybrid-codec-driver-2.0.0-x11-fix.patch - supersedes the following patches * U_Update-the-dependency-to-libva-2.0.patch * n_libva-2.0-ABI-header-fix.patch * u_gcc10.patch - raised driver version number to 2.0.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/intel-hybrid-driver?expand=0&rev=12
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
From dfa9c8eba29573e24f73b1890f8a67f0e46e3d7b Mon Sep 17 00:00:00 2001
|
|
From: "Xiang, Haihao" <haihao.xiang@intel.com>
|
|
Date: Sat, 14 Oct 2017 07:45:07 +0800
|
|
Subject: [PATCH] Update the dependency to libva 2.0
|
|
|
|
In addition, This fixes deprecated warning caused by libva 2.0
|
|
|
|
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
|
|
---
|
|
configure.ac | 6 +-----
|
|
src/va_backend_compat.h | 8 ++++++++
|
|
2 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 192c0db..6cf1431 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -10,8 +10,7 @@ m4_append([intel_driver_version], intel_driver_pre_version, [.pre])
|
|
])
|
|
|
|
# libva minimum version requirement
|
|
-m4_define([va_api_version], [0.38])
|
|
-m4_define([libva_package_version], [1.6.0])
|
|
+m4_define([va_api_version], [1.0.0])
|
|
|
|
# libdrm minimum version requirement
|
|
m4_define([libdrm_version], [2.4.45])
|
|
@@ -71,9 +70,6 @@ AC_SYS_LARGEFILE
|
|
AC_CHECK_LIB([m], [sin])
|
|
AC_CHECK_FUNCS([log2f])
|
|
|
|
-LIBVA_PACKAGE_VERSION=libva_package_version
|
|
-AC_SUBST(LIBVA_PACKAGE_VERSION)
|
|
-
|
|
dnl Check for recent enough DRM
|
|
LIBDRM_VERSION=libdrm_version
|
|
PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
|
|
diff --git a/src/va_backend_compat.h b/src/va_backend_compat.h
|
|
index f5c9f75..2894c90 100644
|
|
--- a/src/va_backend_compat.h
|
|
+++ b/src/va_backend_compat.h
|
|
@@ -45,4 +45,12 @@
|
|
# define VA_DRM_AUTH_CUSTOM VA_DUMMY
|
|
#endif
|
|
|
|
+#if VA_CHECK_VERSION(1,0,0)
|
|
+
|
|
+# define VAEncPackedHeaderMiscMask 0x80000000
|
|
+# define VAEncPackedHeaderH264_SEI (VAEncPackedHeaderMiscMask | 1)
|
|
+# define VAEncPackedHeaderHEVC_SEI (VAEncPackedHeaderMiscMask | 1)
|
|
+
|
|
+#endif
|
|
+
|
|
#endif /* VA_BACKEND_COMPAT_H */
|
|
|