From 442c61ea7017c26477c318d77ff1527a79d72c7997324c7ce0b28660075dbd9d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jan 2015 21:54:53 +0000 Subject: [PATCH] weston-1.6.91 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=44 --- ...esults-obtained-by-pkg-config-libinput.patch | 17 +++++++---------- weston-1.6.1.tar.xz | 3 --- weston-1.6.91.tar.xz | 3 +++ weston.changes | 11 +++++++++++ weston.spec | 15 ++++++++------- 5 files changed, 29 insertions(+), 20 deletions(-) delete mode 100644 weston-1.6.1.tar.xz create mode 100644 weston-1.6.91.tar.xz diff --git a/0001-build-honor-results-obtained-by-pkg-config-libinput.patch b/0001-build-honor-results-obtained-by-pkg-config-libinput.patch index 95a1b80..67efbb1 100644 --- a/0001-build-honor-results-obtained-by-pkg-config-libinput.patch +++ b/0001-build-honor-results-obtained-by-pkg-config-libinput.patch @@ -6,14 +6,14 @@ Subject: [PATCH] build: honor results obtained by pkg-config libinput The error was: src/libinput-seat.c:30:22: fatal error: libinput.h: No such file or directory --- - Makefile.am | 3 ++- + Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index b2d6893..7f3e5d3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,8 @@ AM_CPPFLAGS = \ +Index: weston-1.6.91/Makefile.am +=================================================================== +--- weston-1.6.91.orig/Makefile.am ++++ weston-1.6.91/Makefile.am +@@ -41,7 +41,8 @@ AM_CPPFLAGS = \ -DDATADIR='"$(datadir)"' \ -DMODULEDIR='"$(moduledir)"' \ -DLIBEXECDIR='"$(libexecdir)"' \ @@ -21,8 +21,5 @@ index b2d6893..7f3e5d3 100644 + -DBINDIR='"$(bindir)"' \ + $(LIBINPUT_BACKEND_CFLAGS) - CLEANFILES = weston.ini $(BUILT_SOURCES) + CLEANFILES = weston.ini ivi-shell/weston.ini $(BUILT_SOURCES) --- -2.0.0 - diff --git a/weston-1.6.1.tar.xz b/weston-1.6.1.tar.xz deleted file mode 100644 index d4bad0a..0000000 --- a/weston-1.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9ef779fda4008b7081ee6c64df7971c50954c5cf0d166d8a2fcb104ec1042fd -size 734968 diff --git a/weston-1.6.91.tar.xz b/weston-1.6.91.tar.xz new file mode 100644 index 0000000..fe3eccc --- /dev/null +++ b/weston-1.6.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:035d73f6ba784f448efaaf8e0140cdc34995c9cb21f053fe23eb8dd1360c1753 +size 1284808 diff --git a/weston.changes b/weston.changes index e388274..162e6ba 100644 --- a/weston.changes +++ b/weston.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 27 21:47:25 UTC 2015 - jengelh@inai.de + +- Update to new upstream prerelease 1.6.91 +* gl-renderer: compress pixman bands to simplify geometry +* compositor-headless: allow rendering with pixman +* compositor: Add idle timeout option to weston.ini +* protocol: add presentation extension v5 +* compositor: add stub implementation of presentation interface +* compositor: drop legacy backends in favor of libinput + ------------------------------------------------------------------- Thu Jan 22 08:07:12 UTC 2015 - sor.alexei@meowr.ru diff --git a/weston.spec b/weston.spec index c054deb..a94ee18 100644 --- a/weston.spec +++ b/weston.spec @@ -18,7 +18,7 @@ Name: weston %define lname libweston0 -Version: 1.6.1 +Version: 1.6.91 Release: 0 Summary: Wayland Reference Compositor License: HPND and CC-BY-SA-3.0 @@ -57,16 +57,17 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libdrm) >= 2.4.30 BuildRequires: pkgconfig(libffi) +BuildRequires: pkgconfig(libinput) >= 0.8.0 BuildRequires: pkgconfig(libsystemd-login) >= 198 BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(pixman-1) >= 0.25.2 BuildRequires: pkgconfig(poppler-glib) -BuildRequires: pkgconfig(wayland-client) >= 1.5.91 +BuildRequires: pkgconfig(wayland-client) >= 1.6.91 BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.5.91 +BuildRequires: pkgconfig(wayland-server) >= 1.6.91 BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-xfixes) BuildRequires: pkgconfig(xcursor) @@ -107,10 +108,10 @@ to develop plugins for Weston. autoreconf -fi #fi # Ensure people will use pkgconfig to locate headers. -# libinput backend is disabled for now as it requires libinput < 0.8.0. # Implicit enable-libunwind would make the tests run endlessly on i586. -%configure --disable-static --includedir="%_includedir/pkg/%name" \ - --disable-setuid-install --disable-libinput-backend --disable-libunwind +%configure --disable-static --includedir="%_includedir/%name" \ + --disable-setuid-install --disable-libinput-backend \ + --disable-libunwind make %{?_smp_mflags} %install @@ -139,7 +140,7 @@ fi %files devel %defattr(-,root,root) -%_includedir/pkg/ +%_includedir/%name/ %_libdir/pkgconfig/%name.pc %changelog