From 88bc641857e7f2303012652141e388ff15ff74ba Mon Sep 17 00:00:00 2001
From: Dave Olsthoorn <dave@bewaar.me>
Date: Wed, 14 Jul 2021 19:31:57 +0200
Subject: [PATCH] Update to 9.0.0

Use pipewire compat package for plugin

Signed-off-by: Dave Olsthoorn <dave@bewaar.me>
Signed-off-by: Erico Nunes <ernunes@redhat.com>
---
 .gitignore  |  1 +
 sources     |  2 +-
 weston.spec | 22 ++++++++++------------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f70ef2..aae3943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
 /weston-7.0.0.tar.xz
 /weston-7.0.93.tar.xz
 /weston-8.0.0.tar.xz
+/weston-9.0.0.tar.xz
diff --git a/sources b/sources
index acfa92d..a622b24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (weston-8.0.0.tar.xz) = 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
+SHA512 (weston-9.0.0.tar.xz) = ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
diff --git a/weston.spec b/weston.spec
index 58928e0..7c6fb38 100644
--- a/weston.spec
+++ b/weston.spec
@@ -1,9 +1,8 @@
-%global apiver 8
-%global meson_prob 1
+%global apiver 9
 
 Name:           weston
 Version:        %{apiver}.0.0
-Release:        10%{?dist}
+Release:        1%{?dist}
 Summary:        Reference compositor for Wayland
 
 License:        BSD and CC-BY-SA
@@ -11,9 +10,7 @@ URL:            http://wayland.freedesktop.org/
 Source0:        http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
 
 BuildRequires:  gcc
-%if %meson_prob
-BuildRequires:  g++
-%endif
+BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  pam-devel
@@ -61,6 +58,7 @@ 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
@@ -102,11 +100,7 @@ Common headers for weston
 # 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
@@ -141,6 +135,7 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 %{_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*
@@ -158,9 +153,7 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 %{_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-plugin.so
-%endif
 %{_libdir}/libweston-%{apiver}/remoting-plugin.so
 %{_libdir}/libweston-%{apiver}/rdp-backend.so
 %{_libdir}/libweston-%{apiver}/wayland-backend.so
@@ -210,6 +203,11 @@ export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
 %{_datadir}/libweston-%{apiver}/protocols/
 
 %changelog
+* 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