r46571 - in /trunk/libopengl-perl/debian: changelog control patches/series patches/use-freeglut

mxey-guest at users.alioth.debian.org mxey-guest at users.alioth.debian.org
Sat Oct 31 09:16:01 UTC 2009


Author: mxey-guest
Date: Sat Oct 31 09:14:47 2009
New Revision: 46571

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46571
Log:
Added use-freeglut patch to notice GLUT that is actually FreeGLUT

Added:
    trunk/libopengl-perl/debian/patches/use-freeglut
Modified:
    trunk/libopengl-perl/debian/changelog
    trunk/libopengl-perl/debian/control
    trunk/libopengl-perl/debian/patches/series

Modified: trunk/libopengl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/debian/changelog?rev=46571&op=diff
==============================================================================
--- trunk/libopengl-perl/debian/changelog (original)
+++ trunk/libopengl-perl/debian/changelog Sat Oct 31 09:14:47 2009
@@ -1,3 +1,9 @@
+libopengl-perl (0.60+dfsg-2) UNRELEASED; urgency=low
+
+  * Added use-freeglut patch to notice GLUT that is actually FreeGLUT
+
+ -- Maximilian Gass <mxey at cloudconnected.org>  Sat, 31 Oct 2009 09:48:28 +0100
+
 libopengl-perl (0.60+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libopengl-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/debian/control?rev=46571&op=diff
==============================================================================
--- trunk/libopengl-perl/debian/control (original)
+++ trunk/libopengl-perl/debian/control Sat Oct 31 09:14:47 2009
@@ -1,9 +1,9 @@
 Source: libopengl-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7), perl, 
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7), perl,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libxmu-dev,
- freeglut3-dev | libglut-dev, libxi-dev, libx11-dev
+ freeglut3-dev, libxi-dev, libx11-dev
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: gregor herrmann <gregoa at debian.org>, Gunnar Wolf <gwolf at debian.org>,
  Niko Tyni <ntyni at iki.fi>, Damyan Ivanov <dmn at debian.org>,

Modified: trunk/libopengl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/debian/patches/series?rev=46571&op=diff
==============================================================================
--- trunk/libopengl-perl/debian/patches/series (original)
+++ trunk/libopengl-perl/debian/patches/series Sat Oct 31 09:14:47 2009
@@ -2,3 +2,4 @@
 glext_procs-replacement
 examples-perl-path
 use-systems-gl
+use-freeglut

Added: trunk/libopengl-perl/debian/patches/use-freeglut
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/debian/patches/use-freeglut?rev=46571&op=file
==============================================================================
--- trunk/libopengl-perl/debian/patches/use-freeglut (added)
+++ trunk/libopengl-perl/debian/patches/use-freeglut Sat Oct 31 09:14:47 2009
@@ -1,0 +1,25 @@
+Description: Notice that -lglut is actually FreeGLUT
+Author: Henning Glawe <glaweh at debian.org>
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -476,6 +476,19 @@
+     print "GLX not found (neither library, nor headers).";
+   }
+ 
++  # Test for obfuscated Freeglut
++  # quite often Freeglut is in -lglut...  Test for GL/freeglut.h instead...
++  my $out = cfile_text('GL/freeglut.h');
++
++  # The cpp would not let this macro through. Check for something else
++  # that still exists after the cpp pass. a typedef, or type would work
++  my $has_freeglut = ($out =~ m|glutMainLoopEvent|);
++
++  if ($has_freeglut)
++  {
++    $DEFS .= " -DHAVE_FREEGLUT_H -DHAVE_FREEGLUT";
++    $found_libs->{FREEGLUT}="glut" unless ($found_libs->{FREEGLUT});
++  }
+ 
+   # Marshall libs
+   my $libs = ' -l'.join(' -l',values(%$found_libs));




More information about the Pkg-perl-cvs-commits mailing list