diff --git a/0001-build-add-missing-dep-to-x11-backend.patch b/0001-build-add-missing-dep-to-x11-backend.patch new file mode 100644 index 0000000..77a5e1c --- /dev/null +++ b/0001-build-add-missing-dep-to-x11-backend.patch @@ -0,0 +1,35 @@ +From 651566af2d937a8889ddda0ecc71e93b4091842a Mon Sep 17 00:00:00 2001 +From: Pekka Paalanen +Date: Fri, 29 Mar 2019 13:37:56 +0200 +Subject: [PATCH] build: add missing dep to x11 backend + +All other backends already link to libweston, x11 backend should too. + +This fixes a build failure: + +[1/50] Compiling C object 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o'. +FAILED: libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o +cc -Ilibweston/2b98b6d@@x11-backend@sha -Ilibweston -I../../git/weston/libweston -Ilibweston/.. -I../../git/weston/libweston/.. -Ilibweston/../shared -I../../git/weston/libweston/../shared -Iprotocol -I/home/pq/local/include -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/libdrm -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu99 -g -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -fvisibility=hidden -fPIC -MD -MQ 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o' -MF 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o.d' -o 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o' -c ../../git/weston/libweston/compositor-x11.c +../../git/weston/libweston/compositor-x11.c:51:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory + #include + +Signed-off-by: Pekka Paalanen +--- + libweston/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libweston/meson.build b/libweston/meson.build +index 8b887afb..dbbf2b92 100644 +--- a/libweston/meson.build ++++ b/libweston/meson.build +@@ -365,6 +365,7 @@ if get_option('backend-x11') + endif + + deps_x11 = [ ++ dep_libweston, + dep_x11_xcb, + dep_lib_cairo_shared, + dep_pixman, +-- +2.21.0 + diff --git a/0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch b/0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch new file mode 100644 index 0000000..c757ea3 --- /dev/null +++ b/0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch @@ -0,0 +1,46 @@ +From 779db046b91f28458b6bd79e07818ae20b49ba8b Mon Sep 17 00:00:00 2001 +From: Pekka Paalanen +Date: Thu, 28 Mar 2019 12:26:47 +0200 +Subject: [PATCH] meson: dep fix for compositor.h needing xkbcommon.h + +This fixes: + +[ 5s] cc -Ilibweston/2b98b6d@@session-helper@sta -Ilibweston -I../libweston -Ilibweston/.. -I../libweston/.. -Ilibwes +ton/../shared -I../libweston/../shared -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/dbus-1.0 -I/usr/lib6 +4/dbus-1.0/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu99 -Wno-unused-parameter -Wno-shift-n +egative-value -Wno-missing-field-initializers -fvisibility=hidden -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong + -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fPIC -MD -MQ 'libweston/2b98b6d@@session-hel +per@sta/launcher-util.c.o' -MF 'libweston/2b98b6d@@session-helper@sta/launcher-util.c.o.d' -o 'libweston/2b98b6d@@sessio +n-helper@sta/launcher-util.c.o' -c ../libweston/launcher-util.c +[ 5s] In file included from ../libweston/launcher-util.c:29: +[ 5s] ../libweston/compositor.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory +[ 5s] #include + +For completeness, also add the same for wayland-server.h. + +Reported-by: Jan Engelhardt +Signed-off-by: Pekka Paalanen +--- + libweston/meson.build | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libweston/meson.build b/libweston/meson.build +index 5d7bfa27..8b887afb 100644 +--- a/libweston/meson.build ++++ b/libweston/meson.build +@@ -121,7 +121,11 @@ srcs_session_helper = [ + ] + deps_session_helper = [ + # for compositor.h needing pixman.h +- dep_pixman.partial_dependency(compile_args: true) ++ dep_pixman.partial_dependency(compile_args: true), ++ # for compositor.h needing xkbcommon.h ++ dep_xkbcommon.partial_dependency(compile_args: true), ++ # for compositor.h needing wayland-server.h ++ dep_wayland_server.partial_dependency(compile_args: true) + ] + + if get_option('backend-drm') +-- +2.21.0 + diff --git a/weston-5.0.0.tar.xz b/weston-5.0.0.tar.xz deleted file mode 100644 index 8a9187b..0000000 --- a/weston-5.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf -size 1467496 diff --git a/weston-5.0.0.tar.xz.sig b/weston-5.0.0.tar.xz.sig deleted file mode 100644 index ee98513..0000000 Binary files a/weston-5.0.0.tar.xz.sig and /dev/null differ diff --git a/weston-6.0.0.tar.xz b/weston-6.0.0.tar.xz new file mode 100644 index 0000000..f1c5a51 --- /dev/null +++ b/weston-6.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612 +size 1517032 diff --git a/weston.changes b/weston.changes index 72d65b3..73600b1 100644 --- a/weston.changes +++ b/weston.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 28 09:20:31 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 6 + * No changelog was provided +- Add 0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch + ------------------------------------------------------------------- Sat Aug 25 17:30:52 UTC 2018 - jengelh@inai.de diff --git a/weston.spec b/weston.spec index 8fcfeab..3c33079 100644 --- a/weston.spec +++ b/weston.spec @@ -1,7 +1,7 @@ # # spec file for package weston # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,13 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: weston %define lname libweston0 -Version: 5.0.0 +%define major 6 +%define realver 6.0.0 +Version: 6 Release: 0 Summary: Wayland Reference Compositor License: MIT AND CC-BY-SA-3.0 @@ -27,14 +29,16 @@ 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 -Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig +Source: http://wayland.freedesktop.org/releases/%name-%realver.tar.xz Source3: %name.keyring +Patch1: 0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch +Patch2: 0001-build-add-missing-dep-to-x11-backend.patch BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1.11 BuildRequires: libjpeg-devel BuildRequires: libtool >= 2.2 BuildRequires: libxml2-tools +BuildRequires: meson BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: xkeyboard-config @@ -50,9 +54,11 @@ BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libdrm) >= 2.4.68 +BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(libinput) >= 0.8.0 BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libudev) >= 136 +BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(pixman-1) >= 0.25.2 BuildRequires: pkgconfig(wayland-client) >= 1.12.0 @@ -82,30 +88,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-5 +%package -n libweston-%major Summary: Weston rendering backend collection Group: System/Libraries -%description -n libweston-5 +%description -n libweston-%major This subpackage contains backend renderer plugins, used by -libweston-5-0. +libweston-%major-0. -%package -n libweston-5-0 +%package -n libweston-%major-0 Summary: The Weston compositor as a shared library Group: System/Libraries -Requires: libweston-5 >= %version +Requires: libweston-%major >= %version -%description -n libweston-5-0 +%description -n libweston-%major-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-5-0 +%package -n libweston-desktop-%major-0 Summary: The Weston compositor as a shared library Group: System/Libraries -%description -n libweston-desktop-5-0 +%description -n libweston-desktop-%major-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 @@ -115,6 +121,8 @@ interfacing with Xwayland. %package devel Summary: Development files for Weston plugins Group: Development/Libraries/C and C++ +Requires: libweston-%major-0 = %version +Requires: libweston-desktop-%major-0 = %version %description devel Weston is the reference implementation of a Wayland compositor, and a @@ -126,38 +134,32 @@ This package contains all necessary include files and libraries needed to develop plugins for Weston. %prep -%setup -q +%autosetup -n %name-%realver -p1 %build -#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/%name" \ - --disable-setuid-install \ - --disable-libunwind -make %{?_smp_mflags} +%meson -Ddemo-clients=false -Dremoting=false -Dsimple-clients= \ + -Dsimple-dmabuf-drm=intel -Dtest-junit-xml=false \ + --includedir="%_includedir/%name" +%meson_build %install -%make_install -find "%buildroot" -type f -name "*.la" -delete -print +%meson_install %check %if !0%{?qemu_user_space_build} export XDG_RUNTIME_DIR="$PWD/xdg" mkdir -pm go-rwx "$XDG_RUNTIME_DIR" if ! make BACKEND=headless-backend.so check; then - cat test-suite.log + cat test-suite.log || : # make check can not pass completely without an actual screen. #exit 1 fi %endif -%post -n libweston-5-0 -p /sbin/ldconfig -%postun -n libweston-5-0 -p /sbin/ldconfig -%post -n libweston-desktop-5-0 -p /sbin/ldconfig -%postun -n libweston-desktop-5-0 -p /sbin/ldconfig +%post -n libweston-%major-0 -p /sbin/ldconfig +%postun -n libweston-%major-0 -p /sbin/ldconfig +%post -n libweston-desktop-%major-0 -p /sbin/ldconfig +%postun -n libweston-desktop-%major-0 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -169,22 +171,23 @@ fi %_datadir/wayland-sessions/ %_mandir/man?/*.* -%files -n libweston-5-0 +%files -n libweston-%major-0 %defattr(-,root,root) -%_libdir/libweston-5.so.0* +%_libdir/libweston-%major.so.0* -%files -n libweston-5 +%files -n libweston-%major %defattr(-,root,root) -%_libdir/libweston-5/ +%_libdir/libweston-%major/ -%files -n libweston-desktop-5-0 +%files -n libweston-desktop-%major-0 %defattr(-,root,root) -%_libdir/libweston-desktop-5.so.0* +%_libdir/libweston-desktop-%major.so.0* %files devel %defattr(-,root,root) %_includedir/%name/ %_libdir/pkgconfig/*.pc %_libdir/libweston*.so +%_datadir/pkgconfig/*.pc %changelog