commit 764a2d92ac52f49c2d5e8f68e8f1a13ed64e4b59
Author: Jakub Bogusz <[email protected]>
Date: Thu Jun 13 21:21:21 2024 +0200
- updated to 0.70 (as 0.7000 to avoid epoch bumps)
perl-OpenGL-build.patch | 24 +++++++++++-------------
perl-OpenGL.spec | 30 ++++++++++++++++++------------
2 files changed, 29 insertions(+), 25 deletions(-)
---
diff --git a/perl-OpenGL.spec b/perl-OpenGL.spec
index b26d55b..a00ea7b 100644
--- a/perl-OpenGL.spec
+++ b/perl-OpenGL.spec
@@ -1,23 +1,24 @@
#
# Conditional build:
-%bcond_with tests # do not perform "make test"
+%bcond_with tests # unit tests
#
Summary: OpenGL - Perl module to display 3D data using OpenGL, GLU,
GLUT, and GLX
Summary(pl.UTF-8): OpenGL - moduł Perla przedstawiający dane korzystając z
bibliotek OpenGL, GLU, GLUT i GLX
Name: perl-OpenGL
-Version: 0.6704
-Release: 10
+Version: 0.7000
+Release: 1
# same as perl
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
-Source0:
http://search.cpan.org/CPAN/authors/id/C/CH/CHM/OpenGL-%{version}.tar.gz
-# Source0-md5: 433e4f197d7200c219494a8604f3e06b
+Source0:
https://www.cpan.org/modules/by-authors/id/C/CH/CHM/OpenGL-0.70.tar.gz
+# Source0-md5: 8b651500162e9b999347a06dc0664ab6
Patch0: %{name}-build.patch
-URL: http://search.cpan.org/dist/OpenGL/
+URL: https://metacpan.org/dist/OpenGL
BuildRequires: OpenGL-devel
BuildRequires: freeglut-devel
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 1.745
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -34,7 +35,7 @@ powinien udostępniać pełne API GLUT do wersji 3. Jako
alternatywa
dla GLUT jest dostępna także niewielka część API GLX i X11.
%prep
-%setup -q -n OpenGL-%{version}
+%setup -q -n OpenGL-0.70
%patch0 -p1
%build
@@ -49,10 +50,14 @@ dla GLUT jest dostępna także niewielka część API GLX i X11.
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} pure_install \
DESTDIR=$RPM_BUILD_ROOT
+
mkdir -p $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/
+cp -p examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+# packaged as man
+%{__rm}
$RPM_BUILD_ROOT%{perl_vendorarch}/{OpenGL,OpenGL/Array,OpenGL/Tessellation}.pod
%clean
rm -rf $RPM_BUILD_ROOT
@@ -66,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{perl_vendorarch}/auto/OpenGL
%{perl_vendorarch}/auto/OpenGL/autosplit.ix
%attr(755,root,root) %{perl_vendorarch}/auto/OpenGL/*.so
-%dir %{_examplesdir}/%{name}-%{version}
-%{_mandir}/man3/*.3pm*
-%{_examplesdir}/%{name}-%{version}/*
+%{_mandir}/man3/Array.3pm*
+%{_mandir}/man3/OpenGL*.3pm*
+%{_mandir}/man3/Tessellation.3pm*
+%{_examplesdir}/%{name}-%{version}
diff --git a/perl-OpenGL-build.patch b/perl-OpenGL-build.patch
index 7e6a212..b861736 100644
--- a/perl-OpenGL-build.patch
+++ b/perl-OpenGL-build.patch
@@ -1,7 +1,6 @@
-diff -urNp -x '*.orig' OpenGL-0.6704.org/Makefile.PL OpenGL-0.6704/Makefile.PL
---- OpenGL-0.6704.org/Makefile.PL 2014-05-12 19:15:25.000000000 +0200
-+++ OpenGL-0.6704/Makefile.PL 2021-05-07 23:27:31.143268173 +0200
-@@ -596,9 +596,9 @@ my $build_config =
+--- OpenGL-0.70/Makefile.PL.orig 2016-10-08 21:11:14.000000000 +0200
++++ OpenGL-0.70/Makefile.PL 2024-06-13 06:26:41.948354647 +0200
+@@ -601,9 +601,9 @@ my $build_config =
{
FILES =>
"Config.pm ".
@@ -14,7 +13,7 @@ diff -urNp -x '*.orig' OpenGL-0.6704.org/Makefile.PL
OpenGL-0.6704/Makefile.PL
}
};
-@@ -814,6 +814,7 @@ sub get_extensions
+@@ -824,6 +824,7 @@ sub get_extensions
print "GLUT not found\n";
}
@@ -22,18 +21,17 @@ diff -urNp -x '*.orig' OpenGL-0.6704.org/Makefile.PL
OpenGL-0.6704/Makefile.PL
# 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,10 +904,12 @@ sub get_extensions
# Create gl_exclude.h
die "Unable to write to $exc_file\n" if (!open(GLEXC,">$exc_file"));
@@ -45,4 +43,4 @@ diff -urNp -x '*.orig' OpenGL-0.6704.org/Makefile.PL
OpenGL-0.6704/Makefile.PL
+=cut
# Fix GLUT flags based on results
- if ($gldata->{GLUT} > 0)
+ if ($gldata->{FREEGLUT})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl-OpenGL.git/commitdiff/764a2d92ac52f49c2d5e8f68e8f1a13ed64e4b59
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
