diff --git a/.gitignore b/.gitignore index 0f70ef2..8d3458a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,52 +1 @@ -/weston-20120424.tar.bz2 -/weston-0.95.0.tar.xz -/weston-0.99.0.tar.xz -/weston-1.0.0.tar.xz -/weston-1.0.5.tar.xz -/weston-1.0.6.tar.xz -/weston-1.1.0.tar.xz -/weston-20130515.tar.bz2 -/weston-1.2.0.tar.xz -/weston-1.3.1.tar.xz -/weston-1.3.91.tar.xz -/weston-1.3.93.tar.xz -/weston-1.4.0.tar.xz -/weston-1.4.93.tar.xz -/weston-1.5.0.tar.xz -/weston-1.5.91.tar.xz -/weston-1.6.0.tar.xz -/weston-1.7.0.tar.xz -/weston-1.7.92.tar.xz -/weston-1.8.0.tar.xz -/weston-1.8.91.tar.xz -/weston-1.8.92.tar.xz -/weston-1.8.93.tar.xz -/weston-1.9.0.tar.xz -/weston-1.9.92.tar.xz -/weston-1.10.0.tar.xz -/weston-1.10.91.tar.xz -/weston-1.10.92.tar.xz -/weston-1.10.93.tar.xz -/weston-1.11.0.tar.xz -/weston-1.11.91.tar.xz -/weston-1.11.92.tar.xz -/weston-1.11.93.tar.xz -/weston-1.11.94.tar.xz -/weston-1.12.0.tar.xz -/weston-2.0.0.tar.xz -/weston-2.99.91.tar.xz -/weston-2.99.92.tar.xz -/weston-2.99.93.tar.xz -/weston-3.0.0.tar.xz -/weston-3.0.91.tar.xz -/weston-3.0.92.tar.xz -/weston-3.0.93.tar.xz -/weston-4.0.0.tar.xz -/weston-4.0.92.tar.xz -/weston-4.0.93.tar.xz -/weston-5.0.0.tar.xz -/weston-5.0.91.tar.xz -/weston-6.0.0.tar.xz -/weston-7.0.0.tar.xz -/weston-7.0.93.tar.xz -/weston-8.0.0.tar.xz +SOURCES/weston-14.0.1.tar.xz diff --git a/.weston.metadata b/.weston.metadata new file mode 100644 index 0000000..ff867e4 --- /dev/null +++ b/.weston.metadata @@ -0,0 +1 @@ +e9c652e5e863eda5e9516b12fcda38b1636836e7 SOURCES/weston-14.0.1.tar.xz diff --git a/SOURCES/1649.patch b/SOURCES/1649.patch new file mode 100644 index 0000000..719f7fc --- /dev/null +++ b/SOURCES/1649.patch @@ -0,0 +1,28 @@ +From b4386289d614f26e89e1c6eb17e048826e925ed1 Mon Sep 17 00:00:00 2001 +From: Philipp Zabel +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 +--- + 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 + diff --git a/weston.spec b/SPECS/weston.spec similarity index 75% rename from weston.spec rename to SPECS/weston.spec index 58928e0..9036f45 100644 --- a/weston.spec +++ b/SPECS/weston.spec @@ -1,19 +1,20 @@ -%global apiver 8 -%global meson_prob 1 +%global apiver 14 Name: weston -Version: %{apiver}.0.0 -Release: 10%{?dist} +Version: 14.0.1 +Release: 2%{?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: g++ -%endif +BuildRequires: gcc-c++ 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 +* Tue Dec 24 2024 Arkady L. Shane - 14.0.1-2 +- Rebuilt for MSVSphere 10 + +* Thu Nov 21 2024 Neal Gompa - 14.0.1-2 +- Backport patch to allow neatvnc 0.9.0 as a dependency + +* Mon Nov 11 2024 Neal Gompa - 14.0.1-1 +- Update to 14.0.1 + +* Wed Sep 04 2024 Miroslav Suchý - 14.0.0-2 +- convert license to SPDX + +* Wed Sep 04 2024 Neal Gompa - 14.0.0-1 +- Update to 14.0.0 final + +* Mon Sep 02 2024 Neal Gompa - 13.0.95-1 +- Rebase to 14.0.0~rc3 (13.0.95) + +* Tue Aug 27 2024 Neal Gompa - 13.0.3-3 +- Mark weston remote access pam config noreplace (rhbz#2307373) + +* Sat Jul 20 2024 Fedora Release Engineering - 13.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 17 2024 Nils Kattenbeck - 13.0.3-1 +- Update to 13.0.3 +- Fix build error caused by neatvnc version increase + +* Tue Feb 20 2024 Neal Gompa - 13.0.0-5 +- Split desktop session into its own subpackage + +* Wed Feb 14 2024 Neal Gompa - 13.0.0-4 +- Use correct PipeWire dependency + +* Tue Feb 06 2024 František Zatloukal - 13.0.0-3 +- Rebuilt for turbojpeg 3.0.2 + +* Sat Jan 27 2024 Fedora Release Engineering - 13.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Dec 07 2023 Erico Nunes - 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 - 12.0.2-1 +- Update to 12.0.2 + +* Sat Jul 22 2023 Fedora Release Engineering - 12.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 19 2023 Erico Nunes - 12.0.1-1 +- Update to 12.0.1 + +* Wed May 31 2023 Erico Nunes - 12.0.0-1 +- Update to 12.0.0 + +* Sat Jan 21 2023 Fedora Release Engineering - 11.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Dec 16 2022 Erico Nunes - 11.0.1-1 +- Update to 11.0.1 +- Update download URL + +* Fri Oct 07 2022 Erico Nunes - 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 - 10.0.1-3 +- Rebuild for updated FreeRDP. + +* Sat Jul 23 2022 Fedora Release Engineering - 10.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 14 2022 Erico Nunes - 10.0.1-1 +- Update to 10.0.1 +- Update download URL + +* Tue Apr 12 2022 Erico Nunes - 10.0.0-1 +- Update to 10.0.0 +- Remove weston-launch following upstream. +- Update shipped libraries. + +* Tue Apr 12 2022 Dave Olsthoorn - 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 - 8.0.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources deleted file mode 100644 index acfa92d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (weston-8.0.0.tar.xz) = 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c