Rebase to 14.0.0~rc3 (13.0.95)

.gitignore

@@ -60,3 +60,4 @@
 /weston-12.0.2.tar.gz
 /weston-13.0.0.tar.gz
 /weston-13.0.3.tar.gz
+/weston-13.0.95.tar.xz

0001-vnc-Allow-neatvnc-in-version-0.8.0.patch

@@ -1,29 +0,0 @@
-From 05e5405651054c580b248c4ab2791ed8d66369e3 Mon Sep 17 00:00:00 2001
-From: Lukasz Czechowski <lukasz.czechowski@thaumatec.com>
-Date: Mon, 3 Jun 2024 13:39:27 +0200
-Subject: [PATCH] vnc: Allow neatvnc in version 0.8.0
-
-Neat VNC 0.8.0 does not introduce any changes that breaks API used
-by VNC backend, so it is safe to extend compatibility.
-
-Signed-off-by: Lukasz Czechowski <lukasz.czechowski@thaumatec.com>
----
- 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 b7b69165..39b15cf9 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.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
-+dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.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
--- 
-2.45.2
-

sources

@@ -1 +1 @@
-SHA512 (weston-13.0.3.tar.gz) = 1af96ad032353d7ed51a6efaac49ea3b13511f8e36c8d70cb853286bf12d2bf18727aad590ef1e4d2b45da28d827812a1ec8b315cd73ad7d9266c4e587945f9e
+SHA512 (weston-13.0.95.tar.xz) = bb8eef864e16028b69b1ce8f31f56fbb5b7817a78d356d73da9618c87ba7523433f7c7cec87400265169ad41d8cc1325e3363fc7c5dc6b4c89ad224344bb5e5a

weston.spec

@@ -1,14 +1,13 @@
-%global apiver 13
+%global apiver 14
 
 Name:           weston
-Version:        %{apiver}.0.3
+Version:        13.0.95
-Release:        3%{?dist}
+Release:        1%{?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:        https://gitlab.freedesktop.org/wayland/%{name}/-/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://gitlab.freedesktop.org/wayland/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
-Patch0:         0001-vnc-Allow-neatvnc-in-version-0.8.0.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -23,14 +22,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
@@ -42,15 +51,15 @@ 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)
+BuildRequires:  (pkgconfig(neatvnc) >= 0.7.0 with pkgconfig(neatvnc) < 0.9.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.24
+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)
@@ -61,13 +70,6 @@ BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xcb-xkb)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(libpipewire-0.3)
-BuildRequires:  poppler-devel
-BuildRequires:  poppler-glib-devel
-BuildRequires:  gstreamer1-devel
-BuildRequires:  gstreamer1-plugins-base-devel
-BuildRequires:  pipewire-devel
-BuildRequires:  libseat-devel
 
 Conflicts:      %{name} < 13.0.0-4
 Obsoletes:      %{name} < 13.0.0-4
@@ -210,6 +212,9 @@ Common headers for weston
 %{_datadir}/libweston-%{apiver}/protocols/
 
 %changelog
+* 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)