[packages/perl-OpenGL] - when disabling version detection, remove also -DHAVE_VER; release 3
    qboosh 
    qboosh at pld-linux.org
       
    Sat Sep 27 11:33:27 CEST 2025
    
    
  
commit 38f209262614e26d359beebac4f2898a2c6ca84a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 27 11:36:25 2025 +0200
    - when disabling version detection, remove also -DHAVE_VER; release 3
 perl-OpenGL-build.patch      | 53 ++++++++++++++++++++++++++++++++++++++++++++
 perl-OpenGL-prototypes.patch | 11 ---------
 perl-OpenGL.spec             |  4 +---
 3 files changed, 54 insertions(+), 14 deletions(-)
---
diff --git a/perl-OpenGL.spec b/perl-OpenGL.spec
index 5aa64b4..afa8b40 100644
--- a/perl-OpenGL.spec
+++ b/perl-OpenGL.spec
@@ -6,14 +6,13 @@ Summary:	OpenGL - Perl module to display 3D data using OpenGL, GLU, GLUT, and GL
 Summary(pl.UTF-8):	OpenGL - moduł Perla przedstawiający dane korzystając z bibliotek OpenGL, GLU, GLUT i GLX
 Name:		perl-OpenGL
 Version:	0.7006
-Release:	2
+Release:	3
 # same as perl
 License:	GPL v1+ or Artistic
 Group:		Development/Languages/Perl
 Source0:	https://www.cpan.org/modules/by-module/OpenGL/OpenGL-%{version}.tar.gz
 # Source0-md5:	d5ace37b2e3355a1278080e90f3438d8
 Patch0:		%{name}-build.patch
-Patch1:		%{name}-prototypes.patch
 URL:		https://metacpan.org/dist/OpenGL
 BuildRequires:	OpenGL-devel
 BuildRequires:	freeglut-devel
@@ -42,7 +41,6 @@ dla GLUT jest dostępna także niewielka część API GLX i X11.
 %prep
 %setup -q -n OpenGL-%{version}
 %patch -P0 -p1
-%patch -P1 -p1
 
 %build
 %{__perl} Makefile.PL \
diff --git a/perl-OpenGL-build.patch b/perl-OpenGL-build.patch
index 312b555..9e3507f 100644
--- a/perl-OpenGL-build.patch
+++ b/perl-OpenGL-build.patch
@@ -1,5 +1,41 @@
 --- OpenGL-0.7006/Makefile.PL.orig	2025-04-14 06:33:29.000000000 +0200
 +++ OpenGL-0.7006/Makefile.PL	2025-09-20 21:38:13.179157843 +0200
+@@ -78,34 +78,13 @@ our $NO_LGCC = grep /^NO_LGCC$/, @ARGV;
+ 
+ my $prepare_success = eval {
+ # Look for available libs
+-our @libdirs = map "-L$_", grep -d, qw(
+-  /usr/X11R6/lib
+-  /opt/X11/lib
+-  /usr/local/lib
+-  /usr/openwin/lib
+-  /opt/csw/lib
+-  /opt/local/lib
+-  /usr/local/freeglut/lib
+-  /usr/lib
+-  /usr/lib/xorg/modules
+-  /usr/X11R6/lib/modules
+-  /usr/lib/xorg/modules/extensions
+-  /usr/X11R6/lib/modules/extensions
+-);
++our @libdirs;
+ 
+ our @check_libs = qw
+ {
+   -lGL
+-  -lopengl
+-  -lMesaGL
+   -lGLU
+-  -lglu
+-  -lMesaGLU
+-  -lfreeglut
+-  -lglut3
+   -lglut
+-  -lGLUT
+-  -lMesaGLUT
+ };
+ 
+ our $found_libs = get_found_libs(\@libdirs, at check_libs);
 @@ -181,8 +181,7 @@ WriteMakefile(
        "lib/OpenGL/Config.pm ".
        "gl_exclude.h ".
@@ -43,3 +79,20 @@
    my $GL_VERSION = $gldata->{VERSION} =~ m|^(\d\.\d+)| ? $1 : undef;
    # Make an empty exclusion file if a Windows distribution build
    print $excl_fh "\n";
+@@ -618,7 +597,7 @@ sub generate_excl {
+ 
+ sub get_defines {
+   my ($found_libs, $interface_lib, $incs) = @_;
+-  my $defs = '-DHAVE_VER';
++  my $defs = '';
+   $defs .= " -DIS_STRAWBERRY" if $IS_STRAWBERRY;
+   print "resulting libs:\n" if $verbose;
+   foreach my $key (sort keys %$found_libs) {
+@@ -642,7 +642,6 @@ sub get_defines {
+     $out = cfile_text('GL/freeglut.h', $INCS);
+     $defs .= " -DHAVE_FREEGLUT -DHAVE_FREEGLUT_H"
+       if $out =~ m|glutMainLoopEvent|;
+-    $defs .= " -DGL_GLEXT_LEGACY";
+   }
+   $defs;
+ }
diff --git a/perl-OpenGL-prototypes.patch b/perl-OpenGL-prototypes.patch
deleted file mode 100644
index 379e482..0000000
--- a/perl-OpenGL-prototypes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Unblock (used) prototypes from <GL/glext.h>
---- OpenGL-0.7006/Makefile.PL.orig	2025-09-26 22:12:03.254141853 +0200
-+++ OpenGL-0.7006/Makefile.PL	2025-09-27 08:56:28.623030160 +0200
-@@ -642,7 +642,6 @@ sub get_defines {
-     $out = cfile_text('GL/freeglut.h', $INCS);
-     $defs .= " -DHAVE_FREEGLUT -DHAVE_FREEGLUT_H"
-       if $out =~ m|glutMainLoopEvent|;
--    $defs .= " -DGL_GLEXT_LEGACY";
-   }
-   $defs;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl-OpenGL.git/commitdiff/38f209262614e26d359beebac4f2898a2c6ca84a
    
    
More information about the pld-cvs-commit
mailing list