Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -50,3 +50,16 @@
 /weston-7.0.0.tar.xz
 /weston-7.0.93.tar.xz
 /weston-8.0.0.tar.xz
+/weston-9.0.0.tar.xz
+/weston-10.0.0.tar.xz
+/weston-10.0.1.tar.xz
+/weston-11.0.0.tar.xz
+/weston-11.0.1.tar.gz
+/weston-12.0.0.tar.gz
+/weston-12.0.1.tar.gz
+/weston-12.0.2.tar.gz
+/weston-13.0.0.tar.gz
+/weston-13.0.3.tar.gz
+/weston-13.0.95.tar.xz
+/weston-14.0.0.tar.xz
+/weston-14.0.1.tar.xz

1649.patch

@@ -0,0 +1,28 @@
+From b4386289d614f26e89e1c6eb17e048826e925ed1 Mon Sep 17 00:00:00 2001
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Tue, 19 Nov 2024 17:06:19 +0100
+Subject: [PATCH] vnc: Allow neatvnc in version 0.9.0
+
+Neat VNC 0.9.0 is backwards compatible.
+
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ libweston/backend-vnc/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build
+index 39b15cf902..cf67c51cbf 100644
+--- a/libweston/backend-vnc/meson.build
++++ b/libweston/backend-vnc/meson.build
+@@ -3,7 +3,7 @@ if not get_option('backend-vnc')
+ endif
+ 
+ config_h.set('BUILD_VNC_COMPOSITOR', '1')
+-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.10.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
+ if not dep_neatvnc.found()
+ 	error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
+ endif
+-- 
+GitLab
+

sources

@@ -1 +1 @@
-SHA512 (weston-8.0.0.tar.xz) = 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
+SHA512 (weston-14.0.1.tar.xz) = 2d782f98f28b39b990acecfc885f62ab34c9cdd22ef06b09c5d8df792112c47b365f89c2bf05d871e36ddfb4c49aa7e6d05ff60fe67a2657727162e4f564a412

weston.spec

@@ -1,19 +1,20 @@
-%global apiver 8
+%global apiver 14
-%global meson_prob 1
 
 Name:           weston
-Version:        %{apiver}.0.0
+Version:        14.0.1
-Release:        10%{?dist}
+Release:        3%{?dist}
 Summary:        Reference compositor for Wayland
 
-License:        BSD and CC-BY-SA
+License:        MIT and CC-BY-SA-3.0
 URL:            http://wayland.freedesktop.org/
-Source0:        http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
+Source0:        https://gitlab.freedesktop.org/wayland/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
+
+# Backport from upstream
+## Allow neatvnc 0.9.0 as a build dependency
+Patch0:         https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1649.patch
 
 BuildRequires:  gcc
-%if %meson_prob
+BuildRequires:  gcc-c++
-BuildRequires:  g++
-%endif
 BuildRequires:  glib2-devel
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  pam-devel
@@ -25,14 +26,24 @@ BuildRequires:  pkgconfig(cairo-xcb)
 BuildRequires:  pkgconfig(colord) >= 0.1.27
 BuildRequires:  pkgconfig(dbus-1) >= 1.6
 BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(freerdp2)
+BuildRequires:  pkgconfig(freerdp3)
 BuildRequires:  pkgconfig(gbm) >= 10.2
 BuildRequires:  pkgconfig(glesv2)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-allocators-1.0)
+BuildRequires:  pkgconfig(gstreamer-app-1.0)
+BuildRequires:  pkgconfig(gstreamer-video-1.0)
 BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libdrm) >= 2.4.30
+BuildRequires:  pkgconfig(libdisplay-info) >= 0.1.1
+BuildRequires:  pkgconfig(libdrm) >= 2.4.109
 BuildRequires:  pkgconfig(libevdev)
 BuildRequires:  pkgconfig(libinput) >= 0.8.0
+BuildRequires:  pkgconfig(libpipewire-0.3)
 BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libseat) >= 0.6.1
+BuildRequires:  pkgconfig(libspa-0.2)
 BuildRequires:  pkgconfig(libsystemd) >= 209
 BuildRequires:  pkgconfig(libudev) >= 136
 # libunwind available only on selected arches
@@ -44,29 +55,28 @@ BuildRequires:  pkgconfig(libva-drm) >= 0.34.0
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.6
 BuildRequires:  pkgconfig(mtdev) >= 1.1.0
+BuildRequires:  (pkgconfig(neatvnc) >= 0.7.0 with pkgconfig(neatvnc) < 0.10.0)
 BuildRequires:  pkgconfig(pangocairo)
 BuildRequires:  pkgconfig(pixman-1) >= 0.25.2
-BuildRequires:  pkgconfig(wayland-client) >= 1.12.0
+BuildRequires:  pkgconfig(wayland-client) >= 1.22.0
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.18
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.33
 BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wayland-server) >= 1.22
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
 BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-cursor)
 BuildRequires:  pkgconfig(xcb-composite)
 BuildRequires:  pkgconfig(xcb-shm)
 BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xcb-xkb)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  poppler-devel
-BuildRequires:  poppler-glib-devel
-BuildRequires:  gstreamer1-devel
-BuildRequires:  gstreamer1-plugins-base-devel
-BuildRequires:  pipewire-devel
 
+Conflicts:      %{name} < 13.0.0-4
+Obsoletes:      %{name} < 13.0.0-4
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       mesa-dri-drivers
 
@@ -74,6 +84,16 @@ Requires:       mesa-dri-drivers
 Weston is the reference wayland compositor that can run on KMS, under X11
 or under another compositor.
 
+%package        session
+Summary:        Weston desktop session
+Conflicts:      %{name} < 13.0.0-4
+Obsoletes:      %{name} < 13.0.0-4
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description    session
+Weston desktop session.
+
 %package        libs
 Summary:        Weston compositor libraries
 
@@ -88,6 +108,7 @@ This package contains Weston demo program files.
 
 %package        devel
 Summary:        Common headers for weston
+# Automatically converted from old format: MIT - review is highly recommended.
 License:        MIT
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
@@ -96,17 +117,10 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Common headers for weston
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-# ninja injects -Wl,--no-undefined, which intereferes with LTO, so undo
-# the setting.  Thanks to the SuSE folks for the workaround.
-export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
-%if %{meson_prob}
-%meson -Dpipewire=false
-%else
 %meson
-%endif
 %meson_build
 
 %install
@@ -116,31 +130,24 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 # may be standalone tests can be done
 #%%meson_test
 
-%post
-/usr/bin/getent group weston-launch >/dev/null || /usr/sbin/groupadd -r weston-launch
-
-%postun
-/usr/sbin/groupdel weston-launch || true
-
 %files
+%config(noreplace) %{_sysconfdir}/pam.d/weston-remote-access
 %license COPYING
 %doc README.md
 %{_bindir}/weston
 %{_bindir}/weston-debug
-%{_bindir}/weston-info
-%attr(4755,root,root) %{_bindir}/weston-launch
 %{_bindir}/weston-screenshooter
+%{_bindir}/weston-tablet
 %{_bindir}/weston-terminal
 %{_bindir}/wcap-decode
 %dir %{_libdir}/weston
-%{_libdir}/weston/cms-colord.so
-%{_libdir}/weston/cms-static.so
 %{_libdir}/weston/desktop-shell.so
 %{_libdir}/weston/fullscreen-shell.so
 %{_libdir}/weston/hmi-controller.so
 %{_libdir}/weston/ivi-shell.so
 %{_libdir}/weston/screen-share.so
 %{_libdir}/weston/systemd-notify.so
+%{_libdir}/weston/kiosk-shell.so
 %{_libdir}/weston/libexec_weston.so*
 %{_libexecdir}/weston-*
 %{_mandir}/man1/*.1*
@@ -149,32 +156,33 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 %dir %{_datadir}/weston
 %{_datadir}/weston/*.png
 %{_datadir}/weston/wayland.svg
+
+%files session
 %{_datadir}/wayland-sessions/weston.desktop
 
 %files libs
 %license COPYING
 %dir %{_libdir}/libweston-%{apiver}
+%{_libdir}/libweston-%{apiver}/color-lcms.so
 %{_libdir}/libweston-%{apiver}/drm-backend.so
-%{_libdir}/libweston-%{apiver}/fbdev-backend.so
 %{_libdir}/libweston-%{apiver}/gl-renderer.so
 %{_libdir}/libweston-%{apiver}/headless-backend.so
-%if !%{meson_prob}
+%{_libdir}/libweston-%{apiver}/pipewire-backend.so
 %{_libdir}/libweston-%{apiver}/pipewire-plugin.so
-%endif
 %{_libdir}/libweston-%{apiver}/remoting-plugin.so
 %{_libdir}/libweston-%{apiver}/rdp-backend.so
+%{_libdir}/libweston-%{apiver}/vnc-backend.so
 %{_libdir}/libweston-%{apiver}/wayland-backend.so
 %{_libdir}/libweston-%{apiver}/x11-backend.so
 %{_libdir}/libweston-%{apiver}/xwayland.so
 %{_libdir}/libweston-%{apiver}.so.0*
-%{_libdir}/libweston-desktop-%{apiver}.so.0*
 
 %files demo
 %license COPYING
 %{_bindir}/weston-calibrator
 %{_bindir}/weston-clickdot
 %{_bindir}/weston-cliptest
-%{_bindir}/weston-confine
+%{_bindir}/weston-constraints
 %{_bindir}/weston-dnd
 %{_bindir}/weston-editor
 %{_bindir}/weston-eventdemo
@@ -188,6 +196,7 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 %{_bindir}/weston-simple-damage
 %{_bindir}/weston-content_protection
 %{_bindir}/weston-simple-dmabuf-egl
+%{_bindir}/weston-simple-dmabuf-feedback
 %{_bindir}/weston-simple-dmabuf-v4l
 %{_bindir}/weston-simple-egl
 %{_bindir}/weston-simple-shm
@@ -202,14 +211,101 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 %{_includedir}/libweston-%{apiver}/
 %{_includedir}/weston/
 %{_libdir}/pkgconfig/libweston-%{apiver}.pc
-%{_libdir}/pkgconfig/libweston-desktop-%{apiver}.pc
 %{_libdir}/pkgconfig/weston.pc
 %{_libdir}/libweston-%{apiver}.so
-%{_libdir}/libweston-desktop-%{apiver}.so
 %{_datadir}/pkgconfig/libweston-%{apiver}-protocols.pc
 %{_datadir}/libweston-%{apiver}/protocols/
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 14.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Nov 21 2024 Neal Gompa <ngompa@fedoraproject.org> - 14.0.1-2
+- Backport patch to allow neatvnc 0.9.0 as a dependency
+
+* Mon Nov 11 2024 Neal Gompa <ngompa@fedoraproject.org> - 14.0.1-1
+- Update to 14.0.1
+
+* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 14.0.0-2
+- convert license to SPDX
+
+* Wed Sep 04 2024 Neal Gompa <ngompa@fedoraproject.org> - 14.0.0-1
+- Update to 14.0.0 final
+
+* Mon Sep 02 2024 Neal Gompa <ngompa@fedoraproject.org> - 13.0.95-1
+- Rebase to 14.0.0~rc3 (13.0.95)
+
+* Tue Aug 27 2024 Neal Gompa <ngompa@fedoraproject.org> - 13.0.3-3
+- Mark weston remote access pam config noreplace (rhbz#2307373)
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 13.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jul 17 2024 Nils Kattenbeck <nilskemail+fedora@gmail.com> - 13.0.3-1
+- Update to 13.0.3
+- Fix build error caused by neatvnc version increase
+
+* Tue Feb 20 2024 Neal Gompa <ngompa@fedoraproject.org> - 13.0.0-5
+- Split desktop session into its own subpackage
+
+* Wed Feb 14 2024 Neal Gompa <ngompa@fedoraproject.org> - 13.0.0-4
+- Use correct PipeWire dependency
+
+* Tue Feb 06 2024 František Zatloukal <fzatlouk@redhat.com> - 13.0.0-3
+- Rebuilt for turbojpeg 3.0.2
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 13.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Dec 07 2023 Erico Nunes <ernunes@redhat.com> - 13.0.0-1
+- Update to 13.0.0
+- Remove LDFLAGS which interfered with meson lcms2 function check
+- Update demo clients list following upstream
+
+* Thu Aug 03 2023 Erico Nunes <ernunes@redhat.com> - 12.0.2-1
+- Update to 12.0.2
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jun 19 2023 Erico Nunes <ernunes@redhat.com> - 12.0.1-1
+- Update to 12.0.1
+
+* Wed May 31 2023 Erico Nunes <ernunes@redhat.com> - 12.0.0-1
+- Update to 12.0.0
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Dec 16 2022 Erico Nunes <ernunes@redhat.com> - 11.0.1-1
+- Update to 11.0.1
+- Update download URL
+
+* Fri Oct 07 2022 Erico Nunes <ernunes@redhat.com> - 11.0.0-1
+- Update to 11.0.0
+- Remove libweston-desktop following upstream.
+- Remove weston-info, cms-{colord,static}.so following upstream.
+
+* Mon Aug 15 2022 Simone Caronni <negativo17@gmail.com> - 10.0.1-3
+- Rebuild for updated FreeRDP.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 14 2022 Erico Nunes <ernunes@redhat.com> - 10.0.1-1
+- Update to 10.0.1
+- Update download URL
+
+* Tue Apr 12 2022 Erico Nunes <ernunes@redhat.com> - 10.0.0-1
+- Update to 10.0.0
+- Remove weston-launch following upstream.
+- Update shipped libraries.
+
+* Tue Apr 12 2022 Dave Olsthoorn <daveo@fedoraproject.org> - 9.0.0-1
+- Update to 9.0.0
+- Use pipewire compat package for plugin
+- (ernunes) Rebased from https://src.fedoraproject.org/rpms/weston/pull-request/3
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild