From 26788b60c045d1e4cc40b77cc7978289c1848b40e14b0750380dfb2cc4161981 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 17 Jan 2017 14:28:22 +0000 Subject: [PATCH] - N_libva_Fix_wayland-client.h_include-path.patch/ N_libva_Fix_wayland-client.h_include-path_1320.patch no longer need after adjusting vaapi-intel-driver package OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libva?expand=0&rev=78 --- ...va_Fix_wayland-client.h_include-path.patch | 29 ------------------- ...x_wayland-client.h_include-path_1320.patch | 29 ------------------- libva-gl.changes | 13 +++++++-- libva-gl.spec | 9 ------ libva.changes | 7 +++++ libva.spec | 9 ------ 6 files changed, 17 insertions(+), 79 deletions(-) delete mode 100644 N_libva_Fix_wayland-client.h_include-path.patch delete mode 100644 N_libva_Fix_wayland-client.h_include-path_1320.patch diff --git a/N_libva_Fix_wayland-client.h_include-path.patch b/N_libva_Fix_wayland-client.h_include-path.patch deleted file mode 100644 index 29d16f2..0000000 --- a/N_libva_Fix_wayland-client.h_include-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -Author: computersalat -Subject: Fix wayland-client.h include path -Signed-off-by: computersalat -Index: va/wayland/va_backend_wayland.h -=================================================================== ---- va/wayland/va_backend_wayland.h.orig -+++ va/wayland/va_backend_wayland.h -@@ -28,7 +28,7 @@ - #define VA_BACKEND_WAYLAND_H - - #include --#include -+#include - - /** \brief VA/Wayland API version. */ - #define VA_WAYLAND_API_VERSION (0x574c4400) /* WLD0 */ -Index: va/wayland/wayland-drm-client-protocol.h -=================================================================== ---- va/wayland/wayland-drm-client-protocol.h.orig -+++ va/wayland/wayland-drm-client-protocol.h -@@ -5,7 +5,7 @@ - - #include - #include --#include "wayland-client.h" -+#include "wayland/wayland-client.h" - - #ifdef __cplusplus - extern "C" { diff --git a/N_libva_Fix_wayland-client.h_include-path_1320.patch b/N_libva_Fix_wayland-client.h_include-path_1320.patch deleted file mode 100644 index 75ac6ec..0000000 --- a/N_libva_Fix_wayland-client.h_include-path_1320.patch +++ /dev/null @@ -1,29 +0,0 @@ -Author: computersalat -Subject: Fix wayland-client.h include path -Signed-off-by: computersalat -Index: va/wayland/va_backend_wayland.h -=================================================================== ---- va/wayland/va_backend_wayland.h.orig -+++ va/wayland/va_backend_wayland.h -@@ -28,7 +28,7 @@ - #define VA_BACKEND_WAYLAND_H - - #include --#include -+#include - - /** \brief VA/Wayland API version. */ - #define VA_WAYLAND_API_VERSION (0x574c4400) /* WLD0 */ -Index: va/wayland/wayland-drm-client-protocol.h -=================================================================== ---- va/wayland/wayland-drm-client-protocol.h.orig -+++ va/wayland/wayland-drm-client-protocol.h -@@ -5,7 +5,7 @@ - - #include - #include --#include "wayland-client.h" -+#include "pkg/wayland/wayland-client.h" - - #ifdef __cplusplus - extern "C" { diff --git a/libva-gl.changes b/libva-gl.changes index 3220924..e70a354 100644 --- a/libva-gl.changes +++ b/libva-gl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 17 14:26:39 UTC 2017 - sndirsch@suse.com + +- N_libva_Fix_wayland-client.h_include-path.patch/ + N_libva_Fix_wayland-client.h_include-path_1320.patch no longer + need after adjusting vaapi-intel-driver package + ------------------------------------------------------------------- Thu Jan 12 19:48:00 UTC 2017 - chris@computersalat.de @@ -11,10 +18,10 @@ Sat Dec 31 18:46:42 UTC 2016 - chris@computersalat.de - Version 1.7.3 - 10.Nov.2016 * Bump VA API version to 0.39.4 * API: add support for bitrate control per temporal layer - * API: update the usage for framerate in VAEncMiscParameterFrameRate + * API: update the usage for framerate in VAEncMiscParameterFrameRate to support non-integer frame-rate - * Add has_prime_sharing flag in VADriverVTableWayland to indicate if - buffer sharing with prime fd can be used in the backend driver- + * Add has_prime_sharing flag in VADriverVTableWayland to indicate if + buffer sharing with prime fd can be used in the backend driver ------------------------------------------------------------------- Sat Oct 22 12:46:52 UTC 2016 - chris@computersalat.de diff --git a/libva-gl.spec b/libva-gl.spec index 35638ea..e487ee4 100644 --- a/libva-gl.spec +++ b/libva-gl.spec @@ -36,9 +36,6 @@ Group: System/Libraries Url: http://freedesktop.org/wiki/Software/vaapi Source0: http://www.freedesktop.org/software/vaapi/releases/libva/%{_name}-%{version}.tar.bz2 Source1: baselibs.conf -# PATCH-FIX-openSUSE: Fix wayland-client.h include path -Patch100: N_libva_Fix_wayland-client.h_include-path.patch -Patch101: N_libva_Fix_wayland-client.h_include-path_1320.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: libtool @@ -200,12 +197,6 @@ This contains the dummy driver. %prep %setup -q -n %{_name}-%{version} -%if 0%{?suse_version} < 1320 || 0%{?suse_version} > 1320 -%patch100 -%endif -%if 0%{?suse_version} == 1320 -%patch101 -%endif %build [ -d m4 ] || mkdir m4 diff --git a/libva.changes b/libva.changes index 71feee9..e70a354 100644 --- a/libva.changes +++ b/libva.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 17 14:26:39 UTC 2017 - sndirsch@suse.com + +- N_libva_Fix_wayland-client.h_include-path.patch/ + N_libva_Fix_wayland-client.h_include-path_1320.patch no longer + need after adjusting vaapi-intel-driver package + ------------------------------------------------------------------- Thu Jan 12 19:48:00 UTC 2017 - chris@computersalat.de diff --git a/libva.spec b/libva.spec index 08f2c5d..d904909 100644 --- a/libva.spec +++ b/libva.spec @@ -36,9 +36,6 @@ Group: System/Libraries Url: http://freedesktop.org/wiki/Software/vaapi Source0: http://www.freedesktop.org/software/vaapi/releases/libva/%{_name}-%{version}.tar.bz2 Source1: baselibs.conf -# PATCH-FIX-openSUSE: Fix wayland-client.h include path -Patch100: N_libva_Fix_wayland-client.h_include-path.patch -Patch101: N_libva_Fix_wayland-client.h_include-path_1320.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: libtool @@ -200,12 +197,6 @@ This contains the dummy driver. %prep %setup -q -n %{_name}-%{version} -%if 0%{?suse_version} < 1320 || 0%{?suse_version} > 1320 -%patch100 -%endif -%if 0%{?suse_version} == 1320 -%patch101 -%endif %build [ -d m4 ] || mkdir m4