diff --git a/0001-build-honor-results-obtained-by-pkg-config-libinput.patch b/0001-build-honor-results-obtained-by-pkg-config-libinput.patch deleted file mode 100644 index 479194c..0000000 --- a/0001-build-honor-results-obtained-by-pkg-config-libinput.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 901f05ab852a6f66cfae7d6081065e88e878a6eb Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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(-) - -Index: weston-1.12.0/Makefile.am -=================================================================== ---- weston-1.12.0.orig/Makefile.am -+++ weston-1.12.0/Makefile.am -@@ -53,7 +53,8 @@ AM_CPPFLAGS = \ - -DDATADIR='"$(datadir)"' \ - -DLIBWESTON_MODULEDIR='"$(libweston_moduledir)"' \ - -DLIBEXECDIR='"$(libexecdir)"' \ -- -DBINDIR='"$(bindir)"' -+ -DBINDIR='"$(bindir)"' \ -+ $(LIBINPUT_BACKEND_CFLAGS) - - CLEANFILES = weston.ini \ - ivi-shell/weston.ini \ diff --git a/weston-3.0.0.tar.xz b/weston-3.0.0.tar.xz deleted file mode 100644 index 213fc49..0000000 --- a/weston-3.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5 -size 1300340 diff --git a/weston-3.0.0.tar.xz.sig b/weston-3.0.0.tar.xz.sig deleted file mode 100644 index 6023507..0000000 Binary files a/weston-3.0.0.tar.xz.sig and /dev/null differ diff --git a/weston-4.0.0.tar.xz b/weston-4.0.0.tar.xz new file mode 100644 index 0000000..a4dd9f9 --- /dev/null +++ b/weston-4.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58 +size 1322008 diff --git a/weston-4.0.0.tar.xz.sig b/weston-4.0.0.tar.xz.sig new file mode 100644 index 0000000..f376e60 Binary files /dev/null and b/weston-4.0.0.tar.xz.sig differ diff --git a/weston.changes b/weston.changes index b24e926..a3e460b 100644 --- a/weston.changes +++ b/weston.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Apr 9 18:28:42 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 4.0.0 + * Weston now supports the input-timestamps protocol, allowing + clients to subscribe to high precision timestamp information + for input events. + * Basic atomic mode setting support has now landed. + * xdg-shell-v5 support has been removed. +- Drop 0001-build-honor-results-obtained-by-pkg-config-libinput.patch + ------------------------------------------------------------------- Tue Feb 27 14:41:38 UTC 2018 - emil.l.velikov@gmail.com diff --git a/weston.keyring b/weston.keyring index 1c2d09b..cf105cd 100644 --- a/weston.keyring +++ b/weston.keyring @@ -1,50 +1,34 @@ -pub 1024D/0x11A30156E0E67611 2006-09-06 - Key fingerprint = C722 3EBE 4EF6 6513 B892 5989 11A3 0156 E0E6 7611 -uid [ unknown] Bryce Harrington -uid [ unknown] Bryce Harrington -uid [ unknown] Bryce Harrington -uid [ unknown] Bryce Harrington -uid [ unknown] Bryce Harrington -sub 2048g/0x0813D5E325D309EB 2006-09-06 +pub rsa2048/0x5E54498E697F11D7 2014-08-12 [SC] + Key fingerprint = C006 6D7D B8E9 AC68 44D7 2871 5E54 498E 697F 11D7 +uid [ unknown] Derek Foreman +sub rsa2048/0x9D4F5C02AAAD837F 2014-08-12 [E] -----BEGIN PGP PUBLIC KEY BLOCK----- -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 -l+gX0bNao10= -=yGBs +mQENBFPqgXYBCAC0sUvZrj31IAB8LzM8tR3KS6njXsX0zRCDYYCcE/bNsWlvfo5M +YNxiR/PYDgvN8SAoDt9r7xb8a0Q9tAG326d13RStQSsaY2EvcBLMBgzXO4pFQ3pm +gLuK6NFZKz4qNle2kaq+KndTawGHAk0O9epsUYJUfcKj4bMLm3uZVRzJsfy5P8Qx +E4yLfBZgtdMnYXY9PHjqiFAtu4d//wNMSJ9Hv43eumVP3W28hFD5ZAsvyL3yL6rz +t+MtJrAYqSTgV0PrtR0JU3hAWAupW6SxmjeQHdMPJy4NbFCckdoNigid6FjsjjtW +uNuWtEa/lg58e5eyxKu6/KRmooqoyo6BOB53ABEBAAG0JkRlcmVrIEZvcmVtYW4g +PGRlcmVrZkBvc2cuc2Ftc3VuZy5jb20+iQE3BBMBAgAiBQJT6oF2AhsDBgsJCAcD +AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBeVEmOaX8R1+CFB/dYZDkH0Ne2hsjwRQBg +i7sL2fuyNlRLO0xAnii3vhDQ+yv6VLOb16eSqs8AcwKpLJMh+C8jrj2J8F8LYC0c +y0HRLZAJAn13q3/xsG550ZlDsy9Suq2U5KdGivCmsBfvvE8Qt4l0P0Ut0QJczo4h +ZywKxOAe3IjByXeeElsg+vW5dG+YWqhQde07XP5qzfZXmsevIPdVyg9+y3Ack8EM +Uk017ZzYfnOMysyOZAh8dXIW5uCFlN9s2plaKdVpvvnhe9JsQnL9btDcyOVYEHvn +RGA7HZwFDynJ+q5hfvNDcI2a0N5IRsT4mTAh+wwNFblAhJVX4LirxaHH9ZVS3vTo +HoK5AQ0EU+qBdgEIALV7qjn4lAzS8uqmNbNZqjH+juHorkYaoRN7idlBItujs7pe +72rJhF1dp4NIHuNh60aUu0IggjuGXF0r6YeoE5N9NwkBoLvOIx7EqodJM5yUmR+e +rYqiJOF4LDR2iaErBIrrpIXAyHnzUPToopXQxx4eMYpoDfN2zoJZlFHRpiy25aFc +P4hA7K1+Gb2YGhIvenDqPeGQJ3sr4FozMv0eqNKqqaj3oq11UrY5xRLWeoK7Y3H0 +e7zMukXZ3q1RfMxWDkSdDDkS8P1F7vVsAlluC/GJg1SOcQIK/hfbJGxiMsKYy5vd +iss8+etu8EDDkFzGQ4GirSP35rTVqpRXUnn0iSsAEQEAAYkBHwQYAQIACQUCU+qB +dgIbDAAKCRBeVEmOaX8R1/hyB/wLgXoRsHaE6AFcwzBfl8+KgPK3/VDcEBHslX3w +fYbXRrwuLUcyQO/lZiFIbZ9jNlcKH2zVd9Cu8QtYxCGF5lMGHW5K+aSiOe0AFDkO +X8auKZKskjhyGqSPtmNPeiuwOJI1nPaw7wochwBl2L7SdT20IPdwuUOOGymj0VYe +3QlxQ3tOG2WjMMYoCHIqOnJA0BP5HxTJob2cB7oraOc0QKHOS6KVJAovTrjJllFE +ncwhWUq20xh3NxSQKE8OpSQPv1mG8QmB+iThSeRarixXCvy/1GZb6HzFdaozj5Iy +T61de1eQ+/rLgixBkkiLtm6kkl8HlyJUNZGofRtAc7k7OkXo +=/RHj -----END PGP PUBLIC KEY BLOCK----- diff --git a/weston.spec b/weston.spec index 88eac2b..82a09c0 100644 --- a/weston.spec +++ b/weston.spec @@ -18,7 +18,7 @@ Name: weston %define lname libweston0 -Version: 3.0.0 +Version: 4.0.0 Release: 0 Summary: Wayland Reference Compositor License: MIT AND CC-BY-SA-3.0 @@ -30,7 +30,6 @@ Url: http://wayland.freedesktop.org/ Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig Source3: %name.keyring -Patch1: 0001-build-honor-results-obtained-by-pkg-config-libinput.patch BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1.11 BuildRequires: libjpeg-devel @@ -55,12 +54,10 @@ BuildRequires: pkgconfig(libinput) >= 0.8.0 BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libwebp) -# mtdev isn't really required - the configure check was fixed after the 3.0 release -BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(pixman-1) >= 0.25.2 BuildRequires: pkgconfig(wayland-client) >= 1.12.0 BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-protocols) >= 1.8 +BuildRequires: pkgconfig(wayland-protocols) >= 1.13 BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) >= 1.12.0 BuildRequires: pkgconfig(xcb) @@ -85,30 +82,30 @@ desktop shell. Finally, weston also provides integration with the Xorg server and can pull X clients into the Wayland desktop and act as a X window manager. -%package -n libweston-3 +%package -n libweston-4 Summary: Weston rendering backend collection Group: System/Libraries -%description -n libweston-3 +%description -n libweston-4 This subpackage contains backend renderer plugins, used by -libweston-3-0. +libweston-4-0. -%package -n libweston-3-0 +%package -n libweston-4-0 Summary: The Weston compositor as a shared library Group: System/Libraries -Requires: libweston-3 >= %version +Requires: libweston-4 >= %version -%description -n libweston-3-0 +%description -n libweston-4-0 The libweston library is intended for use by other compositor efforts (projects) that want to more easily utilize Weston's internal functionalities. Weston's own reference compositor also makes use of this. -%package -n libweston-desktop-3-0 +%package -n libweston-desktop-4-0 Summary: The Weston compositor as a shared library Group: System/Libraries -%description -n libweston-desktop-3-0 +%description -n libweston-desktop-4-0 libweston-desktop provides an additional level of functionality of relevance to compositors implementing a desktop metaphor style of graphical interface. This library API is designed around xdg_shell @@ -130,7 +127,6 @@ to develop plugins for Weston. %prep %setup -q -%patch -P 1 -p1 %build #if [ ! -e configure ]; then @@ -158,10 +154,10 @@ if ! make BACKEND=headless-backend.so check; then fi %endif -%post -n libweston-3-0 -p /sbin/ldconfig -%postun -n libweston-3-0 -p /sbin/ldconfig -%post -n libweston-desktop-3-0 -p /sbin/ldconfig -%postun -n libweston-desktop-3-0 -p /sbin/ldconfig +%post -n libweston-4-0 -p /sbin/ldconfig +%postun -n libweston-4-0 -p /sbin/ldconfig +%post -n libweston-desktop-4-0 -p /sbin/ldconfig +%postun -n libweston-desktop-4-0 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -173,17 +169,17 @@ fi %_datadir/wayland-sessions/ %_mandir/man?/*.* -%files -n libweston-3-0 +%files -n libweston-4-0 %defattr(-,root,root) -%_libdir/libweston-3.so.0* +%_libdir/libweston-4.so.0* -%files -n libweston-3 +%files -n libweston-4 %defattr(-,root,root) -%_libdir/libweston-3/ +%_libdir/libweston-4/ -%files -n libweston-desktop-3-0 +%files -n libweston-desktop-4-0 %defattr(-,root,root) -%_libdir/libweston-desktop-3.so.0* +%_libdir/libweston-desktop-4.so.0* %files devel %defattr(-,root,root)