diff --git a/.gitignore b/.gitignore index 764f844..c234d3f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ OpenGL-0.62.tar.gz /OpenGL-0.66.tar.gz /OpenGL-0.6702.tar.gz /OpenGL-0.6704.tar.gz +/OpenGL-0.70.tar.gz +/OpenGL-0.70_repackaged.tar.gz diff --git a/0001-Don-t-check-current-display-for-extensions.patch b/0001-Don-t-check-current-display-for-extensions.patch index a4fa273..01e624b 100644 --- a/0001-Don-t-check-current-display-for-extensions.patch +++ b/0001-Don-t-check-current-display-for-extensions.patch @@ -1,18 +1,7 @@ -From d5b18e9c0986de75a905897205afa2b670b2dec9 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Mon, 28 Oct 2013 08:53:54 +0100 -Subject: [PATCH] Don't check current display for extensions - -Build all. ---- - Makefile.PL | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/Makefile.PL b/Makefile.PL -index efc21c3..200842b 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -596,9 +596,9 @@ my $build_config = +diff -up OpenGL-0.70/Makefile.PL.orig OpenGL-0.70/Makefile.PL +--- OpenGL-0.70/Makefile.PL.orig 2017-02-16 12:55:13.520410728 +0100 ++++ OpenGL-0.70/Makefile.PL 2017-02-16 13:01:34.612717648 +0100 +@@ -601,9 +601,9 @@ my $build_config = { FILES => "Config.pm ". @@ -25,7 +14,7 @@ index efc21c3..200842b 100644 } }; -@@ -814,6 +814,7 @@ sub get_extensions +@@ -824,6 +824,7 @@ sub get_extensions print "GLUT not found\n"; } @@ -33,18 +22,17 @@ index efc21c3..200842b 100644 # Platform-specific makefiles for glversion my $make_ver; if ($IS_STRAWBERRY) -@@ -876,7 +877,9 @@ sub get_extensions - print "get_extensions: no extensions found in $glv_file\n" if $verbose; - return ''; - } -- +@@ -882,6 +883,9 @@ sub get_extensions + die "get_extensions: no extensions found in $glv_file\n" if !keys %$gldata; + + print "This looks like OpenGL Version: $gldata->{VERSION}\n"; +=cut + use Config; + my $gldata = { }; # Parse glext_procs.h file - return '' if (!open(GLEXT,"glext_procs.h")); -@@ -895,10 +898,12 @@ sub get_extensions + open GLEXT, "glext_procs.h" or die "get_extensions: could not open glext_procs.h: $!\n"; +@@ -900,11 +904,12 @@ sub get_extensions # Create gl_exclude.h die "Unable to write to $exc_file\n" if (!open(GLEXC,">$exc_file")); @@ -53,10 +41,8 @@ index efc21c3..200842b 100644 print GLEXC "//\n"; print GLEXC "// Generated for ".$gldata->{VENDOR}.", ".$gldata->{RENDERER}."\n"; print GLEXC "// OpenGL v".$gldata->{VERSION}.", using "; +- +=cut - # Fix GLUT flags based on results - if ($gldata->{GLUT} > 0) --- -1.8.3.1 - + if ($gldata->{FREEGLUT}) + { diff --git a/OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch b/OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch deleted file mode 100644 index b9006a1..0000000 --- a/OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch +++ /dev/null @@ -1,95 +0,0 @@ -From e83b9048c43cbcbdaeb287dd571ab7e277e19979 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 8 Jun 2015 17:06:52 +0200 -Subject: [PATCH] Delete functions removed from Mesa -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -mesa-libGL between 10.6.0-0.devel.5.51e3453 and -10.6.0-0.devel.6.5a55f68 removed these functions: - -glWindowPos4dMESA -glWindowPos4iMESA -glWindowPos3iMESA -glWindowPos2dMESA -glWindowPos2iMESA -glWindowPos3dMESA -glResizeBuffersMESA - - - - -Signed-off-by: Petr Písař ---- - pogl_gl_Vert_Multi.xs | 54 --------------------------------------------------- - 1 file changed, 54 deletions(-) - -diff --git a/pogl_gl_Vert_Multi.xs b/pogl_gl_Vert_Multi.xs -index e360e5c..4e8a010 100644 ---- a/pogl_gl_Vert_Multi.xs -+++ b/pogl_gl_Vert_Multi.xs -@@ -359,60 +359,6 @@ glEdgeFlagPointerEXT_oga(oga) - #endif - - --#ifdef GL_MESA_window_pos -- --#// glWindowPos2iMESA($x, $y); --void --glWindowPos2iMESA(x, y) -- GLint x -- GLint y -- --#// glWindowPos2dMESA($x, $y); --void --glWindowPos2dMESA(x, y) -- GLdouble x -- GLdouble y -- --#// glWindowPos3iMESA($x, $y, $z); --void --glWindowPos3iMESA(x, y, z) -- GLint x -- GLint y -- GLint z -- --#// glWindowPos3dMESA($x, $y, $z); --void --glWindowPos3dMESA(x, y, z) -- GLdouble x -- GLdouble y -- GLdouble z -- --#// glWindowPos4iMESA($x, $y, $z, $w); --void --glWindowPos4iMESA(x, y, z, w) -- GLint x -- GLint y -- GLint z -- GLint w -- --#// glWindowPos4dMESA($x, $y, $z, $w); --void --glWindowPos4dMESA(x, y, z, w) -- GLdouble x -- GLdouble y -- GLdouble z -- GLdouble w -- --#endif -- --#ifdef GL_MESA_resize_buffers -- --#// glResizeBuffersMESA(); --void --glResizeBuffersMESA() -- --#endif -- - #ifdef GL_ARB_draw_buffers - - #//# glDrawBuffersARB_c($n,(CPTR)buffers); --- -2.1.0 - diff --git a/OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch b/OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch deleted file mode 100644 index f5dc2da..0000000 --- a/OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3f8fa1a5069a6a7e371234f0045819e489242cd3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 8 Jun 2015 16:41:48 +0200 -Subject: [PATCH] Prefer system GL/gl.h on non-Win32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - gl_util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gl_util.h b/gl_util.h -index a5dc862..c1566fd 100644 ---- a/gl_util.h -+++ b/gl_util.h -@@ -13,7 +13,7 @@ - #endif - - /* Provide GL header files for Windows */ --#define INCLUDE_LOCAL_HEADER !defined(HAVE_W32API) -+#define INCLUDE_LOCAL_HEADER defined(HAVE_W32API) - #if INCLUDE_LOCAL_HEADER - #include "./include/GL/gl.h" - #else --- -2.1.0 - diff --git a/perl-OpenGL.spec b/perl-OpenGL.spec index ee95b87..bbe7bad 100644 --- a/perl-OpenGL.spec +++ b/perl-OpenGL.spec @@ -1,17 +1,23 @@ +%global cpanversion 0.70 + Name: perl-OpenGL -Version: 0.6704 -Release: 3%{?dist} +Version: %{cpanversion}00 +Release: 32%{?dist} Summary: Perl OpenGL bindings -License: GPL+ or Artistic -Group: Development/Libraries +# Automatically converted from old format: GPL+ or Artistic - review is highly recommended. +License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: http://sourceforge.net/projects/pogl/ -Source0: http://search.cpan.org/CPAN/authors/id/C/CH/CHM/OpenGL-%{version}.tar.gz +# +# stripped from a non-free files using ./repackage.sh %%{version} command, +# bug #1612850, +Source0: OpenGL-%{cpanversion}_repackaged.tar.gz +# GPLv2-licensed code for generating Source0 from an upstream tarball, +# bug #1612850, +Source1: repackage.sh Patch0: 0001-Don-t-check-current-display-for-extensions.patch -# Do not require bundled GL/gl.h header file, -# -Patch1: OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch -# Do not use functions removed from Mesa, bug #1224294 -Patch2: OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch +BuildRequires: gcc +# gcc-c++ for libstdc++.so linked in Makefile.PL +BuildRequires: gcc-c++ BuildRequires: coreutils BuildRequires: findutils BuildRequires: freeglut-devel @@ -21,7 +27,9 @@ BuildRequires: libXi-devel BuildRequires: libXmu-devel BuildRequires: mesa-libGL-devel BuildRequires: make -BuildRequires: perl +BuildRequires: perl-interpreter +BuildRequires: perl-devel +BuildRequires: perl-generators BuildRequires: perl(Config) BuildRequires: perl(Data::Dumper) BuildRequires: perl(ExtUtils::Liblist) @@ -35,7 +43,6 @@ BuildRequires: perl(DynaLoader) BuildRequires: perl(Exporter) # Tests: BuildRequires: perl(Test::More) -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %{?perl_default_filter} @@ -45,12 +52,12 @@ of the OpenGL 1.0, and 1.1 functions, and most of 1.2. %prep -%setup -q -n OpenGL-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n OpenGL-%{cpanversion} +%patch -P0 -p1 # Unbundle GL headers find include -type f \! -name glprocs.h -exec rm {} + +# Remove executable bits +find -type f -exec chmod a-x {} + %build @@ -85,6 +92,112 @@ make test %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.7000-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jul 07 2025 Jitka Plesnikova - 0.7000-31 +- Perl 5.42 rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 0.7000-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Aug 06 2024 Miroslav Suchý - 0.7000-29 +- convert license to SPDX + +* Fri Jul 19 2024 Fedora Release Engineering - 0.7000-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 10 2024 Jitka Plesnikova - 0.7000-27 +- Perl 5.40 rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.7000-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.7000-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.7000-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 0.7000-23 +- Perl 5.38 rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 0.7000-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.7000-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 0.7000-20 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 0.7000-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.7000-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 0.7000-17 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.7000-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.7000-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 0.7000-14 +- Perl 5.32 rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 0.7000-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 01 2019 Petr Pisar - 0.7000-12 +- Remove a non-free header file from the source archive (bug #1612850) +- Remove executable bits from a documentation + +* Tue Sep 17 2019 Gwyn Ciesla - 0.7000-11 +- Rebuilt for new freeglut + +* Fri Jul 26 2019 Fedora Release Engineering - 0.7000-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Jitka Plesnikova - 0.7000-9 +- Perl 5.30 rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.7000-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.7000-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Jitka Plesnikova - 0.7000-6 +- Perl 5.28 rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 0.7000-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.7000-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.7000-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Jun 04 2017 Jitka Plesnikova - 0.7000-2 +- Perl 5.26 rebuild + +* Thu Feb 16 2017 Jitka Plesnikova - 0.7000-1 +- 0.70 bump + +* Sat Feb 11 2017 Fedora Release Engineering - 0.6704-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun May 15 2016 Jitka Plesnikova - 0.6704-5 +- Perl 5.24 rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.6704-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jun 18 2015 Fedora Release Engineering - 0.6704-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/repackage.sh b/repackage.sh new file mode 100755 index 0000000..425bf76 --- /dev/null +++ b/repackage.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# +# Copyright (C) 2010 Red Hat, Inc. +# Authors: +# Thomas Woerner +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +version=$1 +[ -z "$version" ] && { echo "Usage: $0 "; exit 1; } + +# files to be removed without the main OpenGL-/ prefix +declare -a REMOVE +REMOVE[${#REMOVE[*]}]="include/GL/glu.h" + +# no changes below this line should be needed + +orig="OpenGL-${version}" +orig_tgz="${orig}.tar.gz" +repackaged="${orig}_repackaged" +repackaged_tar="${repackaged}.tar" +repackaged_tgz="${repackaged_tar}.gz" + +# pre checks +[ ! -f "${orig_tgz}" ] && { echo "ERROR: ${orig_tgz} does not exist"; exit 1; } +[ -f "${repackaged_tgz}" ] && { echo "ERROR: ${repackaged_tgz} already exist"; exit 1; } + +# repackage +failure=0 +gzip -dc "${orig_tgz}" > "${repackaged_tar}" +for file in "${REMOVE[@]}"; do + tar -f "${repackaged_tar}" --delete "${orig}/${file}" >> repackage.log + [ $? != 0 ] && { echo "ERROR: Could not remove file ${orig}/${file} from archive."; failure=1; } || echo "Removed ${orig}/${file} from archive." +done +[ $failure != 0 ] && { echo "See repackage.log for details."; exit 1; } +gzip -9 -n "${repackaged_tar}" + +# post checks +RET=0 +for file in "${REMOVE[@]}"; do + found=$(tar -ztvf "${repackaged_tgz}" | grep "${file}") + [ -n "$found" ] && { echo "ERROR: file ${file} is still in the repackaged archive."; RET=1; } +done + +[ $RET == 0 ] && echo "Sucessfully repackaged ${orig}: ${repackaged_tgz}" + +exit $RET diff --git a/sources b/sources index ed4d4fa..4a7b145 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -433e4f197d7200c219494a8604f3e06b OpenGL-0.6704.tar.gz +SHA512 (OpenGL-0.70_repackaged.tar.gz) = a5e352a49928f6c7eb2005efbe369f62d50a862f98980f45561570b550b0cf5bc2dee5370040ae39a6d5b1501e66e80a2d979c8419d194bd92b527ffa00fd637