Accepting request 620942 from X11:Wayland

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/620942
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/weston?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2018-07-06 08:44:17 +00:00 committed by Git OBS Bridge
commit 40122aad93
8 changed files with 64 additions and 98 deletions

View File

@ -1,25 +0,0 @@
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(-)
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 \

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5
size 1300340

Binary file not shown.

3
weston-4.0.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58
size 1322008

BIN
weston-4.0.0.tar.xz.sig Normal file

Binary file not shown.

View File

@ -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 Tue Feb 27 14:41:38 UTC 2018 - emil.l.velikov@gmail.com

View File

@ -1,50 +1,34 @@
pub 1024D/0x11A30156E0E67611 2006-09-06 pub rsa2048/0x5E54498E697F11D7 2014-08-12 [SC]
Key fingerprint = C722 3EBE 4EF6 6513 B892 5989 11A3 0156 E0E6 7611 Key fingerprint = C006 6D7D B8E9 AC68 44D7 2871 5E54 498E 697F 11D7
uid [ unknown] Bryce Harrington <bryce.harrington@ubuntu.com> uid [ unknown] Derek Foreman <derekf@osg.samsung.com>
uid [ unknown] Bryce Harrington <bryce@ubuntu.com> sub rsa2048/0x9D4F5C02AAAD837F 2014-08-12 [E]
uid [ unknown] Bryce Harrington <bryce@canonical.com>
uid [ unknown] Bryce Harrington <bryce@bryceharrington.org>
uid [ unknown] Bryce Harrington <bryce.harrington@canonical.com>
sub 2048g/0x0813D5E325D309EB 2006-09-06
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
mQGiBET+XhERBADlUYa7VXfPl3y9uCBUMniYdE4FKLAobrREyiveLf+2mTf435YL mQENBFPqgXYBCAC0sUvZrj31IAB8LzM8tR3KS6njXsX0zRCDYYCcE/bNsWlvfo5M
de0gcx9ZS/EZUq+4rn4uv6AsKmw/f/N/VWGC4KL60uyp7zJjUNed2KKBk3sk57IG YNxiR/PYDgvN8SAoDt9r7xb8a0Q9tAG326d13RStQSsaY2EvcBLMBgzXO4pFQ3pm
pHwRqzXQwk8wVMOuhyyv207cmUadGVtL4GPKUCOYp+C0hnSs3Jq0fZJ9lwCg5xDx gLuK6NFZKz4qNle2kaq+KndTawGHAk0O9epsUYJUfcKj4bMLm3uZVRzJsfy5P8Qx
fg3g++HUm8Gu2D/SYR4pFWED/2J4fkdPRQhxnfmvUxphqKf24aDngDwXYLkKlywY E4yLfBZgtdMnYXY9PHjqiFAtu4d//wNMSJ9Hv43eumVP3W28hFD5ZAsvyL3yL6rz
Gs52J8iOwTQ/DRIruKepqrh66gb06QwnMQe9R5mJqncoi87m2jlKzUdJ5WV4JRmX t+MtJrAYqSTgV0PrtR0JU3hAWAupW6SxmjeQHdMPJy4NbFCckdoNigid6FjsjjtW
c4QVu9vRySK9j6e1O2mJeRrYvkf5rDBCHXvOoXET6VSHZI//1OJJ5OMiIApERFdT uNuWtEa/lg58e5eyxKu6/KRmooqoyo6BOB53ABEBAAG0JkRlcmVrIEZvcmVtYW4g
+a5TA/4u82BHdLFerbK23ML0aWOpTc/kMbOwLjF7rFF3iJ4Pbhv0gS2wWx/1oqbF PGRlcmVrZkBvc2cuc2Ftc3VuZy5jb20+iQE3BBMBAgAiBQJT6oF2AhsDBgsJCAcD
ZGdTS5XVGiWf/+/rZpN8SeC5Q8cJ1EYqSHyo/eA+mI+C6ylqyyODmZ42OQr142xj AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBeVEmOaX8R1+CFB/dYZDkH0Ne2hsjwRQBg
t6MFj5uBMq3QQGYytZ65ustDfnE/qP6hNJGtE9Lw6NVGd6oG37QjQnJ5Y2UgSGFy i7sL2fuyNlRLO0xAnii3vhDQ+yv6VLOb16eSqs8AcwKpLJMh+C8jrj2J8F8LYC0c
cmluZ3RvbiA8YnJ5Y2VAdWJ1bnR1LmNvbT6IYAQTEQIAIAUCRjaCtAIbAwYLCQgH y0HRLZAJAn13q3/xsG550ZlDsy9Suq2U5KdGivCmsBfvvE8Qt4l0P0Ut0QJczo4h
AwIEFQIIAwQWAgMBAh4BAheAAAoJEBGjAVbg5nYRRZ0An3zQ4i/fyaIWfr/foWCW ZywKxOAe3IjByXeeElsg+vW5dG+YWqhQde07XP5qzfZXmsevIPdVyg9+y3Ack8EM
DVq/uY2vAJ9LysGmFPOFtE7HodEgWTfscNGAqLQmQnJ5Y2UgSGFycmluZ3RvbiA8 Uk017ZzYfnOMysyOZAh8dXIW5uCFlN9s2plaKdVpvvnhe9JsQnL9btDcyOVYEHvn
YnJ5Y2VAY2Fub25pY2FsLmNvbT6IYAQTEQIAIAUCRjaChgIbAwYLCQgHAwIEFQII RGA7HZwFDynJ+q5hfvNDcI2a0N5IRsT4mTAh+wwNFblAhJVX4LirxaHH9ZVS3vTo
AwQWAgMBAh4BAheAAAoJEBGjAVbg5nYRLroAoKMRiorncOieajn//+wDhFzl1/K0 HoK5AQ0EU+qBdgEIALV7qjn4lAzS8uqmNbNZqjH+juHorkYaoRN7idlBItujs7pe
AJ9EJvOoR+XwM58JBHqgpjC/sBEK1LQsQnJ5Y2UgSGFycmluZ3RvbiA8YnJ5Y2VA 72rJhF1dp4NIHuNh60aUu0IggjuGXF0r6YeoE5N9NwkBoLvOIx7EqodJM5yUmR+e
YnJ5Y2VoYXJyaW5ndG9uLm9yZz6IYAQTEQIAIAUCRP5eEQIbAwYLCQgHAwIEFQII rYqiJOF4LDR2iaErBIrrpIXAyHnzUPToopXQxx4eMYpoDfN2zoJZlFHRpiy25aFc
AwQWAgMBAh4BAheAAAoJEBGjAVbg5nYRYUcAoMFQUJCj8e+VxZ00X8BA7yBeWfLM P4hA7K1+Gb2YGhIvenDqPeGQJ3sr4FozMv0eqNKqqaj3oq11UrY5xRLWeoK7Y3H0
AKCWI6SIMdUy8sFt4/+e+pr3tPG4ObQuQnJ5Y2UgSGFycmluZ3RvbiA8YnJ5Y2Uu e7zMukXZ3q1RfMxWDkSdDDkS8P1F7vVsAlluC/GJg1SOcQIK/hfbJGxiMsKYy5vd
aGFycmluZ3RvbkB1YnVudHUuY29tPohgBBMRAgAgBQJGNoLpAhsDBgsJCAcDAgQV iss8+etu8EDDkFzGQ4GirSP35rTVqpRXUnn0iSsAEQEAAYkBHwQYAQIACQUCU+qB
AggDBBYCAwECHgECF4AACgkQEaMBVuDmdhH2/QCfRD2PsYtAMuphzC7eKAu8JcTd dgIbDAAKCRBeVEmOaX8R1/hyB/wLgXoRsHaE6AFcwzBfl8+KgPK3/VDcEBHslX3w
ApIAn1yUR8KhCHOu0PCk8be4BAYCqsXbtDFCcnljZSBIYXJyaW5ndG9uIDxicnlj fYbXRrwuLUcyQO/lZiFIbZ9jNlcKH2zVd9Cu8QtYxCGF5lMGHW5K+aSiOe0AFDkO
ZS5oYXJyaW5ndG9uQGNhbm9uaWNhbC5jb20+iGAEExECACAFAkY2gp4CGwMGCwkI X8auKZKskjhyGqSPtmNPeiuwOJI1nPaw7wochwBl2L7SdT20IPdwuUOOGymj0VYe
BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRARowFW4OZ2ERbRAJ4rftdHk9dz+nWzysM1 3QlxQ3tOG2WjMMYoCHIqOnJA0BP5HxTJob2cB7oraOc0QKHOS6KVJAovTrjJllFE
hBKF6znkdACgyEAgSBq49mNF0ygd3MZ058lWGOm5Ag0ERP5eJBAIANPRuY4Chpn/ ncwhWUq20xh3NxSQKE8OpSQPv1mG8QmB+iThSeRarixXCvy/1GZb6HzFdaozj5Iy
djtym9zbbX5XtirVi1TDVA1SCRqS7kj7l57nigi8ysRZsANBF3VOq0qOxNLy/WRg T61de1eQ+/rLgixBkkiLtm6kkl8HlyJUNZGofRtAc7k7OkXo
WocL3rm6EeBcAwcJvqGU34DNVeyCX+KpAjeSeocC3HnUG6p388XW3qCsQtGEYff0 =/RHj
SXOQrYP0TV7wCDpd1Zj+MLH+1HKlzYetQmg2x1QWuPz5UM5hr1eLVdLNB1E9tZt3
NeIjG0DmJjiLyZLcHfAi2XV7LMPlQVDOBYrkUsWN+Gbr8MSlWqXK7Wan7YjsicrP
gdbriXRGTOfkQLtTFSf9yEYNZBO1+LKN6JrgA1xQLwnHkLg04pc/Nc3xqdZXdLSg
lmH6kZFpQpMAAwUH/1iQSDXcO94Q8+Dz5upRe031hT46DFy9zKi7wjlvNEzGWkmQ
bdoSyukAHuZL0PeSkiZRrlADxj1CgSXgIvFsYgMkjIo2b3c6Fms74DSHy4JMcrjl
yWaqDdR1QqqdevlXjzMi+znqWulOeUnc+o1KXYSsNi1Pt+A4PJcDIs82kIazPai1
h8nid7Vph/uL/uAj5RNelq8NSwz3QWtf6zJ2eNtkiLS3oc2mY72xv2jzZCMX6Eyv
bxie1ZLQtS851SZY2dTKsO1nZ+dPPGg5iXT/yHET69TBzDe+Tr4K00TDiv5WS4oq
lmCs/sEjIPybZ0Ymflx9F7wsI/ZMiRiHtYGgpDGISQQYEQIACQUCRP5eJAIbDAAK
CRARowFW4OZ2EdcCAKDUN6VXAHc1W4jhffDhACKOqWDe+wCfXcnottJtaQITUbCQ
l+gX0bNao10=
=yGBs
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----

View File

@ -18,7 +18,7 @@
Name: weston Name: weston
%define lname libweston0 %define lname libweston0
Version: 3.0.0 Version: 4.0.0
Release: 0 Release: 0
Summary: Wayland Reference Compositor Summary: Wayland Reference Compositor
License: MIT AND CC-BY-SA-3.0 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 Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz
Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig
Source3: %name.keyring Source3: %name.keyring
Patch1: 0001-build-honor-results-obtained-by-pkg-config-libinput.patch
BuildRequires: autoconf >= 2.64 BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1.11 BuildRequires: automake >= 1.11
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
@ -55,12 +54,10 @@ BuildRequires: pkgconfig(libinput) >= 0.8.0
BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libsystemd) >= 209
BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libudev) >= 136
BuildRequires: pkgconfig(libwebp) 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(pixman-1) >= 0.25.2
BuildRequires: pkgconfig(wayland-client) >= 1.12.0 BuildRequires: pkgconfig(wayland-client) >= 1.12.0
BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-protocols) >= 1.13
BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server) >= 1.12.0 BuildRequires: pkgconfig(wayland-server) >= 1.12.0
BuildRequires: pkgconfig(xcb) 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 Xorg server and can pull X clients into the Wayland desktop and act
as a X window manager. as a X window manager.
%package -n libweston-3 %package -n libweston-4
Summary: Weston rendering backend collection Summary: Weston rendering backend collection
Group: System/Libraries Group: System/Libraries
%description -n libweston-3 %description -n libweston-4
This subpackage contains backend renderer plugins, used by 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 Summary: The Weston compositor as a shared library
Group: System/Libraries 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 The libweston library is intended for use by other compositor efforts
(projects) that want to more easily utilize Weston's internal (projects) that want to more easily utilize Weston's internal
functionalities. Weston's own reference compositor also makes use of functionalities. Weston's own reference compositor also makes use of
this. this.
%package -n libweston-desktop-3-0 %package -n libweston-desktop-4-0
Summary: The Weston compositor as a shared library Summary: The Weston compositor as a shared library
Group: System/Libraries Group: System/Libraries
%description -n libweston-desktop-3-0 %description -n libweston-desktop-4-0
libweston-desktop provides an additional level of functionality of libweston-desktop provides an additional level of functionality of
relevance to compositors implementing a desktop metaphor style of relevance to compositors implementing a desktop metaphor style of
graphical interface. This library API is designed around xdg_shell graphical interface. This library API is designed around xdg_shell
@ -130,7 +127,6 @@ to develop plugins for Weston.
%prep %prep
%setup -q %setup -q
%patch -P 1 -p1
%build %build
#if [ ! -e configure ]; then #if [ ! -e configure ]; then
@ -158,10 +154,10 @@ if ! make BACKEND=headless-backend.so check; then
fi fi
%endif %endif
%post -n libweston-3-0 -p /sbin/ldconfig %post -n libweston-4-0 -p /sbin/ldconfig
%postun -n libweston-3-0 -p /sbin/ldconfig %postun -n libweston-4-0 -p /sbin/ldconfig
%post -n libweston-desktop-3-0 -p /sbin/ldconfig %post -n libweston-desktop-4-0 -p /sbin/ldconfig
%postun -n libweston-desktop-3-0 -p /sbin/ldconfig %postun -n libweston-desktop-4-0 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -173,17 +169,17 @@ fi
%_datadir/wayland-sessions/ %_datadir/wayland-sessions/
%_mandir/man?/*.* %_mandir/man?/*.*
%files -n libweston-3-0 %files -n libweston-4-0
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libweston-3.so.0* %_libdir/libweston-4.so.0*
%files -n libweston-3 %files -n libweston-4
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libweston-3/ %_libdir/libweston-4/
%files -n libweston-desktop-3-0 %files -n libweston-desktop-4-0
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libweston-desktop-3.so.0* %_libdir/libweston-desktop-4.so.0*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)