Author: baggins Date: Thu Jul 29 09:53:44 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 0.63 - requires freeglut-devel explicitly
---- Files affected: packages/perl-OpenGL: perl-OpenGL.spec (1.24 -> 1.25) , perl-OpenGL-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/perl-OpenGL/perl-OpenGL.spec diff -u packages/perl-OpenGL/perl-OpenGL.spec:1.24 packages/perl-OpenGL/perl-OpenGL.spec:1.25 --- packages/perl-OpenGL/perl-OpenGL.spec:1.24 Sun Jun 6 10:40:41 2010 +++ packages/perl-OpenGL/perl-OpenGL.spec Thu Jul 29 11:53:38 2010 @@ -7,20 +7,17 @@ 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.5 -Release: 8 +Version: 0.63 +Release: 1 # same as perl License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/OpenGL/OpenGL-%{version}.tar.gz -# Source0-md5: b120cb9ee4cdb4011aed2829be0110c7 -Patch0: %{name}-INC.patch -Patch1: %{name}-noGLU1.2.patch -Patch2: %{name}-constants.patch -Patch3: %{name}-link.patch -Patch4: %{name}-if_it_breaks_comment_it_out.patch +# Source0-md5: 8b18413af9a6184d01b2547781e0d027 +Patch0: %{name}-build.patch +URL: http://search.cpan.org/dist/OpenGL/ BuildRequires: OpenGL-devel -BuildRequires: OpenGL-glut-devel +BuildRequires: freeglut-devel BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -41,14 +38,12 @@ %prep %setup -q -n OpenGL-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p0 %build %{__perl} Makefile.PL \ + interface=FREEGLUT \ INSTALLDIRS=vendor + %{__make} %{?with_tests:%{__make} test} @@ -68,6 +63,8 @@ %defattr(644,root,root,755) %doc README SUPPORTS TODO COPYRIGHT %{perl_vendorarch}/OpenGL.pm +%dir %{perl_vendorarch}/OpenGL +%{perl_vendorarch}/OpenGL/Config.pm %dir %{perl_vendorarch}/auto/OpenGL %{perl_vendorarch}/auto/OpenGL/autosplit.ix %{perl_vendorarch}/auto/OpenGL/*.bs @@ -81,6 +78,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2010/07/29 09:53:38 baggins +- updated to 0.63 +- requires freeglut-devel explicitly + Revision 1.24 2010/06/06 08:40:41 arekm - release 8 ================================================================ Index: packages/perl-OpenGL/perl-OpenGL-build.patch diff -u /dev/null packages/perl-OpenGL/perl-OpenGL-build.patch:1.1 --- /dev/null Thu Jul 29 11:53:44 2010 +++ packages/perl-OpenGL/perl-OpenGL-build.patch Thu Jul 29 11:53:38 2010 @@ -0,0 +1,50 @@ +Don't check current display for extensions, build all. + +diff -up OpenGL-0.62/Makefile.PL.dist OpenGL-0.62/Makefile.PL +--- OpenGL-0.62/Makefile.PL.dist 2009-12-11 01:10:00.000000000 +0100 ++++ OpenGL-0.62/Makefile.PL 2010-01-07 13:00:26.000000000 +0100 +@@ -579,9 +579,9 @@ my $build_config = + { + FILES => + "Config.pm ". +- "utils/glversion.txt ". +- "utils/glversion$Config{exe_ext} ". +- "utils/glversion$Config{obj_ext}" ++ "utils/glversion.txt " ++ #"utils/glversion$Config{exe_ext} ". ++ #"utils/glversion$Config{obj_ext}" + } + }; + +@@ -790,6 +790,7 @@ sub get_extensions + print "GLUT not found\n"; + } + ++=cut + # Platform-specific makefiles for glversion + my $make_ver; + if ($IS_MINGW) +@@ -848,7 +849,9 @@ sub get_extensions + print "get_extensions: no extensions found in $glv_file\n" if $verbose; + return ''; + } +- ++=cut ++ use Config; ++ my $gldata = { }; + + # Parse glext_procs.h file + return '' if (!open(GLEXT,"glext_procs.h")); +@@ -867,10 +870,12 @@ sub get_extensions + + # Create gl_exclude.h + die "Unable to write to $exc_file\n" if (!open(GLEXC,">$exc_file")); ++=cut + print GLEXC "// OpenGL Extension Exclusions - may be modified before building.\n"; + 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) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-OpenGL/perl-OpenGL.spec?r1=1.24&r2=1.25&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
