[packages/weston] - updated to 1.6.0 - removed obsolete libinput4 patch

qboosh qboosh at pld-linux.org
Sat Oct 4 20:59:33 CEST 2014


commit 3b2a67c30e5d10cb6a631e93d777e6d647323be0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Oct 4 20:59:43 2014 +0200

    - updated to 1.6.0
    - removed obsolete libinput4 patch

 libinput4.patch | 96 ---------------------------------------------------------
 weston.spec     | 45 ++++++++++++++-------------
 2 files changed, 24 insertions(+), 117 deletions(-)
---
diff --git a/weston.spec b/weston.spec
index fd1a5ee..6b54013 100644
--- a/weston.spec
+++ b/weston.spec
@@ -14,13 +14,12 @@
 Summary:	Weston - Wayland demos
 Summary(pl.UTF-8):	Weston - programy demonstracyjne dla protokołu Wayland
 Name:		weston
-Version:	1.5.0
-Release:	3
+Version:	1.6.0
+Release:	1
 License:	MIT
 Group:		Applications
 Source0:	http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	8eb40d230efc2411f083c20656534780
-Patch0:		libinput4.patch
+# Source0-md5:	c60ce9dde99a089db0539d8f6b557827
 URL:		http://wayland.freedesktop.org/
 BuildRequires:	Mesa-libEGL-devel >= 7.10
 # GLESv2
@@ -32,19 +31,16 @@ BuildRequires:	colord-devel >= 0.1.27
 BuildRequires:	dbus-devel >= 1.6
 %{?with_rdp:BuildRequires:	freerdp-devel >= 1.1.0}
 BuildRequires:	lcms2-devel >= 2
-%{?with_libinput:BuildRequires:	libinput-devel >= 0.1.0}
+%{?with_libinput:BuildRequires:	libinput-devel >= 0.6.0}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
-%if %{with vaapi}
-BuildRequires:	libva-devel >= 0.34.0
-BuildRequires:	libva-drm-devel >= 0.34.0
-%endif
+BuildRequires:	libunwind-devel
 BuildRequires:	libwebp-devel
-BuildRequires:	pixman-devel
+BuildRequires:	pixman-devel >= 0.26
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
 # wayland-server always; wayland-client if with_wayland || with_sclients || with_clients; wayland-cursor if with_clients
-BuildRequires:	wayland-devel >= 1.4.0
+BuildRequires:	wayland-devel >= 1.6.0
 BuildRequires:	xorg-lib-libxkbcommon-devel >= 0.3.0
 BuildRequires:	xz
 %if %{with drm}
@@ -53,6 +49,13 @@ BuildRequires:	libdrm-devel >= 2.4.30
 BuildRequires:	mtdev-devel >= 1.1.0
 BuildRequires:	udev-devel >= 1:136
 %endif
+%if %{with vaapi}
+BuildRequires:	libva-devel >= 1.2.0
+BuildRequires:	libva-drm-devel >= 1.2.0
+# API versions
+BuildRequires:	pkgconfig(libva) >= 0.34.0
+BuildRequires:	pkgconfig(libva-drm) >= 0.34.0
+%endif
 %if %{with x11}
 BuildRequires:	libxcb-devel
 BuildRequires:	xorg-lib-libX11-devel
@@ -60,7 +63,7 @@ BuildRequires:	xorg-lib-libX11-devel
 %if %{with wlaunch}
 BuildRequires:	libdrm-devel
 BuildRequires:	pam-devel
-BuildRequires:	systemd-devel >= 1:198
+BuildRequires:	systemd-devel >= 1:209
 %endif
 %if %{with xwayland}
 BuildRequires:	libxcb-devel
@@ -80,15 +83,16 @@ Requires:	colord-libs >= 0.1.27
 Requires:	dbus-libs >= 1.6
 %{?with_rdp:Requires:	freerdp >= 1.1.0}
 %{?with_drm:Requires:	libdrm >= 2.4.30}
-%{?with_libinput:Requires:	libinput >= 0.1.0}
-%{?with_drm:Requires:	mtdev >= 1.1.0}
+%{?with_libinput:Requires:	libinput >= 0.6.0}
 %if %{with vaapi}
-Requires:	libva >= 0.34.0
-Requires:	libva-drm >= 0.34.0
+Requires:	libva >= 1.2.0
+Requires:	libva-drm >= 1.2.0
 %endif
-%{?with_wlaunch:Requires:	systemd-libs >= 1:198}
+%{?with_drm:Requires:	mtdev >= 1.1.0}
+Requires:	pixman >= 0.26
+%{?with_wlaunch:Requires:	systemd-libs >= 1:209}
 %{?with_drm:Requires:	udev-libs >= 1:136}
-Requires:	wayland >= 1.4.0
+Requires:	wayland >= 1.6.0
 Requires:	xorg-lib-libxkbcommon >= 0.3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -111,8 +115,8 @@ Group:		Development/Libraries
 Requires:	Mesa-libEGL-devel >= 7.10
 # GLESv2
 Requires:	Mesa-libGLES-devel
-Requires:	pixman-devel
-Requires:	wayland-devel >= 1.4.0
+Requires:	pixman-devel >= 0.26
+Requires:	wayland-devel >= 1.6.0
 Requires:	xorg-lib-libxkbcommon-devel >= 0.3.0
 
 %description devel
@@ -123,7 +127,6 @@ Pliki nagłówkowe do tworzenia wtyczek dla Westona.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
diff --git a/libinput4.patch b/libinput4.patch
deleted file mode 100644
index d6061d1..0000000
--- a/libinput4.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 3b843d3a61286d4b2a9552a3a2cae80c6b1cf8cd Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Wed, 25 Jun 2014 04:07:36 +0000
-Subject: Require libinput 0.4.0
-
-No functional changes, just adjusting for API changes in libinput:
-- libinput_destroy() replaced by libinput_unref()
-- log functions now take a libinput context, userdata is gone
-- udev seat creation is now libinput_udev_create_context() and
-  libinput_udev_assign_seat()
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/configure.ac b/configure.ac
-index b4511fc..648bee8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,7 +160,7 @@ AC_ARG_ENABLE(libinput-backend, [  --enable-libinput-backend],,
- AM_CONDITIONAL([ENABLE_LIBINPUT_BACKEND], [test x$enable_libinput_backend = xyes])
- if test x$enable_libinput_backend = xyes; then
-   AC_DEFINE([BUILD_LIBINPUT_BACKEND], [1], [Build the libinput input device backend])
--  PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.1.0])
-+  PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.4.0])
- fi
- 
- 
-diff --git a/src/libinput-seat.c b/src/libinput-seat.c
-index d59ae42..09cf7c7 100644
---- a/src/libinput-seat.c
-+++ b/src/libinput-seat.c
-@@ -252,8 +252,9 @@ udev_input_enable(struct udev_input *input)
- }
- 
- static void
--libinput_log_func(enum libinput_log_priority priority, void *user_data,
--		     const char *format, va_list args)
-+libinput_log_func(struct libinput *libinput,
-+		  enum libinput_log_priority priority,
-+		  const char *format, va_list args)
- {
- 	weston_vlog(format, args);
- }
-@@ -268,25 +269,34 @@ udev_input_init(struct udev_input *input, struct weston_compositor *c, struct ud
- 
- 	input->compositor = c;
- 
--	libinput_log_set_handler(&libinput_log_func, NULL);
--
- 	log_priority = getenv("WESTON_LIBINPUT_LOG_PRIORITY");
- 
-+	input->libinput = libinput_udev_create_context(&libinput_interface,
-+						       input, udev);
-+	if (!input->libinput) {
-+		return -1;
-+	}
-+
-+	libinput_log_set_handler(input->libinput, &libinput_log_func);
-+
- 	if (log_priority) {
- 		if (strcmp(log_priority, "debug") == 0) {
--			libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_DEBUG);
-+			libinput_log_set_priority(input->libinput,
-+						  LIBINPUT_LOG_PRIORITY_DEBUG);
- 		} else if (strcmp(log_priority, "info") == 0) {
--			libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_INFO);
-+			libinput_log_set_priority(input->libinput,
-+						  LIBINPUT_LOG_PRIORITY_INFO);
- 		} else if (strcmp(log_priority, "error") == 0) {
--			libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_ERROR);
-+			libinput_log_set_priority(input->libinput,
-+						  LIBINPUT_LOG_PRIORITY_ERROR);
- 		}
- 	}
- 
--	input->libinput = libinput_udev_create_for_seat(&libinput_interface, input,
--							udev, seat_id);
--	if (!input->libinput) {
-+	if (libinput_udev_assign_seat(input->libinput, seat_id) != 0) {
-+		libinput_unref(input->libinput);
- 		return -1;
- 	}
-+
- 	process_events(input);
- 
- 	return udev_input_enable(input);
-@@ -300,7 +310,7 @@ udev_input_destroy(struct udev_input *input)
- 	wl_event_source_remove(input->libinput_source);
- 	wl_list_for_each_safe(seat, next, &input->compositor->seat_list, base.link)
- 		udev_seat_destroy(seat);
--	libinput_destroy(input->libinput);
-+	libinput_unref(input->libinput);
- }
- 
- static void
---
-cgit v0.9.0.2-2-gbebe
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/weston.git/commitdiff/3b2a67c30e5d10cb6a631e93d777e6d647323be0



More information about the pld-cvs-commit mailing list