.gitignore

@@ -33,24 +33,3 @@
 /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
-/weston-9.0.0.tar.xz
-/weston-10.0.0.tar.xz
-/weston-10.0.1.tar.xz
-/weston-11.0.0.tar.xz

sources

@@ -1 +1 @@
-SHA512 (weston-11.0.0.tar.xz) = 71554dc870e9c6832fdfb8f0e8dbcd7ad01c3827041c2f7fe4b7679df33b242fd00e7f0c8728d1aeecc648f8296a9d3fc502a66c91ec662f03086d9a28aab3ea
+310af6d7f8ba03c3418cec8ad72ea748  weston-1.12.0.tar.xz

weston.spec

@@ -1,40 +1,34 @@
-%global apiver 11
-
 Name:           weston
-Version:        %{apiver}.0.0
+Version:        1.12.0
-Release:        1%{?dist}
+Release:        6%{?dist}
 Summary:        Reference compositor for Wayland
-
 License:        BSD and CC-BY-SA
 URL:            http://wayland.freedesktop.org/
-Source0:        https://gitlab.freedesktop.org/wayland/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
 
-BuildRequires:  gcc
+Source0:        http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-BuildRequires:  gcc-c++
+
 BuildRequires:  glib2-devel
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  pam-devel
-# ninja-build is a dependency from meson
-BuildRequires:  meson
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo) >= 1.10.0
+BuildRequires:  pkgconfig(cairo-egl) >= 1.11.3
+BuildRequires:  pkgconfig(cairo-gl)
 BuildRequires:  pkgconfig(cairo-xcb)
 BuildRequires:  pkgconfig(colord) >= 0.1.27
 BuildRequires:  pkgconfig(dbus-1) >= 1.6
 BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(freerdp2)
 BuildRequires:  pkgconfig(gbm) >= 10.2
 BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libdrm) >= 2.4.30
-BuildRequires:  pkgconfig(libevdev)
 BuildRequires:  pkgconfig(libinput) >= 0.8.0
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libsystemd) >= 209
 BuildRequires:  pkgconfig(libudev) >= 136
 # libunwind available only on selected arches
 %ifarch %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
-BuildRequires:  libunwind-devel
+BuildRequires:	libunwind-devel
 %endif
 BuildRequires:  pkgconfig(libva) >= 0.34.0
 BuildRequires:  pkgconfig(libva-drm) >= 0.34.0
@@ -46,7 +40,7 @@ BuildRequires:  pkgconfig(pixman-1) >= 0.25.2
 BuildRequires:  pkgconfig(wayland-client) >= 1.12.0
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.24
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.7
 BuildRequires:  pkgconfig(wayland-scanner)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(x11)
@@ -58,76 +52,77 @@ BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xcb-xkb)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(libpipewire-0.2)
 BuildRequires:  poppler-devel
 BuildRequires:  poppler-glib-devel
-BuildRequires:  gstreamer1-devel
+
-BuildRequires:  gstreamer1-plugins-base-devel
+%if 0%{?fedora}
-BuildRequires:  pipewire-devel
+BuildRequires:  freerdp1.2-devel
-BuildRequires:  libseat-devel
+%else
+BuildRequires:  pkgconfig(freerdp2) >= 2.0.0
+%endif
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       mesa-dri-drivers
 
 %description
 Weston is the reference wayland compositor that can run on KMS, under X11
 or under another compositor.
 
-%package        libs
+%package libs
-Summary:        Weston compositor libraries
+Summary:    Weston compositor libraries
 
-%description    libs
+%description libs
 This package contains Weston compositor libraries.
 
-%package        demo
+%package devel
-Summary:        Weston demo program files
+Summary:    Common headers for weston
+License:    MIT
+Requires:   %{name}%{?_isa} = %{version}-%{release}
+Requires:   %{name}-libs%{?_isa} = %{version}-%{release}
 
-%description    demo
+%description devel
-This package contains Weston demo program files.
-
-%package        devel
-Summary:        Common headers for weston
-License:        MIT
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description    devel
 Common headers for weston
 
 %prep
 %setup -q
 
 %build
-# ninja injects -Wl,--no-undefined, which intereferes with LTO, so undo
+%configure \
-# the setting.  Thanks to the SuSE folks for the workaround.
+  --disable-silent-rules \
-export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
+  --disable-static \
-%meson
+  --disable-setuid-install \
-%meson_build
+  --enable-xwayland \
+  --enable-rdp-compositor
+
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
 
 %install
-%meson_install
+%make_install
 
-%check
+find %{buildroot} -name \*.la -delete
-# may be standalone tests can be done
+
-#%%meson_test
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
 
 %files
 %license COPYING
-%doc README.md
+%doc README
 %{_bindir}/weston
-%{_bindir}/weston-debug
+%{_bindir}/weston-info
-%{_bindir}/weston-screenshooter
+%attr(4755,root,root) %{_bindir}/weston-launch
 %{_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*
 %{_mandir}/man5/*.5*
@@ -139,207 +134,28 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 
 %files libs
 %license COPYING
-%dir %{_libdir}/libweston-%{apiver}
+%dir %{_libdir}/libweston-1
-%{_libdir}/libweston-%{apiver}/color-lcms.so
+%{_libdir}/libweston-1/drm-backend.so
-%{_libdir}/libweston-%{apiver}/drm-backend.so
+%{_libdir}/libweston-1/fbdev-backend.so
-%{_libdir}/libweston-%{apiver}/gl-renderer.so
+%{_libdir}/libweston-1/gl-renderer.so
-%{_libdir}/libweston-%{apiver}/headless-backend.so
+%{_libdir}/libweston-1/headless-backend.so
-%{_libdir}/libweston-%{apiver}/pipewire-plugin.so
+%{_libdir}/libweston-1/rdp-backend.so
-%{_libdir}/libweston-%{apiver}/remoting-plugin.so
+%{_libdir}/libweston-1/wayland-backend.so
-%{_libdir}/libweston-%{apiver}/rdp-backend.so
+%{_libdir}/libweston-1/x11-backend.so
-%{_libdir}/libweston-%{apiver}/wayland-backend.so
+%{_libdir}/libweston-1/xwayland.so
-%{_libdir}/libweston-%{apiver}/x11-backend.so
+%{_libdir}/libweston-1.so.0*
-%{_libdir}/libweston-%{apiver}/xwayland.so
+%{_libdir}/libweston-desktop-1.so.0*
-%{_libdir}/libweston-%{apiver}.so.0*
-
-%files demo
-%license COPYING
-%{_bindir}/weston-calibrator
-%{_bindir}/weston-clickdot
-%{_bindir}/weston-cliptest
-%{_bindir}/weston-confine
-%{_bindir}/weston-dnd
-%{_bindir}/weston-editor
-%{_bindir}/weston-eventdemo
-%{_bindir}/weston-flower
-%{_bindir}/weston-fullscreen
-%{_bindir}/weston-image
-%{_bindir}/weston-multi-resource
-%{_bindir}/weston-presentation-shm
-%{_bindir}/weston-resizor
-%{_bindir}/weston-scaler
-%{_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
-%{_bindir}/weston-simple-touch
-%{_bindir}/weston-smoke
-%{_bindir}/weston-stacking
-%{_bindir}/weston-subsurfaces
-%{_bindir}/weston-touch-calibrator
-%{_bindir}/weston-transformed
 
 %files devel
-%{_includedir}/libweston-%{apiver}/
+%{_includedir}/libweston-1/
 %{_includedir}/weston/
-%{_libdir}/pkgconfig/libweston-%{apiver}.pc
+%{_libdir}/pkgconfig/libweston-1.pc
-%{_libdir}/pkgconfig/libweston-desktop-%{apiver}.pc
+%{_libdir}/pkgconfig/libweston-desktop-1.pc
 %{_libdir}/pkgconfig/weston.pc
-%{_libdir}/libweston-%{apiver}.so
+%{_libdir}/libweston-1.so
-%{_datadir}/pkgconfig/libweston-%{apiver}-protocols.pc
+%{_libdir}/libweston-desktop-1.so
-%{_datadir}/libweston-%{apiver}/protocols/
 
 %changelog
-* 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
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Apr 15 2021 Simone Caronni <negativo17@gmail.com> - 8.0.0-8
-- Rebuild for updated FreeRDP.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 08 2020 Jeff Law <law@redhat.com> - 8.0.0-5
-- Fix link flags to work with LTO
-
-* Fri May 22 2020 Simone Caronni <negativo17@gmail.com> - 8.0.0-4
-- Rebuild for updated FreeRDP.
-
-* Tue Feb 18 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 8.0.0-3
-- Add requires mesa-dri-drivers
-- Work around at some meson build problem in rawhide
-
-* Fri Feb 07 2020 Simone Caronni <negativo17@gmail.com> - 8.0.0-2
-- Rebuild for updated FreeRDP.
-
-* Tue Jan 28 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 8.0.0-1
-- Update to 8.0.0
-
-* Mon Jan 20 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 7.0.93-2
-- Do the standard meson build with the meson macros 
-
-* Mon Jan 20 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 7.0.93-1
-- Update to RC1 for Weston 8.0 (version 7.0.93)
-- Remove have_simple_dmabuf_drm_client variable
-- The executable weston-simple-dmabuf-drm is gone
-
-* Fri Sep 27 2019 Gerd Pokorra <gp@zimt.uni-siegen.de> - 7.0.0-2
-- Add and remove the group 'weston-launch' with the package in the post section
-
-* Thu Sep 12 2019 Gerd Pokorra <gp@zimt.uni-siegen.de> - 7.0.0-1
-- Update to 7.0.0
-- Use meson as build system
-- Use the apivar macro in the version line
-
-* Wed Sep 04 2019 Takao Fujiwara <tfujiwar@redhat.com> - 6.0.0-3
-- Add weston-demo sub package to include weston-editor
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Mar 29 2019 Kalev Lember <klember@redhat.com> - 6.0.0-1
-- Update to 6.0.0
-
-* Thu Feb 28 2019 Kalev Lember <klember@redhat.com> - 5.0.91-1
-- Update to 5.0.91
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Sep 11 2018 Kalev Lember <klember@redhat.com> - 5.0.0-1
-- Update to 5.0.0
-
-* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 4.0.93-1
-- Update to 4.0.93
-
-* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 4.0.92-2
-- Rebuild with fixed binutils
-
-* Sun Jul 29 2018 Kalev Lember <klember@redhat.com> - 4.0.92-1
-- Update to 4.0.92
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 4.0.0-1
-- Update to 4.0.0
-
-* Tue Apr 03 2018 Kalev Lember <klember@redhat.com> - 3.0.93-1
-- Update to 3.0.93
-- Remove ldconfig scriptlets
-- Build with FreeRDP 1.2
-
-* Tue Mar 20 2018 Kalev Lember <klember@redhat.com> - 3.0.92-1
-- Update to 3.0.92
-
-* Tue Feb 27 2018 Kalev Lember <klember@redhat.com> - 3.0.91-1
-- Update to 3.0.91
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 16 2018 Simone Caronni <negativo17@gmail.com> - 3.0.0-3
-- Drop FreeRDP 1.2 requirement, use FreeRDP 2.0.
-
-* Mon Jan 15 2018 Björn Esser <besser82@fedoraproject.org> - 3.0.0-2
-- Rebuilt for libva.so.2
-
-* Wed Aug 09 2017 Kalev Lember <klember@redhat.com> - 3.0.0-1
-- Update to 3.0.0
-
-* Wed Aug 02 2017 Kalev Lember <klember@redhat.com> - 2.99.93-1
-- Update to 2.99.93
-
-* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 2.99.92-2
-- Rebuild with binutils fix for ppc64le (#1475636)
-
-* Wed Jul 26 2017 Kalev Lember <klember@redhat.com> - 2.99.92-1
-- Update to 2.99.92
-
-* Wed Jul 19 2017 Kalev Lember <klember@redhat.com> - 2.99.91-1
-- Update to 2.99.91
-
-* Thu Jul 13 2017 Adam Jackson <ajax@redhat.com> - 2.0.0-2
-- Stop BuildRequiring cairo-gl. We install none of the additional demo clients
-  it builds, and it's going away from the cairo package soon.
-
-* Wed Jun 21 2017 Kalev Lember <klember@redhat.com> - 2.0.0-1
-- Update to 2.0.0
-
 * Tue Mar 21 2017 Simone Caronni <negativo17@gmail.com> - 1.12.0-6
 - Build requirement compat-freerdp12 has been renamed to freerdp1.2.