From 96b9822e8c5888672f79b40d95516ef49c1253da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Jul 2024 10:16:00 +0900 Subject: [PATCH 01/11] Enable s390x test on F41 again --- rubygem-opengl.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index f0c857c..d50313f 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -143,7 +143,7 @@ for trial in 1 2 ; do STATUS_ON_FAILURE=false %endif %ifarch s390x -%if 0%{?fedora} >= 40 +%if 0%{?fedora} == 40 # Currently mesa on F41, s390x is fairly broken STATUS_ON_FAILURE=true %endif @@ -169,6 +169,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jul 12 2024 Mamoru TASAKA - 0.10.0-33 +- Enable s390x test on F41 again + * Mon Jun 17 2024 Mamoru TASAKA - 0.10.0-32 - Use regex match for test result From f038b625be485b28f50903f6fe94f22619653daa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:41:43 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index d50313f..82d1495 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 33%{?dist} +Release: 34%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -169,6 +169,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 0.10.0-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jul 12 2024 Mamoru TASAKA - 0.10.0-33 - Enable s390x test on F41 again From 6f7f284c6c931e4fd92c0a1e1a2e9f650d6cb041 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 Sep 2024 20:44:26 +0900 Subject: [PATCH 03/11] Adjust to mesa 24.2.2 change that swrast with dril does not expose accum buffers anymore Adjust test result message with recent mesa Adjust to mesa 24.2.2 change that swrast with dril does not expose accum buffers anymore Adjust test result message with recent mesa --- ...Remove-requirement-for-accum-buffers.patch | 27 +++++++++++++++++++ rubygem-opengl.spec | 15 +++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 0001-Remove-requirement-for-accum-buffers.patch diff --git a/0001-Remove-requirement-for-accum-buffers.patch b/0001-Remove-requirement-for-accum-buffers.patch new file mode 100644 index 0000000..fa25745 --- /dev/null +++ b/0001-Remove-requirement-for-accum-buffers.patch @@ -0,0 +1,27 @@ +From 914543a4f30de53cd33c2961e8791bf44d29aedf Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Wed, 4 Sep 2024 15:04:27 +0200 +Subject: [PATCH] Remove requirement for accum buffers + +Mesa's swrast with dril does not expose these anymore, so the tests +fail trying to find a matching config. +--- + lib/opengl/test_case.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/opengl/test_case.rb b/lib/opengl/test_case.rb +index e14dac3..4acf91e 100644 +--- a/lib/opengl/test_case.rb ++++ b/lib/opengl/test_case.rb +@@ -39,7 +39,7 @@ class OpenGL::TestCase < MiniTest::Unit::TestCase + + glutInit + glutInitDisplayMode(GLUT_DEPTH | GLUT_DOUBLE | GLUT_RGBA | GLUT_STENCIL | +- GLUT_ACCUM | GLUT_ALPHA) ++ GLUT_ALPHA) + + def setup + glutInitWindowPosition 1, 1 +-- +2.46.0 + diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 82d1495..094c358 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 34%{?dist} +Release: 35%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -31,6 +31,9 @@ Source1: create-clean-opengl-gem.sh Source2: GPLv1.rubygem_opengl # Fix for -Werror=incompatible-pointer-types Patch0: opengl-0.10.0-pointer-types.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2303995#c20 +# Mesa 24.2.2 swrast with dril does not expose accum buffers anymore +Patch1: 0001-Remove-requirement-for-accum-buffers.patch # MRI (CRuby) only BuildRequires: gcc @@ -80,6 +83,9 @@ sed -i.minitest \ lib/opengl/test_case.rb %patch -P0 -p1 -b .types +%if 0%{?fedora} >= 41 +%patch -P1 -p1 -b .accum +%endif %build gem build %{gem_name}.gemspec @@ -126,7 +132,7 @@ exit 0 pushd .%{gem_instdir} -EXPECTED_TEST_MSG="184 runs, 174[45] assertions, 6 failures, [12] errors, 14 skips" +EXPECTED_TEST_MSG="184 runs, 17\(38\|44\|45\) assertions, 6 failures, [12] errors, 14 skips" export RUBYLIB=%{buildroot}%{gem_extdir_mri}/:$(pwd)/lib:$(pwd) # try twice @@ -169,6 +175,11 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Sep 06 2024 Mamoru TASAKA - 0.10.0-35 +- Adjust to mesa 24.2.2 change that swrast with dril does not expose + accum buffers anymore +- Adjust test result message with recent mesa + * Fri Jul 19 2024 Fedora Release Engineering - 0.10.0-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6a592153006308489867ea5808081df3fc58245a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 09:57:35 +0900 Subject: [PATCH 04/11] bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 094c358..7e0b4e6 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%bcond_with bootstrap +%bcond_without bootstrap # MIT-LICENSE: MIT # README.rdoc: MIT From 70c69e235be0e325abda17a8210a7ab838b41de5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 09:57:44 +0900 Subject: [PATCH 05/11] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 7e0b4e6..8490bc6 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 35%{?dist} +Release: 36%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -175,6 +175,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Wed Jan 08 2025 Mamoru TASAKA - 0.10.0-36 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Fri Sep 06 2024 Mamoru TASAKA - 0.10.0-35 - Adjust to mesa 24.2.2 change that swrast with dril does not expose accum buffers anymore From b93a5b61b3459c60d4c770c00cced16a6cd8c745 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 10:25:07 +0900 Subject: [PATCH 06/11] kill bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 8490bc6..ed8734c 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%bcond_without bootstrap +%bcond_with bootstrap # MIT-LICENSE: MIT # README.rdoc: MIT From 75fd767752baeba35134dd7daaf04e3e7d8445d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:43:25 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index ed8734c..d315755 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 36%{?dist} +Release: 37%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -175,6 +175,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 0.10.0-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 08 2025 Mamoru TASAKA - 0.10.0-36 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From cc9a3ae870c68e432ffa8b8321d3e2ced8855510 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:38:33 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index d315755..b0ec5f4 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 37%{?dist} +Release: 38%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -175,6 +175,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.10.0-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 0.10.0-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3b7896b7f4ef3a7c683da2fd6160ea22bc4958ac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 17:26:05 +0900 Subject: [PATCH 09/11] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index b0ec5f4..1696b1c 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 38%{?dist} +Release: 39%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -175,6 +175,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 0.10.0-39 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Fri Jul 25 2025 Fedora Release Engineering - 0.10.0-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4f935d0b0f5d7f5fe4716af260ac4047b8569f72 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 17:26:30 +0900 Subject: [PATCH 10/11] once bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 1696b1c..81953ec 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%bcond_with bootstrap +%bcond_without bootstrap # MIT-LICENSE: MIT # README.rdoc: MIT From 4e224dc7c7d9f8e62d58c0afaf60944c360a17da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 17:58:38 +0900 Subject: [PATCH 11/11] and kill bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 81953ec..1696b1c 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%bcond_without bootstrap +%bcond_with bootstrap # MIT-LICENSE: MIT # README.rdoc: MIT