From 9d8986cb004b426bc8b9ffaf1f1518eb4327ad20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:14:51 +0000 Subject: [PATCH 01/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- waffle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index 7590197..bc15e25 100644 --- a/waffle.spec +++ b/waffle.spec @@ -6,7 +6,7 @@ Name: waffle Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Platform independent GL API layer License: MIT @@ -109,6 +109,9 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From db644d35113091ea5b3a2f58479ba3a8e46c4cde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:10:51 +0000 Subject: [PATCH 02/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- waffle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index bc15e25..f47806a 100644 --- a/waffle.spec +++ b/waffle.spec @@ -6,7 +6,7 @@ Name: waffle Version: 1.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Platform independent GL API layer License: MIT @@ -109,6 +109,9 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fc243355723f1f0c4e7d03dd29fcbdafceaaaf22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:34:28 +0000 Subject: [PATCH 03/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- waffle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index f47806a..0ede08b 100644 --- a/waffle.spec +++ b/waffle.spec @@ -6,7 +6,7 @@ Name: waffle Version: 1.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Platform independent GL API layer License: MIT @@ -109,6 +109,9 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b5fd947d05e7247705d2833bbc48ef631f2a8cab Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 2 Feb 2023 11:54:46 +1000 Subject: [PATCH 04/21] update to waffle 1.7.0 + wayland fixes --- .gitignore | 1 + sources | 2 +- waffle.spec | 134 ++++------------------------------------------------ 3 files changed, 10 insertions(+), 127 deletions(-) diff --git a/.gitignore b/.gitignore index 1eb3c4a..bdf216f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /waffle-1.5.0.tar.xz /waffle-1.5.2.tar.xz /waffle-1.6.1.tar.xz +/waffle-1.7.0.tar.bz2 diff --git a/sources b/sources index c5ee4cf..b73c22a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waffle-1.6.1.tar.xz) = 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f +SHA512 (waffle-1.7.0.tar.bz2) = 8c525e27170cfed9bd176e10b609eba1c2d154bc2e2da52f32c7067dda275976a89833233bcd29346ca66656d3fc3a43e65bc573e3a8e60ed92816ce424b00da diff --git a/waffle.spec b/waffle.spec index 0ede08b..cea6ede 100644 --- a/waffle.spec +++ b/waffle.spec @@ -1,17 +1,14 @@ -%if 0%{?fedora} >= 20 && 0%{?rhel} > 7 -%bcond_with wayland -%else -%bcond_without wayland -%endif - Name: waffle -Version: 1.6.1 -Release: 7%{?dist} +Version: 1.7.0 +Release: %autorelease Summary: Platform independent GL API layer License: MIT URL: http://www.waffle-gl.org/releases.html -Source0: https://gitlab.freedesktop.org/mesa/waffle/-/raw/website/files/release/waffle-%{version}/waffle-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.bz2 + +Patch0: 0001-wayland-fix-build-against-version-1.20.patch +Patch1: fix-bash.patch BuildRequires: cmake libxslt docbook-style-xsl libxcb-devel BuildRequires: gcc-c++ @@ -23,9 +20,7 @@ BuildRequires: mesa-libGLES-devel BuildRequires: systemd-devel %endif BuildRequires: mesa-libgbm-devel -%if %{with wayland} BuildRequires: wayland-devel -%endif %description Waffle is a cross-platform C library that allows one to defer @@ -58,7 +53,7 @@ Example programs using %{name}. %prep -%setup -q +%autosetup -n waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300 -p1 %build @@ -66,9 +61,7 @@ Example programs using %{name}. -DCMAKE_INSTALL_DOCDIR:PATH=%{_defaultdocdir}/%{name}-%{version} \ -DCMAKE_BUILD_STRIP=FALSE \ -Dwaffle_has_glx=1 -Dwaffle_has_gbm=1 \ -%if %{with wayland} -Dwaffle_has_wayland=1 \ -%endif -Dwaffle_build_manpages=1 -Dwaffle_build_htmldocs=1 %cmake_build @@ -109,115 +102,4 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %changelog -* Sat Jan 21 2023 Fedora Release Engineering - 1.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Apr 01 2020 Kalev Lember - 1.6.1-1 -- Update to 1.6.1 -- Use license macro for LICENSE.txt - -* Fri Jan 31 2020 Fedora Release Engineering - 1.5.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.5.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.5.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.5.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Feb 20 2018 Matěj Cepl - 1.5.2-8 -- Add BuildRequires gcc per new PG. - -* Fri Feb 09 2018 Fedora Release Engineering - 1.5.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.5.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.5.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Feb 29 2016 Peter Robinson 1.5.2-3 -- Fix Wayland conditionals so it's enabled in Fedora - -* Fri Feb 05 2016 Fedora Release Engineering - 1.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Sep 09 2015 Dave Airlie 1.5.2-1 -- 1.5.2 release - -* Fri Jun 19 2015 Fedora Release Engineering - 1.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Jan 5 2015 Matěj Cepl - 1.5.0-3 -- Make package building on RHEL-6. - -* Mon Jan 05 2015 Matej Cepl - 1.5.0-2 -- Package examples again. - -* Tue Dec 16 2014 Dave Airlie 1.5.0-1 -- 1.5.0 release - -* Thu Dec 04 2014 Matej Cepl - 1.4.2-2 -- Merge with master. -- Patch out commit 92116dae to make building possible on cmake < 2.8.12. - -* Thu Dec 04 2014 Matej Cepl - 1.4.2-1 -- Upstream release (#1161826) - -* Tue Sep 23 2014 Matěj Cepl - 1.4.0-1 -- Upgreade to the latest upstream release (RHBZ# 1145481) - -* Tue Sep 23 2014 Matej Cepl - 1.3.0-5 -- Apply patch to make GBM work on f21 as well. - -* Tue Sep 23 2014 Matěj Cepl - 1.3.0-4 -- Enable GBM and Wayland options as well. - -* Mon Aug 18 2014 Fedora Release Engineering - 1.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Oct 01 2013 Matěj Cepl - 1.3.0-1 -- Upstream release. - -* Fri Sep 27 2013 Matěj Cepl - 1.2.3-4 -- And even more fixes (switch on man and HTML doc generation). - -* Thu Sep 26 2013 Matěj Cepl - 1.2.3-3 -- Fix even more errors indicated by the package review. - -* Mon Aug 26 2013 Matěj Cepl - 1.2.3-2 -- Fix errors indicated by the package review. - -* Sat Aug 24 2013 Matěj Cepl - 1.2.3-1 -- New upstream release. - -* Thu Nov 15 2012 Matěj Cepl - 1.2.0-1 -- Upstream upgrade. - -* Fri Oct 19 2012 Matěj Cepl - 1.1.1-1 -- First experimental build. +%autochangelog From 97d92c6f3aab31f519b9ea95ffe0a6195a3df028 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 2 Feb 2023 11:58:57 +1000 Subject: [PATCH 05/21] add patches --- ...yland-fix-build-against-version-1.20.patch | 56 +++++++++++++++++++ fix-bash.patch | 12 ++++ 2 files changed, 68 insertions(+) create mode 100644 0001-wayland-fix-build-against-version-1.20.patch create mode 100644 fix-bash.patch diff --git a/0001-wayland-fix-build-against-version-1.20.patch b/0001-wayland-fix-build-against-version-1.20.patch new file mode 100644 index 0000000..01eba0d --- /dev/null +++ b/0001-wayland-fix-build-against-version-1.20.patch @@ -0,0 +1,56 @@ +From 2c33597245bb74f19104f0a858cd40e80b26991d Mon Sep 17 00:00:00 2001 +From: Philipp Zabel +Date: Fri, 17 Dec 2021 13:46:40 +0100 +Subject: [PATCH] wayland: fix build against version 1.20 + +Wayland 1.20 introduces two new symbols wl_proxy_marshal_flags and +wl_proxy_marshal_array_flags, which need to be wrapped as well. + +Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/76 +Signed-off-by: Philipp Zabel +--- + src/waffle/wayland/wayland_sym.h | 18 ++++++++++++++++++ + src/waffle/wayland/wayland_wrapper.h | 2 ++ + 2 files changed, 20 insertions(+) + +diff --git a/src/waffle/wayland/wayland_sym.h b/src/waffle/wayland/wayland_sym.h +index 3d48625..4c6ac8d 100644 +--- a/src/waffle/wayland/wayland_sym.h ++++ b/src/waffle/wayland/wayland_sym.h +@@ -26,3 +26,21 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, + WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, + (struct wl_proxy *proxy, uint32_t opcode, + const struct wl_interface *interface, uint32_t version, ...)) ++ ++WAFFLE_WAYLAND_SYM(struct wl_proxy *, ++ wl_proxy_marshal_flags, ++ (struct wl_proxy * p, ++ uint32_t opcode, ++ const struct wl_interface *interface, ++ uint32_t version, ++ uint32_t flags, ++ ...)) ++ ++WAFFLE_WAYLAND_SYM(struct wl_proxy *, ++ wl_proxy_marshal_array_flags, ++ (struct wl_proxy * p, ++ uint32_t opcode, ++ const struct wl_interface *interface, ++ uint32_t version, ++ uint32_t flags, ++ union wl_argument *args)) +diff --git a/src/waffle/wayland/wayland_wrapper.h b/src/waffle/wayland/wayland_wrapper.h +index 4af2f64..6addf4f 100644 +--- a/src/waffle/wayland/wayland_wrapper.h ++++ b/src/waffle/wayland/wayland_wrapper.h +@@ -65,5 +65,7 @@ struct wl_display; + #define wl_proxy_marshal (*wfl_wl_proxy_marshal) + #define wl_proxy_marshal_constructor (*wfl_wl_proxy_marshal_constructor) + #define wl_proxy_marshal_constructor_versioned (*wfl_wl_proxy_marshal_constructor_versioned) ++#define wl_proxy_marshal_flags (*wfl_wl_proxy_marshal_flags) ++#define wl_proxy_marshal_array_flags (*wfl_wl_proxy_marshal_array_flags) + + #include +-- +2.39.1 + diff --git a/fix-bash.patch b/fix-bash.patch new file mode 100644 index 0000000..7c47b6b --- /dev/null +++ b/fix-bash.patch @@ -0,0 +1,12 @@ +diff -up waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300/CMakeLists.txt.dma waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300/CMakeLists.txt +--- waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300/CMakeLists.txt.dma 2023-02-02 11:51:13.882733065 +1000 ++++ waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300/CMakeLists.txt 2023-02-02 11:51:17.724792923 +1000 +@@ -195,7 +195,7 @@ endif() + + install( + FILES "shell-completion/bash/wflinfo" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}" ++ DESTINATION "${BASH_COMPLETION_COMPLETIONSDIR}" + COMPONENT shell-completion + ) + From 14f60bca06eb99d1c750ec2eaec7fbe4146769e8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 2 Feb 2023 12:17:36 +1000 Subject: [PATCH 06/21] add missing BR --- waffle.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/waffle.spec b/waffle.spec index cea6ede..98ed506 100644 --- a/waffle.spec +++ b/waffle.spec @@ -21,6 +21,7 @@ BuildRequires: systemd-devel %endif BuildRequires: mesa-libgbm-devel BuildRequires: wayland-devel +BuildRequires: wayland-protocols %description Waffle is a cross-platform C library that allows one to defer From d29080762e16263616a93db3f78a978911c098f8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 2 Feb 2023 12:28:09 +1000 Subject: [PATCH 07/21] fix BR again --- waffle.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index 98ed506..4ef2c99 100644 --- a/waffle.spec +++ b/waffle.spec @@ -21,7 +21,7 @@ BuildRequires: systemd-devel %endif BuildRequires: mesa-libgbm-devel BuildRequires: wayland-devel -BuildRequires: wayland-protocols +BuildRequires: wayland-protocols-devel %description Waffle is a cross-platform C library that allows one to defer From 7b71c9807ebde1d5eb675377de8a9f1cb6cb5116 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:56:49 +0000 Subject: [PATCH 08/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f4845fcc79be1a723ca3115a87cbaea0341b11ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:20:16 +0000 Subject: [PATCH 09/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3b1c3a182decacfc6ba88a821a2dedf2c2b6b44a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:05:43 +0000 Subject: [PATCH 10/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c2abb62c97815942f95f7fcfa84e52e5f7c14f25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:43:17 +0000 Subject: [PATCH 11/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4a35dda2e25280b18b3d664e4c338c7bce6284b5 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 22 Jan 2025 13:07:09 -0500 Subject: [PATCH 12/21] Update to 1.8.0 --- .gitignore | 1 + sources | 2 +- waffle.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bdf216f..c88cc4a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /waffle-1.5.2.tar.xz /waffle-1.6.1.tar.xz /waffle-1.7.0.tar.bz2 +/waffle-1.8.0.tar.bz2 diff --git a/sources b/sources index b73c22a..fc34d62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waffle-1.7.0.tar.bz2) = 8c525e27170cfed9bd176e10b609eba1c2d154bc2e2da52f32c7067dda275976a89833233bcd29346ca66656d3fc3a43e65bc573e3a8e60ed92816ce424b00da +SHA512 (waffle-1.8.0.tar.bz2) = 1a78f0e9864bc99fdd0452f65632b5d0c4ed42b99ec6c8b6551c66c018b4effe53ee8bad00cfdd538b5e2250ea02097944e7581592ff6472ff6de8abadd80160 diff --git a/waffle.spec b/waffle.spec index 4ef2c99..236396c 100644 --- a/waffle.spec +++ b/waffle.spec @@ -1,5 +1,5 @@ Name: waffle -Version: 1.7.0 +Version: 1.8.0 Release: %autorelease Summary: Platform independent GL API layer From 6bd8199571714c7b16c0d922407288152f3151cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:16:28 +0000 Subject: [PATCH 13/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d1459d9dc30ad31bf423d07374820390f13e17a2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 1 Oct 2025 12:07:55 -0400 Subject: [PATCH 14/21] Update to 1.8.1 --- .gitignore | 1 + sources | 2 +- waffle.spec | 30 ++++++++++-------------------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index c88cc4a..d14e3b8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /waffle-1.6.1.tar.xz /waffle-1.7.0.tar.bz2 /waffle-1.8.0.tar.bz2 +/waffle-1.8.1.tar.bz2 diff --git a/sources b/sources index fc34d62..e6167ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waffle-1.8.0.tar.bz2) = 1a78f0e9864bc99fdd0452f65632b5d0c4ed42b99ec6c8b6551c66c018b4effe53ee8bad00cfdd538b5e2250ea02097944e7581592ff6472ff6de8abadd80160 +SHA512 (waffle-1.8.1.tar.bz2) = 9187977c65d499a68833288e2bbb00feae8a56763f654d9a038839c6ff15e94eba416786057a6ca514d0034a8b42fa2abd72e9d9276f4556d35d36cde403f42c diff --git a/waffle.spec b/waffle.spec index 236396c..071deb5 100644 --- a/waffle.spec +++ b/waffle.spec @@ -1,5 +1,6 @@ +%global gitver 49abc7cb5f73cc6852136c91da49ea3a338960e4 Name: waffle -Version: 1.8.0 +Version: 1.8.1 Release: %autorelease Summary: Platform independent GL API layer @@ -7,10 +8,8 @@ License: MIT URL: http://www.waffle-gl.org/releases.html Source0: https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.bz2 -Patch0: 0001-wayland-fix-build-against-version-1.20.patch -Patch1: fix-bash.patch - -BuildRequires: cmake libxslt docbook-style-xsl libxcb-devel +BuildRequires: meson ninja-build +BuildRequires: libxslt docbook-style-xsl libxcb-devel BuildRequires: gcc-c++ BuildRequires: libX11-devel mesa-libGL-devel mesa-libGLU-devel BuildRequires: chrpath @@ -54,24 +53,15 @@ Example programs using %{name}. %prep -%autosetup -n waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300 -p1 +%autosetup -n waffle-v%{version}-%{gitver} -p1 %build -%cmake \ - -DCMAKE_INSTALL_DOCDIR:PATH=%{_defaultdocdir}/%{name}-%{version} \ - -DCMAKE_BUILD_STRIP=FALSE \ - -Dwaffle_has_glx=1 -Dwaffle_has_gbm=1 \ - -Dwaffle_has_wayland=1 \ - -Dwaffle_build_manpages=1 -Dwaffle_build_htmldocs=1 - -%cmake_build - -# We don’t want to install binary files in %%docdir -rm -rf examples/CMakeFiles +%meson +%meson_build %install -%cmake_install +%meson_install # Fedora now uses unversioned doc dirs, make install shouldn’t try to # install there anyway. rm -rf %{buildroot}%{_docdir}/%{name}* @@ -85,6 +75,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %{_libdir}/lib%{name}*.so.* %{_bindir}/wflinfo %{_datadir}/bash-completion/completions/wflinfo +%{_datadir}/zsh/site-functions/_wflinfo %files doc %doc doc/html/ @@ -94,8 +85,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %{_includedir}/waffle* %{_libdir}/lib%{name}*.so %{_libdir}/pkgconfig/%{name}* -%{_libdir}/cmake/Waffle/* -%{_mandir}/man*/* +#{_mandir}/man*/* %files examples From c1324c7b2a68815aaa8c002e524bb5f7fb94d34f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:06:13 +0000 Subject: [PATCH 15/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 500750be5b5ae3c6df2df077056aac43d0a9cdf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:40:29 +0000 Subject: [PATCH 16/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From c97757fe89d5b448afaae14050dd9a2d43195316 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 14:54:41 -0300 Subject: [PATCH 17/21] update to 1.8.3 spec cleanup and modernization fixes rhbz#2505136 waffle: FTBFS in Fedora rawhide/f45 Signed-off-by: Filipe Rosset --- .gitignore | 1 + sources | 2 +- waffle.spec | 62 +++++++++++++++++++++++++++++++---------------------- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index d14e3b8..829e62c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /waffle-1.7.0.tar.bz2 /waffle-1.8.0.tar.bz2 /waffle-1.8.1.tar.bz2 +/waffle-1.8.3.tar.xz diff --git a/sources b/sources index e6167ac..bf7ea39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waffle-1.8.1.tar.bz2) = 9187977c65d499a68833288e2bbb00feae8a56763f654d9a038839c6ff15e94eba416786057a6ca514d0034a8b42fa2abd72e9d9276f4556d35d36cde403f42c +SHA512 (waffle-1.8.3.tar.xz) = 6c320e3bab223075da8c4b1a32a24ad857143481f58ab1a39c4e6ace869c5e802cd768cd6186b28abe47c273994188be2b943e5c9fa156941dc5695316859d05 diff --git a/waffle.spec b/waffle.spec index 071deb5..dea408d 100644 --- a/waffle.spec +++ b/waffle.spec @@ -1,26 +1,27 @@ -%global gitver 49abc7cb5f73cc6852136c91da49ea3a338960e4 Name: waffle -Version: 1.8.1 +Version: 1.8.3 Release: %autorelease Summary: Platform independent GL API layer License: MIT URL: http://www.waffle-gl.org/releases.html -Source0: https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.bz2 +Source0: https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.xz -BuildRequires: meson ninja-build -BuildRequires: libxslt docbook-style-xsl libxcb-devel -BuildRequires: gcc-c++ -BuildRequires: libX11-devel mesa-libGL-devel mesa-libGLU-devel -BuildRequires: chrpath -BuildRequires: mesa-libEGL-devel -%if 0%{?rhel} > 6 || 0%{?fedora} > 0 -BuildRequires: mesa-libGLES-devel -BuildRequires: systemd-devel -%endif -BuildRequires: mesa-libgbm-devel -BuildRequires: wayland-devel -BuildRequires: wayland-protocols-devel +BuildRequires: cmake +BuildRequires: docbook-style-xsl +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libX11-devel +BuildRequires: libxcb-devel +BuildRequires: libxslt +BuildRequires: mesa-libEGL-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLES-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: meson +BuildRequires: ninja-build +BuildRequires: wayland-devel +BuildRequires: wayland-protocols-devel %description Waffle is a cross-platform C library that allows one to defer @@ -38,54 +39,63 @@ Contains the header files, and libraries required for development of %package doc Summary: Documentation for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch %description doc Contains HTML version of the developer documentation for development of -%{name}-related software (manpages are in the -devel package). +%{name}-related software (man pages are in the -devel package). %package examples Summary: Example programs using %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch %description examples Example programs using %{name}. %prep -%autosetup -n waffle-v%{version}-%{gitver} -p1 +%autosetup -p1 +ln -sf waffle-1.5.0.txt doc/release-notes/waffle-1.5.0-rc2.txt %build -%meson +%meson -Dbuild-manpages=true %meson_build + %install %meson_install -# Fedora now uses unversioned doc dirs, make install shouldn’t try to +# Fedora now uses unversioned doc dirs, make install shouldn't try to # install there anyway. rm -rf %{buildroot}%{_docdir}/%{name}* -%ldconfig_scriptlets + +%check +%meson_test %files %license LICENSE.txt %doc README.md -%{_libdir}/lib%{name}*.so.* %{_bindir}/wflinfo +%{_libdir}/lib%{name}-1.so.0* %{_datadir}/bash-completion/completions/wflinfo %{_datadir}/zsh/site-functions/_wflinfo +%{_mandir}/man1/wflinfo.1* %files doc %doc doc/html/ %files devel %doc doc/release-notes/ -%{_includedir}/waffle* -%{_libdir}/lib%{name}*.so -%{_libdir}/pkgconfig/%{name}* -#{_mandir}/man*/* +%{_includedir}/waffle-1/ +%{_libdir}/lib%{name}-1.so +%{_libdir}/pkgconfig/%{name}-1.pc +%{_libdir}/cmake/Waffle/ +%{_mandir}/man3/waffle*.3* +%{_mandir}/man7/waffle*.7* %files examples From 7344042b77c740c66969b497551ff09c9fbf5b0c Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 14:55:56 -0300 Subject: [PATCH 18/21] simplify .gitignore file Signed-off-by: Filipe Rosset --- .gitignore | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 829e62c..56991fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ -/waffle-1.2.3.tar.xz -/waffle-1.3.0.tar.xz -/waffle-1.4.0.tar.xz -/waffle-1.4.2.tar.xz -/waffle-1.5.0.tar.xz -/waffle-1.5.2.tar.xz -/waffle-1.6.1.tar.xz -/waffle-1.7.0.tar.bz2 -/waffle-1.8.0.tar.bz2 -/waffle-1.8.1.tar.bz2 -/waffle-1.8.3.tar.xz +/waffle-*.tar.xz From 2426d0cc4488472d76abeee647d4d32a3e8353f8 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 14:56:20 -0300 Subject: [PATCH 19/21] opt-in to packit for rawhide Signed-off-by: Filipe Rosset --- .packit.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..8c4a334 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: waffle.spec + +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_committers: ['packit','all_admins'] + dist_git_branches: + - fedora-rawhide + From cd349a9baf784dfa6191fb7a1f24052a3b6b11d7 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 15:27:54 -0300 Subject: [PATCH 20/21] remove noarch tag from examples sub-package --- waffle.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index dea408d..562fd31 100644 --- a/waffle.spec +++ b/waffle.spec @@ -49,7 +49,6 @@ Contains HTML version of the developer documentation for development of %package examples Summary: Example programs using %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -BuildArch: noarch %description examples Example programs using %{name}. From c4a53b3bed1b290ccb6507b698d2e8ce24ca0de5 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 15:42:53 -0300 Subject: [PATCH 21/21] remove noarch tag from doc sub-package --- waffle.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index 562fd31..0201ab9 100644 --- a/waffle.spec +++ b/waffle.spec @@ -39,7 +39,6 @@ Contains the header files, and libraries required for development of %package doc Summary: Documentation for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -BuildArch: noarch %description doc Contains HTML version of the developer documentation for development of