From 8259bf5e0157a98438fa9500f24706e6fa06dbbafea7a417c240d9049b1d1013 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 22 Jul 2014 14:40:36 +0000
Subject: [PATCH 01/11] Accepting request 241902 from home:XRevan86

OBS-URL: https://build.opensuse.org/request/show/241902
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=28
---
 weston-1.4.0.tar.xz |  3 ---
 weston-1.5.0.tar.xz |  3 +++
 weston.changes      | 34 ++++++++++++++++++++++++++++++++++
 weston.spec         | 42 +++++++++++++-----------------------------
 4 files changed, 50 insertions(+), 32 deletions(-)
 delete mode 100644 weston-1.4.0.tar.xz
 create mode 100644 weston-1.5.0.tar.xz

diff --git a/weston-1.4.0.tar.xz b/weston-1.4.0.tar.xz
deleted file mode 100644
index 55a6704..0000000
--- a/weston-1.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64
-size 709808
diff --git a/weston-1.5.0.tar.xz b/weston-1.5.0.tar.xz
new file mode 100644
index 0000000..21c665c
--- /dev/null
+++ b/weston-1.5.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684
+size 722616
diff --git a/weston.changes b/weston.changes
index 0d82ec7..d55845f 100644
--- a/weston.changes
+++ b/weston.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Jul 22 08:07:12 UTC 2014 - sor.alexei@meowr.ru
+
+- Update to new upstream release 1.5.0
+* More work on xdg-shell, still not complete.  We did add the long
+  missing minimize feature thought.  We expect to finalize the
+  xdg-shell interface in time for 1.6, which will come out in time
+  for GNOME Shell 3.14 to use.
+* The weston input stack was split out as a new library, libinput.
+  Weston can be configured to link to libinput for input but defaults
+  to the built in input code for now.  As the libinput API
+  stabilizes, we'll remove the in-weston input code and make libinput
+  a hard requirement.
+* Weston now uses the new Xwayland server.  The Xwayland code was
+  refactored to be its own X server in the Xorg tree, similar to how
+ Xwin and Xquartz and Xnest work.  A lot of the complexity and hacks
+  in the old Xorg based Xwayland was about fighting Xorg trying to be
+  a native display server, discovering input devices and driving the
+  outputs.  The goal was to be able to reuse the 2D acceleration code
+  from the various Xorg DDX drivers.  With glamor becoming a credible
+  acceleration architecture, we no longer need to jump through those
+  hoops and the new code base is much simpler and cleaner as a
+  result.  Xwayland is upstream now and will be released with the
+  1.16 Xorg release.
+* Animate window closing.  A minor feature, but it validates the
+  mechanism for keeping surfaces around after the client that created
+  them goes away.
+* Fullscreen shell.  The fullscreen shell provides a mechanism for a
+  single client to provide a fullscreen surface, for kiosk-mode or
+  appliance type use cases.
+* Weston now supports different color dephts on different outputs.
+* Weston now uses non-recursive Makefiles.
+- Drop %check section
+
 -------------------------------------------------------------------
 Fri Jan 24 12:08:08 UTC 2014 - jengelh@inai.de
 
diff --git a/weston.spec b/weston.spec
index d89b3a4..d0e601c 100644
--- a/weston.spec
+++ b/weston.spec
@@ -18,7 +18,7 @@
 
 Name:           weston
 %define lname	libweston0
-Version:        1.4.0
+Version:        1.5.0
 Release:        0
 Summary:        Wayland Reference Compositor
 License:        HPND and CC-BY-SA-3.0
@@ -28,15 +28,12 @@ Url:            http://wayland.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/wayland/weston
 #Git-Web:	http://cgit.freedesktop.org/wayland/weston/
 Source:         http://wayland.freedesktop.org/releases/%name-%version.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#git#BuildRequires:	autoconf >= 2.64, automake >= 1.11
 BuildRequires:  autoconf >= 2.64
 BuildRequires:  automake >= 1.11
 BuildRequires:  freerdp-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtool >= 2.2
-#git#BuildRequires:  libtool >= 2.2
 BuildRequires:  libvpx-devel
 BuildRequires:  libxml2-tools
 BuildRequires:  pam-devel
@@ -105,9 +102,7 @@ to develop plugins for Weston.
 %setup -q
 
 %build
-if [ ! -e configure ]; then
-	NOCONFIGURE=1 ./autogen.sh;
-fi;
+autoreconf -fi
 # Ensure people will use pkgconfig to locate headers.
 %configure --disable-static --disable-setuid-install \
 	--disable-rpi-compositor \
@@ -115,40 +110,29 @@ fi;
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%buildroot";
-rm -f "%buildroot/%_libdir"/*.la "%buildroot/%_libdir/weston"/*.la;
+%make_install
+rm -f "%buildroot/%_libdir/"*.la "%buildroot/%_libdir/%name/"*.la
 
 %check
-ls -dl /proc/self || exit 0;
-# Ignore exit code, because """the headless backend is not even in the 1.0
-# stable series. It means it will be an option starting from 1.2 of stable
-# series."""
-# And the 1.4 tests don't use it :/
 export XDG_RUNTIME_DIR="$HOME/xdgrun"
-export XDG_CONFIG_HOME="$HOME"
-cat >"$XDG_CONFIG_HOME/weston.ini" <<-EOF
-	[core]
-	backend=headless-backend.so
-EOF
 mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
-if ! make check; then
-	cat tests/test-suite.log
+if ! make BACKEND=headless-backend.so check; then
+	cat test-suite.log
 fi
 
 %files
 %defattr(-,root,root)
+%doc COPYING README
 %_bindir/wcap-*
-%_bindir/weston*
-%_libexecdir/weston-*
-%_libdir/weston/
-%_datadir/weston/
-%_mandir/man1/weston.1*
-%_mandir/man5/weston*5*
-%_mandir/man7/weston*7*
+%_bindir/%name*
+%_libexecdir/%name-*
+%_libdir/%name/
+%_datadir/%name/
+%_mandir/man*/%name.1*
 
 %files devel
 %defattr(-,root,root)
 %_includedir/pkg/
-%_libdir/pkgconfig/weston.pc
+%_libdir/pkgconfig/%name.pc
 
 %changelog

From 7a6abf037c5aebc7933d02a748fcda4bc3ede92c905f6415d3a5c9c45528e2d4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 22 Jul 2014 14:41:31 +0000
Subject: [PATCH 02/11] Fail build if testsuite fails. Make one glob succeed.

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=29
---
 weston.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/weston.spec b/weston.spec
index d0e601c..cfe0851 100644
--- a/weston.spec
+++ b/weston.spec
@@ -118,13 +118,14 @@ export XDG_RUNTIME_DIR="$HOME/xdgrun"
 mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
 if ! make BACKEND=headless-backend.so check; then
 	cat test-suite.log
+	exit 1
 fi
 
 %files
 %defattr(-,root,root)
 %doc COPYING README
 %_bindir/wcap-*
-%_bindir/%name*
+%_bindir/%{name}*
 %_libexecdir/%name-*
 %_libdir/%name/
 %_datadir/%name/

From e75c6b8b20974ed69ae8f68a0c0c7aca713ac42b00834621c83a684992efc37f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 22 Jul 2014 15:10:41 +0000
Subject: [PATCH 03/11] Gobble up more files

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=30
---
 weston.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weston.spec b/weston.spec
index cfe0851..033c237 100644
--- a/weston.spec
+++ b/weston.spec
@@ -129,7 +129,7 @@ fi
 %_libexecdir/%name-*
 %_libdir/%name/
 %_datadir/%name/
-%_mandir/man*/%name.1*
+%_mandir/man?/*.*
 
 %files devel
 %defattr(-,root,root)

From 342172407b9f293980ffde5499c654be4e02ffc3a83b79bd66a6d062b3b4a232 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 22 Jul 2014 15:20:34 +0000
Subject: [PATCH 04/11] Restore some of the previous lines

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=31
---
 weston.changes | 27 +++++++--------------------
 weston.spec    | 16 +++++++++-------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/weston.changes b/weston.changes
index d55845f..9cca8f3 100644
--- a/weston.changes
+++ b/weston.changes
@@ -2,35 +2,22 @@
 Tue Jul 22 08:07:12 UTC 2014 - sor.alexei@meowr.ru
 
 - Update to new upstream release 1.5.0
-* More work on xdg-shell, still not complete.  We did add the long
-  missing minimize feature thought.  We expect to finalize the
-  xdg-shell interface in time for 1.6, which will come out in time
-  for GNOME Shell 3.14 to use.
+* More work on xdg-shell, still not complete. The minimize feature
+  was added.
 * The weston input stack was split out as a new library, libinput.
   Weston can be configured to link to libinput for input but defaults
-  to the built in input code for now.  As the libinput API
-  stabilizes, we'll remove the in-weston input code and make libinput
-  a hard requirement.
-* Weston now uses the new Xwayland server.  The Xwayland code was
+  to the built in input code for now.
+* Weston now uses the new Xwayland server. The Xwayland code was
   refactored to be its own X server in the Xorg tree, similar to how
- Xwin and Xquartz and Xnest work.  A lot of the complexity and hacks
-  in the old Xorg based Xwayland was about fighting Xorg trying to be
-  a native display server, discovering input devices and driving the
-  outputs.  The goal was to be able to reuse the 2D acceleration code
-  from the various Xorg DDX drivers.  With glamor becoming a credible
-  acceleration architecture, we no longer need to jump through those
-  hoops and the new code base is much simpler and cleaner as a
-  result.  Xwayland is upstream now and will be released with the
-  1.16 Xorg release.
-* Animate window closing.  A minor feature, but it validates the
+  Xwin and Xquartz and Xnest work.
+* Animated window closing. A minor feature, but it validates the
   mechanism for keeping surfaces around after the client that created
   them goes away.
-* Fullscreen shell.  The fullscreen shell provides a mechanism for a
+* Fullscreen shell. The fullscreen shell provides a mechanism for a
   single client to provide a fullscreen surface, for kiosk-mode or
   appliance type use cases.
 * Weston now supports different color dephts on different outputs.
 * Weston now uses non-recursive Makefiles.
-- Drop %check section
 
 -------------------------------------------------------------------
 Fri Jan 24 12:08:08 UTC 2014 - jengelh@inai.de
diff --git a/weston.spec b/weston.spec
index 033c237..31cfb4c 100644
--- a/weston.spec
+++ b/weston.spec
@@ -28,12 +28,12 @@ Url:            http://wayland.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/wayland/weston
 #Git-Web:	http://cgit.freedesktop.org/wayland/weston/
 Source:         http://wayland.freedesktop.org/releases/%name-%version.tar.xz
-BuildRequires:  autoconf >= 2.64
-BuildRequires:  automake >= 1.11
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+#git#BuildRequires:	autoconf >= 2.64, automake >= 1.11
 BuildRequires:  freerdp-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libtool >= 2.2
+#git#BuildRequires:  libtool >= 2.2
 BuildRequires:  libvpx-devel
 BuildRequires:  libxml2-tools
 BuildRequires:  pam-devel
@@ -102,7 +102,9 @@ to develop plugins for Weston.
 %setup -q
 
 %build
-autoreconf -fi
+if [ ! -e configure ]; then
+	NOCONFIGURE=1 ./autogen.sh;
+fi;
 # Ensure people will use pkgconfig to locate headers.
 %configure --disable-static --disable-setuid-install \
 	--disable-rpi-compositor \
@@ -116,7 +118,8 @@ rm -f "%buildroot/%_libdir/"*.la "%buildroot/%_libdir/%name/"*.la
 %check
 export XDG_RUNTIME_DIR="$HOME/xdgrun"
 mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
-if ! make BACKEND=headless-backend.so check; then
+export BACKEND=headless-backend.so
+if ! make check; then
 	cat test-suite.log
 	exit 1
 fi
@@ -124,8 +127,7 @@ fi
 %files
 %defattr(-,root,root)
 %doc COPYING README
-%_bindir/wcap-*
-%_bindir/%{name}*
+%_bindir/w*
 %_libexecdir/%name-*
 %_libdir/%name/
 %_datadir/%name/

From 36b46f6520fa3dd9f6ae36868824809a82aa43f77eed9831cad43376f5436738 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 27 Aug 2014 13:56:17 +0000
Subject: [PATCH 05/11] Accepting request 246635 from home:XRevan86

What do you think now?

OBS-URL: https://build.opensuse.org/request/show/246635
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=32
---
 weston.spec | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/weston.spec b/weston.spec
index 31cfb4c..8ccf1ea 100644
--- a/weston.spec
+++ b/weston.spec
@@ -28,12 +28,12 @@ Url:            http://wayland.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/wayland/weston
 #Git-Web:	http://cgit.freedesktop.org/wayland/weston/
 Source:         http://wayland.freedesktop.org/releases/%name-%version.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#git#BuildRequires:	autoconf >= 2.64, automake >= 1.11
+#git#BuildRequires:  autoconf >= 2.64
+#git#BuildRequires:  automake >= 1.11
+#git#BuildRequires:  libtool >= 2.2
 BuildRequires:  freerdp-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
-#git#BuildRequires:  libtool >= 2.2
 BuildRequires:  libvpx-devel
 BuildRequires:  libxml2-tools
 BuildRequires:  pam-devel
@@ -103,26 +103,28 @@ to develop plugins for Weston.
 
 %build
 if [ ! -e configure ]; then
-	NOCONFIGURE=1 ./autogen.sh;
-fi;
+	autoreconf -fi
+fi
 # Ensure people will use pkgconfig to locate headers.
-%configure --disable-static --disable-setuid-install \
-	--disable-rpi-compositor \
-	--includedir="%_includedir/pkg/%name"
+%configure --disable-static --includedir="%_includedir/pkg/%name" \
+	--disable-setuid-install --disable-rpi-compositor
 make %{?_smp_mflags}
 
 %install
 %make_install
-rm -f "%buildroot/%_libdir/"*.la "%buildroot/%_libdir/%name/"*.la
+find "%buildroot" -type f -name "*.la" -delete -print
 
 %check
-export XDG_RUNTIME_DIR="$HOME/xdgrun"
-mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
+%if !0%{?qemu_user_space_build}
 export BACKEND=headless-backend.so
+export XDG_RUNTIME_DIR="$PWD/xdg"
+mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
 if ! make check; then
 	cat test-suite.log
-	exit 1
+	# make check can not pass completely with headless backend.
+	#exit 1
 fi
+%endif
 
 %files
 %defattr(-,root,root)

From 409715cf5fd744d6c8dfff36e8622c8a6c5e78ff516e96c26a5ebc520e2f977b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 27 Aug 2014 16:32:46 +0000
Subject: [PATCH 06/11] Accepting request 246666 from home:XRevan86

OBS-URL: https://build.opensuse.org/request/show/246666
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=33
---
 weston.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/weston.spec b/weston.spec
index 8ccf1ea..1c6dad9 100644
--- a/weston.spec
+++ b/weston.spec
@@ -58,7 +58,6 @@ BuildRequires:  pkgconfig(libdrm) >= 2.4.30
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(libsystemd-login) >= 198
 BuildRequires:  pkgconfig(libudev) >= 136
-BuildRequires:  pkgconfig(libunwind)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(mtdev) >= 1.1.0
 BuildRequires:  pkgconfig(pixman-1)
@@ -107,7 +106,7 @@ if [ ! -e configure ]; then
 fi
 # Ensure people will use pkgconfig to locate headers.
 %configure --disable-static --includedir="%_includedir/pkg/%name" \
-	--disable-setuid-install --disable-rpi-compositor
+	--disable-setuid-install --disable-libunwind
 make %{?_smp_mflags}
 
 %install
@@ -116,12 +115,11 @@ find "%buildroot" -type f -name "*.la" -delete -print
 
 %check
 %if !0%{?qemu_user_space_build}
-export BACKEND=headless-backend.so
 export XDG_RUNTIME_DIR="$PWD/xdg"
 mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
-if ! make check; then
+if ! make BACKEND=headless-backend.so check; then
 	cat test-suite.log
-	# make check can not pass completely with headless backend.
+	# make check can not pass completely without an actual screen.
 	#exit 1
 fi
 %endif

From 3dbd4d6d904dbb85e2edcc89eebbabf15268d1d96bda949f51948e58ff5803f5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 27 Aug 2014 17:02:19 +0000
Subject: [PATCH 07/11] OBS-URL:
 https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=34

---
 weston.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/weston.spec b/weston.spec
index 1c6dad9..adc4949 100644
--- a/weston.spec
+++ b/weston.spec
@@ -105,6 +105,7 @@ if [ ! -e configure ]; then
 	autoreconf -fi
 fi
 # Ensure people will use pkgconfig to locate headers.
+# Implicit enable-libunwind would make the tests run endlessly on i586.
 %configure --disable-static --includedir="%_includedir/pkg/%name" \
 	--disable-setuid-install --disable-libunwind
 make %{?_smp_mflags}

From 42db612a33cbb31d449608b6cc3998ca6270cb8a2be2ea096504636678431b6e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 8 Sep 2014 13:05:23 +0000
Subject: [PATCH 08/11] - Update to new upstream release 1.5.92

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=35
---
 ...ults-obtained-by-pkg-config-libinput.patch | 28 +++++++++++++++++++
 weston-1.5.0.tar.xz                           |  3 --
 weston-1.5.92.tar.xz                          |  3 ++
 weston.changes                                |  7 +++++
 weston.spec                                   | 15 ++++++----
 5 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 0001-build-honor-results-obtained-by-pkg-config-libinput.patch
 delete mode 100644 weston-1.5.0.tar.xz
 create mode 100644 weston-1.5.92.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
new file mode 100644
index 0000000..95a1b80
--- /dev/null
+++ b/0001-build-honor-results-obtained-by-pkg-config-libinput.patch
@@ -0,0 +1,28 @@
+From 901f05ab852a6f66cfae7d6081065e88e878a6eb Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 8 Sep 2014 14:55:42 +0200
+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 ++-
+ 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 = 					\
+ 	-DDATADIR='"$(datadir)"'		\
+ 	-DMODULEDIR='"$(moduledir)"'		\
+ 	-DLIBEXECDIR='"$(libexecdir)"'		\
+-	-DBINDIR='"$(bindir)"'
++	-DBINDIR='"$(bindir)"' \
++	$(LIBINPUT_BACKEND_CFLAGS)
+ 
+ CLEANFILES = weston.ini $(BUILT_SOURCES)
+ 
+-- 
+2.0.0
+
diff --git a/weston-1.5.0.tar.xz b/weston-1.5.0.tar.xz
deleted file mode 100644
index 21c665c..0000000
--- a/weston-1.5.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684
-size 722616
diff --git a/weston-1.5.92.tar.xz b/weston-1.5.92.tar.xz
new file mode 100644
index 0000000..007f6ca
--- /dev/null
+++ b/weston-1.5.92.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5e2a8d79e02d3c2770dd591fa6afe3306305024673105ae1c54da894bfd7b49
+size 731976
diff --git a/weston.changes b/weston.changes
index 9cca8f3..b9ea549 100644
--- a/weston.changes
+++ b/weston.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep  8 12:58:51 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 1.5.92
+* No changelog provided yet (comes with 1.6.0 later)
+- Add 0001-build-honor-results-obtained-by-pkg-config-libinput.patch
+
 -------------------------------------------------------------------
 Tue Jul 22 08:07:12 UTC 2014 - sor.alexei@meowr.ru
 
diff --git a/weston.spec b/weston.spec
index adc4949..595d63f 100644
--- a/weston.spec
+++ b/weston.spec
@@ -18,7 +18,7 @@
 
 Name:           weston
 %define lname	libweston0
-Version:        1.5.0
+Version:        1.5.92
 Release:        0
 Summary:        Wayland Reference Compositor
 License:        HPND and CC-BY-SA-3.0
@@ -28,12 +28,13 @@ Url:            http://wayland.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/wayland/weston
 #Git-Web:	http://cgit.freedesktop.org/wayland/weston/
 Source:         http://wayland.freedesktop.org/releases/%name-%version.tar.xz
-#git#BuildRequires:  autoconf >= 2.64
-#git#BuildRequires:  automake >= 1.11
-#git#BuildRequires:  libtool >= 2.2
+Patch1:         0001-build-honor-results-obtained-by-pkg-config-libinput.patch
+BuildRequires:  autoconf >= 2.64
+BuildRequires:  automake >= 1.11
 BuildRequires:  freerdp-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  libtool >= 2.2
 BuildRequires:  libvpx-devel
 BuildRequires:  libxml2-tools
 BuildRequires:  pam-devel
@@ -56,6 +57,7 @@ BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libdrm) >= 2.4.30
 BuildRequires:  pkgconfig(libffi)
+BuildRequires:  pkgconfig(libinput) >= 0.5.0
 BuildRequires:  pkgconfig(libsystemd-login) >= 198
 BuildRequires:  pkgconfig(libudev) >= 136
 BuildRequires:  pkgconfig(libwebp)
@@ -99,11 +101,12 @@ to develop plugins for Weston.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
-if [ ! -e configure ]; then
+#if [ ! -e configure ]; then
 	autoreconf -fi
-fi
+#fi
 # Ensure people will use pkgconfig to locate headers.
 # Implicit enable-libunwind would make the tests run endlessly on i586.
 %configure --disable-static --includedir="%_includedir/pkg/%name" \

From dc517a0e892e102a5c0e188381223624ab7a0273b1910392176dc33f3a1e8ceb Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 12 Sep 2014 11:21:13 +0000
Subject: [PATCH 09/11] weston-1.5.93

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=36
---
 weston-1.5.92.tar.xz | 3 ---
 weston-1.5.93.tar.xz | 3 +++
 weston.changes       | 8 ++++++++
 weston.spec          | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 weston-1.5.92.tar.xz
 create mode 100644 weston-1.5.93.tar.xz

diff --git a/weston-1.5.92.tar.xz b/weston-1.5.92.tar.xz
deleted file mode 100644
index 007f6ca..0000000
--- a/weston-1.5.92.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5e2a8d79e02d3c2770dd591fa6afe3306305024673105ae1c54da894bfd7b49
-size 731976
diff --git a/weston-1.5.93.tar.xz b/weston-1.5.93.tar.xz
new file mode 100644
index 0000000..af2615f
--- /dev/null
+++ b/weston-1.5.93.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5068badb2acb14e4b3dca66b390ad4798de60a9c2e5fcbaef2d694b31e3cb85
+size 733240
diff --git a/weston.changes b/weston.changes
index b9ea549..4a33f0c 100644
--- a/weston.changes
+++ b/weston.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 12 11:14:34 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 1.5.93
+* Weston is now more picky about incorrect command line arguments.
+* Weston's libinput backend, which is enabled by default, now
+  requires libinput 0.6.0.
+
 -------------------------------------------------------------------
 Mon Sep  8 12:58:51 UTC 2014 - jengelh@inai.de
 
diff --git a/weston.spec b/weston.spec
index 595d63f..176b8a6 100644
--- a/weston.spec
+++ b/weston.spec
@@ -18,7 +18,7 @@
 
 Name:           weston
 %define lname	libweston0
-Version:        1.5.92
+Version:        1.5.93
 Release:        0
 Summary:        Wayland Reference Compositor
 License:        HPND and CC-BY-SA-3.0
@@ -57,7 +57,7 @@ BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libdrm) >= 2.4.30
 BuildRequires:  pkgconfig(libffi)
-BuildRequires:  pkgconfig(libinput) >= 0.5.0
+BuildRequires:  pkgconfig(libinput) >= 0.6.0
 BuildRequires:  pkgconfig(libsystemd-login) >= 198
 BuildRequires:  pkgconfig(libudev) >= 136
 BuildRequires:  pkgconfig(libwebp)

From e211c56f708deee330e3d66442bdae5941f3aeec4be51e11ccbeac8737cab4d9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 19 Sep 2014 20:53:05 +0000
Subject: [PATCH 10/11] weston-1.6.0

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=37
---
 weston-1.5.93.tar.xz |  3 ---
 weston-1.6.0.tar.xz  |  3 +++
 weston.changes       | 14 ++++++++++++++
 weston.spec          | 14 +++++++-------
 4 files changed, 24 insertions(+), 10 deletions(-)
 delete mode 100644 weston-1.5.93.tar.xz
 create mode 100644 weston-1.6.0.tar.xz

diff --git a/weston-1.5.93.tar.xz b/weston-1.5.93.tar.xz
deleted file mode 100644
index af2615f..0000000
--- a/weston-1.5.93.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5068badb2acb14e4b3dca66b390ad4798de60a9c2e5fcbaef2d694b31e3cb85
-size 733240
diff --git a/weston-1.6.0.tar.xz b/weston-1.6.0.tar.xz
new file mode 100644
index 0000000..6a54359
--- /dev/null
+++ b/weston-1.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc3ea5d13bbf025fabc006216c5ddc0d80d5f4ebe778912b8c4d1d4acaaa614d
+size 733112
diff --git a/weston.changes b/weston.changes
index 4a33f0c..76ad502 100644
--- a/weston.changes
+++ b/weston.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Sep 19 20:38:34 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 1.6.0
+* Xdg-shell protocol changes. [Changed again since 1.5.0.]
+* Add weston_layer masking mechanism.
+* keyboard repeat rate support, sent from compositor to clients,
+  configurable.
+* Use wl_display_add_socket_auto(): no need to specify the socket
+  anymore when running Weston under Weston, it just works now.
+* Exit Weston, if weston-desktop-shell dies too early. Should help with
+  one class of "just black screen" problems.
+* Option to force numlock on at start on DRM and fbdev backends.
+
 -------------------------------------------------------------------
 Fri Sep 12 11:14:34 UTC 2014 - jengelh@inai.de
 
diff --git a/weston.spec b/weston.spec
index 176b8a6..0f6dd64 100644
--- a/weston.spec
+++ b/weston.spec
@@ -18,7 +18,7 @@
 
 Name:           weston
 %define lname	libweston0
-Version:        1.5.93
+Version:        1.6.0
 Release:        0
 Summary:        Wayland Reference Compositor
 License:        HPND and CC-BY-SA-3.0
@@ -31,7 +31,6 @@ Source:         http://wayland.freedesktop.org/releases/%name-%version.tar.xz
 Patch1:         0001-build-honor-results-obtained-by-pkg-config-libinput.patch
 BuildRequires:  autoconf >= 2.64
 BuildRequires:  automake >= 1.11
-BuildRequires:  freerdp-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtool >= 2.2
@@ -42,12 +41,13 @@ BuildRequires:  pkgconfig
 BuildRequires:  rsvg-view
 BuildRequires:  xkeyboard-config
 BuildRequires:  xz
-BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(cairo) >= 1.10.0
 BuildRequires:  pkgconfig(cairo-egl) >= 1.11.3
 BuildRequires:  pkgconfig(cairo-xcb)
 BuildRequires:  pkgconfig(colord) >= 0.1.27
 BuildRequires:  pkgconfig(dbus-1) >= 1.6
 BuildRequires:  pkgconfig(egl) >= 7.10
+BuildRequires:  pkgconfig(freerdp)
 BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glesv2)
@@ -57,17 +57,17 @@ BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libdrm) >= 2.4.30
 BuildRequires:  pkgconfig(libffi)
-BuildRequires:  pkgconfig(libinput) >= 0.6.0
+BuildRequires:  pkgconfig(libinput) >= 0.5.0
 BuildRequires:  pkgconfig(libsystemd-login) >= 198
 BuildRequires:  pkgconfig(libudev) >= 136
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(mtdev) >= 1.1.0
-BuildRequires:  pkgconfig(pixman-1)
+BuildRequires:  pkgconfig(pixman-1) >= 0.25.2
 BuildRequires:  pkgconfig(poppler-glib)
-BuildRequires:  pkgconfig(wayland-client) >= 1.0.0
+BuildRequires:  pkgconfig(wayland-client) >= 1.5.91
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-server) >= 1.3.90
+BuildRequires:  pkgconfig(wayland-server) >= 1.5.91
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xcursor)

From 7b3e6806f183f119efd549b60543c6af87e8bc22145f02736c3c464a59964306 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 19 Sep 2014 20:53:43 +0000
Subject: [PATCH 11/11] OBS-URL:
 https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=38

---
 weston.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weston.spec b/weston.spec
index 0f6dd64..b137815 100644
--- a/weston.spec
+++ b/weston.spec
@@ -57,7 +57,7 @@ BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libdrm) >= 2.4.30
 BuildRequires:  pkgconfig(libffi)
-BuildRequires:  pkgconfig(libinput) >= 0.5.0
+BuildRequires:  pkgconfig(libinput) >= 0.6.0
 BuildRequires:  pkgconfig(libsystemd-login) >= 198
 BuildRequires:  pkgconfig(libudev) >= 136
 BuildRequires:  pkgconfig(libwebp)