From a9b1e0b2cfacf1a1cfa4bbd2322a7530632e4f89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 19:47:29 +0000 Subject: [PATCH 01/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 2e8f4ee..ed57613 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.10.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 0.10.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 16ee80d022c9096c5675d8c8fe45dab70d8c2f22 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2020 11:54:34 +0900 Subject: [PATCH 02/44] F-32: rebuild against ruby27 --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index ed57613..48c6b07 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jan 17 2020 Mamoru TASAKA - 0.10.0-12 +- F-32: rebuild against ruby27 + * Fri Jul 26 2019 Fedora Release Engineering - 0.10.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3595d05b8aefd5b3c06c17f3a343152fda88fba4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 19:00:35 +0000 Subject: [PATCH 03/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 48c6b07..f61526b 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.10.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Mamoru TASAKA - 0.10.0-12 - F-32: rebuild against ruby27 From ac8a5e496f99200c88767babf7d57199e7adb8ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 06:47:18 +0000 Subject: [PATCH 04/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index f61526b..c8c6501 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.10.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 0.10.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cf54519cbaf86c6fe00370eaca4492dc5321527a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 7 Jan 2021 00:09:37 +0900 Subject: [PATCH 05/44] F-34: rebuild against ruby 3.0 --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index c8c6501..2749bfe 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Wed Jan 06 2021 Mamoru TASAKA - 0.10.0-15 +- F-34: rebuild against ruby 3.0 + * Wed Jul 29 2020 Fedora Release Engineering - 0.10.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8a7629b5ff80fe5c56e05541e7a8e26793558952 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 16:14:31 +0000 Subject: [PATCH 06/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 2749bfe..1c62b08 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.10.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 06 2021 Mamoru TASAKA - 0.10.0-15 - F-34: rebuild against ruby 3.0 From d5e6cdd342c2490a7c0372a43429194246740bf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:24:55 +0000 Subject: [PATCH 07/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 1c62b08..a5ecc90 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.10.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.10.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9c773354c728cad1b52debb58376685b293fec0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:57:06 +0000 Subject: [PATCH 08/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index a5ecc90..ef5d875 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 0.10.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.10.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e35b33537be8461593573ab34dcfa0c3d5dc9753 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 08:23:34 +0900 Subject: [PATCH 09/44] F-36: rebuild against ruby31 --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index ef5d875..74e96c0 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 18%{?dist} +Release: 19%{?dist}~bootstrap Summary: An OpenGL wrapper for Ruby License: MIT @@ -164,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Wed Jan 26 2022 Mamoru TASAKA - 0.10.0-19 +- F-36: rebuild against ruby31 + * Fri Jan 21 2022 Fedora Release Engineering - 0.10.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e2653a1a66cd5b94236b650ba498c52161cc45e4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 12:06:25 +0900 Subject: [PATCH 10/44] enable test again --- rubygem-opengl.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 74e96c0..762e184 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%global bootstrap 1 +%global bootstrap 0 # examples/OrangeBook/: BSD # examples/NeHe: KILLED (license unclear) @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 19%{?dist}~bootstrap +Release: 19%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -40,11 +40,9 @@ BuildRequires: %{_bindir}/xvfb-run BuildRequires: mesa-dri-drivers BuildRequires: rubygem(glu) BuildRequires: rubygem(glut) +%if 0%{?fedora} >= 36 +BuildRequires: rubygem(matrix) %endif -%if 0%{?fedora} <= 21 -# Install this for compatibility -Requires: rubygem(glu) -Requires: rubygem(glut) %endif From 27a50a229a6b19298f2e521b4bf7fce3d41f992a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:59:19 +0000 Subject: [PATCH 11/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 762e184..6a6b0e9 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -162,6 +162,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.10.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 26 2022 Mamoru TASAKA - 0.10.0-19 - F-36: rebuild against ruby31 From 10b0dfde517ad0dde1f5af406ddeb9747211c128 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 4 Jan 2023 13:25:59 +0900 Subject: [PATCH 12/44] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 6a6b0e9..45baed1 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -162,6 +162,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Wed Jan 04 2023 Mamoru TASAKA - 0.10.0-21 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 0.10.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d8c8bc76fd4bfc061ce8c2a89c3b834ed5293002 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:50:54 +0000 Subject: [PATCH 13/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 45baed1..a659fd7 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -162,6 +162,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 0.10.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Mamoru TASAKA - 0.10.0-21 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 From 8cff9ca75a952d1b829c557098624b59e97c790a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:05:36 +0000 Subject: [PATCH 14/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index a659fd7..1d53001 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -162,6 +162,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 0.10.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 0.10.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1cca45ad10cf43657bff49474eedbe3026451b4c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Oct 2023 14:21:07 +0900 Subject: [PATCH 15/44] use recent bootstrap macro --- rubygem-opengl.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 1d53001..cca2aa5 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%global bootstrap 0 +%bcond_with bootstrap # examples/OrangeBook/: BSD # examples/NeHe: KILLED (license unclear) @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 23%{?dist} +Release: 23.100%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -34,16 +34,14 @@ BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: freeglut-devel # %%check -%if 0%{?bootstrap} < 1 +%if %{without bootstrap} BuildRequires: rubygem(minitest) >= 5 BuildRequires: %{_bindir}/xvfb-run BuildRequires: mesa-dri-drivers BuildRequires: rubygem(glu) BuildRequires: rubygem(glut) -%if 0%{?fedora} >= 36 BuildRequires: rubygem(matrix) %endif -%endif %description @@ -127,7 +125,7 @@ popd rm -f %{buildroot}%{gem_extdir_mri}/lib/opengl/test_case.rb %check -%if 0%{?bootstrap} < 1 +%if %{without bootstrap} pushd .%{gem_instdir} cat > test/unit.rb << EOF From 81dd4b2002ddde566509d21909f525f26ba4bee1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Oct 2023 14:48:30 +0900 Subject: [PATCH 16/44] Use recent packaging style --- rubygem-opengl.spec | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index cca2aa5..345e861 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -59,16 +59,8 @@ BuildArch: noarch Documentation for %{name} %prep -%setup -q -c -T - -# Gem repack -TOPDIR=$(pwd) -mkdir tmpunpackdir -pushd tmpunpackdir - -gem unpack %{SOURCE0} -cd %{gem_name}-%{version}-clean -gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec +%setup -q -n %{gem_name}-%{version}-clean +mv ../%{gem_name}-%{version}-clean.gemspec ./%{gem_name}.gemspec find examples/ -type f -print0 | xargs --null file | \ grep CRLF | sed -e 's|:.*$||' | \ @@ -81,13 +73,8 @@ sed -i.minitest \ -e 's|MiniTest::Unit::TestCase|Minitest::Test|' \ lib/opengl/test_case.rb -gem build %{gem_name}.gemspec -mv %{gem_name}-%{version}.gem $TOPDIR - -popd -rm -rf tmpunpackdir - %build +gem build %{gem_name}.gemspec %gem_install %install @@ -128,15 +115,11 @@ rm -f %{buildroot}%{gem_extdir_mri}/lib/opengl/test_case.rb %if %{without bootstrap} pushd .%{gem_instdir} -cat > test/unit.rb << EOF -gem "minitest" -require "minitest/autorun" -EOF +export RUBYLIB=%{buildroot}%{gem_extdir_mri}/:$(pwd)/lib:$(pwd) xvfb-run \ -s "-screen 0 640x480x24" \ ruby \ - -Ilib:.:./ext \ -e "Dir.glob('test/test_*.rb').each { |f| require f }" \ || echo "please check this later" popd From 06e71d1f2aff078c41ef3be489dadd2e93e1b183 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Oct 2023 17:05:32 +0900 Subject: [PATCH 17/44] Actually check the count of the failures --- rubygem-opengl.spec | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 345e861..84cd554 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -11,7 +11,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 23.100%{?dist} +Release: 24%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -112,18 +112,25 @@ popd rm -f %{buildroot}%{gem_extdir_mri}/lib/opengl/test_case.rb %check -%if %{without bootstrap} +%if %{with bootstrap} +exit 0 +%endif + pushd .%{gem_instdir} export RUBYLIB=%{buildroot}%{gem_extdir_mri}/:$(pwd)/lib:$(pwd) - -xvfb-run \ - -s "-screen 0 640x480x24" \ - ruby \ - -e "Dir.glob('test/test_*.rb').each { |f| require f }" \ - || echo "please check this later" +# try twice +STATUS_ON_FAILURE=true +for trial in 1 2 ; do + xvfb-run \ + -s "-screen 0 640x480x24" \ + ruby \ + -e "Dir.glob('test/test_*.rb').each { |f| require f }" \ + 2>&1 | tee TEST.log + cat TEST.log | grep -q "184 runs, 1745 assertions, 6 failures, 1 errors, 14 skips" && break || $STATUS_ON_FAILURE + STATUS_ON_FAILURE=false +done popd -%endif %files %dir %{gem_instdir} @@ -143,6 +150,10 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Thu Oct 5 2023 Mamoru TASAKA - 0.10.0-24 +- Switch to use recent spec file style +- Actually check the count of the test failures + * Fri Jul 21 2023 Fedora Release Engineering - 0.10.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 59199059fb6f9aaaf79217bdfca84446844c236a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Oct 2023 17:06:21 +0900 Subject: [PATCH 18/44] once bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 84cd554..0b3a746 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%bcond_with bootstrap +%bcond_without bootstrap # examples/OrangeBook/: BSD # examples/NeHe: KILLED (license unclear) From d9622816f81cb082ee728789bdcceb847398cdd3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Oct 2023 17:33:57 +0900 Subject: [PATCH 19/44] kill bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 0b3a746..84cd554 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,6 @@ %global gem_name opengl -%bcond_without bootstrap +%bcond_with bootstrap # examples/OrangeBook/: BSD # examples/NeHe: KILLED (license unclear) From f909f27cfefd0b0a0978048362fff6da4dc937a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 9 Oct 2023 19:36:51 +0900 Subject: [PATCH 20/44] SPDX migration --- rubygem-opengl.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 84cd554..60d9665 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -2,16 +2,19 @@ %bcond_with bootstrap -# examples/OrangeBook/: BSD +# MIT-LICENSE: MIT +# README.rdoc: MIT +# examples/OrangeBook/3Dlabs-License.txt (etc): BSD-3-Clause # examples/NeHe: KILLED (license unclear) -# examples/RedBook/ SGI = MIT -# examples/misc/OGLBench.rb: GPL+ or Artistic +# examples/RedBook/aapoly.rb: HPND +# examples/misc/OGLBench.rb: GPL-1.0-or-later OR Artistic-1.0-Perl +# examples/misc/plane.rb: HPND # examples/misc/fbo_test.rb ??? KILLED -# examples/misc/trislam.rb: GPL+ or Artistic +# examples/misc/trislam.rb: GPL-1.0-or-later OR Artistic-1.0-Perl Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: An OpenGL wrapper for Ruby License: MIT @@ -52,7 +55,7 @@ GLU and GLUT libraries. %package doc Summary: Documentation for %{name} Requires: %{name} = %{version}-%{release} -License: MIT and BSD and (GPL+ or Artistic) +License: MIT AND BSD-3-Clause AND HPND AND (GPL-1.0-or-later OR Artistic-1.0-Perl) BuildArch: noarch %description doc @@ -150,6 +153,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Mon Oct 9 2023 Mamoru TASAKA - 0.10.0-25 +- SPDX migration + * Thu Oct 5 2023 Mamoru TASAKA - 0.10.0-24 - Switch to use recent spec file style - Actually check the count of the test failures From 8556b866cc67ed174fb924f91f5e209de819979f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 9 Oct 2023 20:57:19 +0900 Subject: [PATCH 21/44] add SPDX notes --- rubygem-opengl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 60d9665..8fb93ae 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -17,6 +17,7 @@ Version: 0.10.0 Release: 25%{?dist} Summary: An OpenGL wrapper for Ruby +# SPDX confirmed License: MIT URL: https://github.com/drbrain/opengl # Source0: https://rubygems.org/gems/%%{gem_name}-%%{version}.gem From e0a5aaf44a48bf96f27ed1923a48ec009c3e452f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 22:13:22 +0900 Subject: [PATCH 22/44] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 8fb93ae..7efa042 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -154,6 +154,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Wed Jan 03 2024 Mamoru TASAKA - 0.10.0-26 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + * Mon Oct 9 2023 Mamoru TASAKA - 0.10.0-25 - SPDX migration From e2f392dae51c260c36dcd351faca1f97a318bd92 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 22:13:38 +0900 Subject: [PATCH 23/44] bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 7efa042..eb63692 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 1a7dd1e93663ec16b93f202500abe0b9d6ecbd7c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 23:18:26 +0900 Subject: [PATCH 24/44] kill bootstrap --- rubygem-opengl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index eb63692..7efa042 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 0ce71a19ac88d9b19381edda795b0ac130926a8d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 Jan 2024 00:01:31 +0900 Subject: [PATCH 25/44] ignore test failure on i686 for now --- rubygem-opengl.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 7efa042..1ce14ef 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -132,7 +132,10 @@ for trial in 1 2 ; do -e "Dir.glob('test/test_*.rb').each { |f| require f }" \ 2>&1 | tee TEST.log cat TEST.log | grep -q "184 runs, 1745 assertions, 6 failures, 1 errors, 14 skips" && break || $STATUS_ON_FAILURE +%ifarch i686 +%else STATUS_ON_FAILURE=false +%endif done popd From 766221cc7168cdf03ffb2ef20d4c6b0370b05082 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 20 Jan 2024 16:28:07 +0900 Subject: [PATCH 26/44] Change -Wincompatible-pointer-types from error to warning --- rubygem-opengl.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 1ce14ef..f37c7aa 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,3 +1,6 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + %global gem_name opengl %bcond_with bootstrap @@ -14,7 +17,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -157,6 +160,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Sat Jan 20 2024 Mamoru TASAKA - 0.10.0-27 +- Change -Wincompatible-pointer-types from error to warning + * Wed Jan 03 2024 Mamoru TASAKA - 0.10.0-26 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 From 33b15a59dc2205d74699017570e6e66b54f32750 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:13:34 +0000 Subject: [PATCH 27/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-opengl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index f37c7aa..ef3ca92 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -17,7 +17,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -160,6 +160,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 0.10.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Mamoru TASAKA - 0.10.0-27 - Change -Wincompatible-pointer-types from error to warning From 831c8ed0b3f8ceee0df35e45586ee1650b0fefd0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 22 Feb 2024 11:21:32 +0900 Subject: [PATCH 28/44] Explicitly add -Wno-error=incompatible-pointer-types only --- rubygem-opengl.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index ef3ca92..0d994c6 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,5 +1,5 @@ # Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 +#%%global build_type_safety_c 2 %global gem_name opengl @@ -17,7 +17,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -81,6 +81,10 @@ sed -i.minitest \ lib/opengl/test_case.rb %build +# Only add -Wno-error=incompatible-pointer-types +%global optflags_orig %optflags +%global optflags %optflags -Wno-error=incompatible-pointer-types + gem build %{gem_name}.gemspec %gem_install @@ -160,6 +164,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Thu Feb 22 2024 Mamoru TASAKA - 0.10.0-29 +- Explicitly add -Wno-error=incompatible-pointer-types only + * Fri Jan 26 2024 Fedora Release Engineering - 0.10.0-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f146682609d3534d047ae246bbaffdb2fcafdb82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 23 Feb 2024 12:25:34 +0900 Subject: [PATCH 29/44] Fix -Werror=incompatible-pointer-types hard --- opengl-0.10.0-pointer-types.patch | 174 ++++++++++++++++++++++++++++++ rubygem-opengl.spec | 16 +-- 2 files changed, 182 insertions(+), 8 deletions(-) create mode 100644 opengl-0.10.0-pointer-types.patch diff --git a/opengl-0.10.0-pointer-types.patch b/opengl-0.10.0-pointer-types.patch new file mode 100644 index 0000000..9ebbfe6 --- /dev/null +++ b/opengl-0.10.0-pointer-types.patch @@ -0,0 +1,174 @@ +--- opengl-0.10.0/ext/opengl/gl-1.0-1.1.c.types 2024-02-23 11:59:46.379472357 +0900 ++++ opengl-0.10.0/ext/opengl/gl-1.0-1.1.c 2024-02-23 12:20:08.317748271 +0900 +@@ -203,8 +203,9 @@ struct gl_endisable_args { + }; + + static VALUE +-gl_Enable1(struct gl_endisable_args *args) ++gl_Enable1(VALUE val) + { ++ struct gl_endisable_args *args = (struct gl_endisable_args *)val; + long i; + VALUE obj = args->obj; + DECL_GL_FUNC_PTR(void,glEnable,(GLenum cap)); +@@ -220,9 +221,10 @@ gl_Enable1(struct gl_endisable_args *arg + } + + static VALUE +-gl_Enable0(struct gl_endisable_args *args) ++gl_Enable0(VALUE val) + { +- gl_Enable1(args); ++ struct gl_endisable_args *args = (struct gl_endisable_args *)val; ++ gl_Enable1((VALUE)args); + + if (rb_block_given_p()) + rb_yield(Qundef); +@@ -231,8 +233,9 @@ gl_Enable0(struct gl_endisable_args *arg + } + + static VALUE +-gl_Disable1(struct gl_endisable_args *args) ++gl_Disable1(VALUE val) + { ++ struct gl_endisable_args *args = (struct gl_endisable_args *)val; + long i; + VALUE obj = args->obj; + DECL_GL_FUNC_PTR(void,glDisable,(GLenum cap)); +@@ -248,9 +251,10 @@ gl_Disable1(struct gl_endisable_args *ar + } + + static VALUE +-gl_Disable0(struct gl_endisable_args *args) ++gl_Disable0(VALUE val) + { +- gl_Disable1(args); ++ struct gl_endisable_args *args = (struct gl_endisable_args *)val; ++ gl_Disable1((VALUE)args); + + if (rb_block_given_p()) + rb_yield(Qundef); +@@ -279,7 +283,7 @@ gl_Enable(int argc, VALUE *argv, VALUE o + return rb_ensure(gl_Enable0, (VALUE)&enargs, gl_Disable1, (VALUE)&disargs); + } else { + struct gl_endisable_args args = { obj, caps }; +- gl_Enable0(&args); ++ gl_Enable0((VALUE)&args); + } + + return Qnil; +@@ -306,7 +310,7 @@ gl_Disable(int argc, VALUE *argv, VALUE + return rb_ensure(gl_Disable0, (VALUE)&disargs, gl_Enable1, (VALUE)&enargs); + } else { + struct gl_endisable_args args = { obj, caps }; +- gl_Disable0(&args); ++ gl_Disable0((VALUE)&args); + } + + return Qnil; +@@ -318,8 +322,9 @@ struct gl_client_state_args { + }; + + static VALUE +-gl_EnableClientState1(struct gl_client_state_args *args) ++gl_EnableClientState1(VALUE val) + { ++ struct gl_client_state_args *args = (struct gl_client_state_args *)val; + long i; + VALUE obj = args->obj; + DECL_GL_FUNC_PTR(void,glEnableClientState,(GLenum cap)); +@@ -335,9 +340,10 @@ gl_EnableClientState1(struct gl_client_s + } + + static VALUE +-gl_EnableClientState0(struct gl_client_state_args *args) ++gl_EnableClientState0(VALUE val) + { +- gl_EnableClientState1(args); ++ struct gl_client_state_args *args = (struct gl_client_state_args *)val; ++ gl_EnableClientState1((VALUE)args); + + if (rb_block_given_p()) + rb_yield(Qundef); +@@ -346,8 +352,9 @@ gl_EnableClientState0(struct gl_client_s + } + + static VALUE +-gl_DisableClientState1(struct gl_client_state_args *args) ++gl_DisableClientState1(VALUE val) + { ++ struct gl_client_state_args *args = (struct gl_client_state_args *)val; + long i; + VALUE obj = args->obj; + DECL_GL_FUNC_PTR(void,glDisableClientState,(GLenum cap)); +@@ -363,9 +370,10 @@ gl_DisableClientState1(struct gl_client_ + } + + static VALUE +-gl_DisableClientState0(struct gl_client_state_args *args) ++gl_DisableClientState0(VALUE val) + { +- gl_DisableClientState1(args); ++ struct gl_client_state_args *args = (struct gl_client_state_args *)val; ++ gl_DisableClientState1((VALUE)args); + + if (rb_block_given_p()) + rb_yield(Qundef); +@@ -394,7 +402,7 @@ gl_EnableClientState(int argc, VALUE *ar + return rb_ensure(gl_EnableClientState0, (VALUE)&enargs, gl_DisableClientState1, (VALUE)&disargs); + } else { + struct gl_client_state_args args = { obj, ary }; +- gl_EnableClientState0(&args); ++ gl_EnableClientState0((VALUE)&args); + } + + return Qnil; +@@ -421,7 +429,7 @@ gl_DisableClientState(int argc, VALUE *a + return rb_ensure(gl_DisableClientState0, (VALUE)&disargs, gl_EnableClientState1, (VALUE)&enargs); + } else { + struct gl_client_state_args args = { obj, ary }; +- gl_DisableClientState0(&args); ++ gl_DisableClientState0((VALUE)&args); + } + + return Qnil; +@@ -433,8 +441,9 @@ struct gl_begin0_args { + }; + + static VALUE +-gl_Begin0(struct gl_begin0_args *args) ++gl_Begin0(VALUE val) + { ++ struct gl_begin0_args *args = (struct gl_begin0_args *)val; + VALUE obj = args->obj; + DECL_GL_FUNC_PTR(void,glBegin,(GLenum mode)); + +@@ -472,7 +481,7 @@ gl_Begin(VALUE obj, VALUE mode) + if (rb_block_given_p()) + return rb_ensure(gl_Begin0, (VALUE)&args, gl_End, obj); + else +- gl_Begin0(&args); ++ gl_Begin0((VALUE)&args); + + return Qnil; + } +@@ -525,8 +534,9 @@ struct gl_list_args { + }; + + static VALUE +-gl_NewList0(struct gl_list_args *args) ++gl_NewList0(VALUE val) + { ++ struct gl_list_args *args = (struct gl_list_args *) val; + GLuint list; + GLenum mode; + VALUE obj = args->obj; +@@ -563,7 +573,7 @@ gl_NewList(VALUE obj, VALUE list, VALUE + if (rb_block_given_p()) + return rb_ensure(gl_NewList0, (VALUE)&args, gl_EndList, obj); + else +- gl_NewList0(&args); ++ gl_NewList0((VALUE)&args); + + return Qnil; + } diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 0d994c6..c39d7ac 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -1,6 +1,3 @@ -# Skip -Werror=incompatilbe-pointer-types -#%%global build_type_safety_c 2 - %global gem_name opengl %bcond_with bootstrap @@ -17,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -32,6 +29,8 @@ Source0: %{gem_name}-%{version}-clean.gem Source1: create-clean-opengl-gem.sh # http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt Source2: GPLv1.rubygem_opengl +# Fix for -Werror=incompatible-pointer-types +Patch0: opengl-0.10.0-pointer-types.patch # MRI (CRuby) only BuildRequires: gcc @@ -80,11 +79,9 @@ sed -i.minitest \ -e 's|MiniTest::Unit::TestCase|Minitest::Test|' \ lib/opengl/test_case.rb -%build -# Only add -Wno-error=incompatible-pointer-types -%global optflags_orig %optflags -%global optflags %optflags -Wno-error=incompatible-pointer-types +%patch -P0 -p1 -b .types +%build gem build %{gem_name}.gemspec %gem_install @@ -164,6 +161,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Fri Feb 23 2024 Mamoru TASAKA - 0.10.0-30 +- Fix -Werror=incompatible-pointer-types hard + * Thu Feb 22 2024 Mamoru TASAKA - 0.10.0-29 - Explicitly add -Wno-error=incompatible-pointer-types only From 6dc584fabbad73e33a744d7ac93d408e27b4638b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 May 2024 16:27:23 +0900 Subject: [PATCH 30/44] Ignore one more test failure with recent F41 mesa --- rubygem-opengl.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index c39d7ac..5baf6e6 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -126,6 +126,11 @@ exit 0 pushd .%{gem_instdir} +EXPECTED_TEST_MSG="184 runs, 1745 assertions, 6 failures, 1 errors, 14 skips" +%if 0%{?fedora} >= 41 +EXPECTED_TEST_MSG="184 runs, 1744 assertions, 6 failures, 2 errors, 14 skips" +%endif + export RUBYLIB=%{buildroot}%{gem_extdir_mri}/:$(pwd)/lib:$(pwd) # try twice STATUS_ON_FAILURE=true @@ -135,7 +140,7 @@ for trial in 1 2 ; do ruby \ -e "Dir.glob('test/test_*.rb').each { |f| require f }" \ 2>&1 | tee TEST.log - cat TEST.log | grep -q "184 runs, 1745 assertions, 6 failures, 1 errors, 14 skips" && break || $STATUS_ON_FAILURE + cat TEST.log | grep -q "$EXPECTED_TEST_MSG" && break || $STATUS_ON_FAILURE %ifarch i686 %else STATUS_ON_FAILURE=false @@ -161,6 +166,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Thu May 09 2024 Mamoru TASAKA - 0.10.0-31 +- Ignore one more test failure with recent F41 mesa + * Fri Feb 23 2024 Mamoru TASAKA - 0.10.0-30 - Fix -Werror=incompatible-pointer-types hard From f76d263650fc009bc6cc935d03affa18c9bc512c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 May 2024 16:48:28 +0900 Subject: [PATCH 31/44] Ignore test failure completely for now on F41 s390x mesa --- rubygem-opengl.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 5baf6e6..6df46f0 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -145,6 +145,11 @@ for trial in 1 2 ; do %else STATUS_ON_FAILURE=false %endif +%ifarch s390x +%if 0%{?fedora} >= 41 + # Currently mesa on F41, s390x is fairly broken + STATUS_ON_FAILURE=true +%endif done popd @@ -168,6 +173,7 @@ popd %changelog * Thu May 09 2024 Mamoru TASAKA - 0.10.0-31 - Ignore one more test failure with recent F41 mesa +- Ignore test failure completely for now on F41 s390x mesa * Fri Feb 23 2024 Mamoru TASAKA - 0.10.0-30 - Fix -Werror=incompatible-pointer-types hard From 8a09e4971945e9849233607399f9f89bdc26c83b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 May 2024 16:52:27 +0900 Subject: [PATCH 32/44] fix spec --- rubygem-opengl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index 6df46f0..f5efe4c 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -150,6 +150,7 @@ for trial in 1 2 ; do # Currently mesa on F41, s390x is fairly broken STATUS_ON_FAILURE=true %endif +%endif done popd From 676369d0cf2e0c6df30b24ffa6172192afab053b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 18 Jun 2024 00:16:00 +0900 Subject: [PATCH 33/44] Use regex match for test result --- rubygem-opengl.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec index f5efe4c..f0c857c 100644 --- a/rubygem-opengl.spec +++ b/rubygem-opengl.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: 0.10.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: An OpenGL wrapper for Ruby # SPDX confirmed @@ -126,10 +126,7 @@ exit 0 pushd .%{gem_instdir} -EXPECTED_TEST_MSG="184 runs, 1745 assertions, 6 failures, 1 errors, 14 skips" -%if 0%{?fedora} >= 41 -EXPECTED_TEST_MSG="184 runs, 1744 assertions, 6 failures, 2 errors, 14 skips" -%endif +EXPECTED_TEST_MSG="184 runs, 174[45] assertions, 6 failures, [12] errors, 14 skips" export RUBYLIB=%{buildroot}%{gem_extdir_mri}/:$(pwd)/lib:$(pwd) # try twice @@ -146,7 +143,7 @@ for trial in 1 2 ; do STATUS_ON_FAILURE=false %endif %ifarch s390x -%if 0%{?fedora} >= 41 +%if 0%{?fedora} >= 40 # Currently mesa on F41, s390x is fairly broken STATUS_ON_FAILURE=true %endif @@ -172,6 +169,9 @@ popd %doc %{gem_instdir}/utils/ %changelog +* Mon Jun 17 2024 Mamoru TASAKA - 0.10.0-32 +- Use regex match for test result + * Thu May 09 2024 Mamoru TASAKA - 0.10.0-31 - Ignore one more test failure with recent F41 mesa - Ignore test failure completely for now on F41 s390x mesa From 96b9822e8c5888672f79b40d95516ef49c1253da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Jul 2024 10:16:00 +0900 Subject: [PATCH 34/44] 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 35/44] 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 36/44] 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 37/44] 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 38/44] 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 39/44] 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 40/44] 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 41/44] 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 42/44] 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 43/44] 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 44/44] 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