r46250 - in /branches/upstream/libopengl-perl/current: GIT_CHANGES KNOWN_PROBLEMS META.yml OpenGL.pm OpenGL.pod README Release_Notes SUPPORTS TODO glut_const.h glut_util.h pogl_const.xs pogl_glut.xs

mxey-guest at users.alioth.debian.org mxey-guest at users.alioth.debian.org
Fri Oct 23 14:11:35 UTC 2009


Author: mxey-guest
Date: Fri Oct 23 14:11:29 2009
New Revision: 46250

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46250
Log:
[svn-upgrade] Integrating new upstream version, libopengl-perl (0.60+dfsg)

Modified:
    branches/upstream/libopengl-perl/current/GIT_CHANGES
    branches/upstream/libopengl-perl/current/KNOWN_PROBLEMS
    branches/upstream/libopengl-perl/current/META.yml
    branches/upstream/libopengl-perl/current/OpenGL.pm
    branches/upstream/libopengl-perl/current/OpenGL.pod
    branches/upstream/libopengl-perl/current/README
    branches/upstream/libopengl-perl/current/Release_Notes
    branches/upstream/libopengl-perl/current/SUPPORTS
    branches/upstream/libopengl-perl/current/TODO
    branches/upstream/libopengl-perl/current/glut_const.h
    branches/upstream/libopengl-perl/current/glut_util.h
    branches/upstream/libopengl-perl/current/pogl_const.xs
    branches/upstream/libopengl-perl/current/pogl_glut.xs

Modified: branches/upstream/libopengl-perl/current/GIT_CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/GIT_CHANGES?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/GIT_CHANGES (original)
+++ branches/upstream/libopengl-perl/current/GIT_CHANGES Fri Oct 23 14:11:29 2009
@@ -1,3 +1,83 @@
+commit 704670ffd8d7de232551970d6dde66834fbda509
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date:   Mon Oct 19 13:19:03 2009 -0400
+
+    Final OpenGL-0.60 releaes fixes
+
+ KNOWN_PROBLEMS |   26 +++++++++++++++++++++++++-
+ OpenGL.pm      |    2 +-
+ OpenGL.pod     |    2 +-
+ README         |    2 +-
+ Release_Notes  |    6 +++---
+ SUPPORTS       |   12 +++++++++++-
+ TODO           |   14 ++++----------
+ glut_util.h    |    2 ++
+ 8 files changed, 48 insertions(+), 18 deletions(-)
+
+commit 380232c244c56be74fb39da5fd8496084c2041eb
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date:   Fri Oct 16 17:47:57 2009 -0400
+
+    Update VERSION and readme-type information
+
+ KNOWN_PROBLEMS |   11 ++++++++---
+ OpenGL.pm      |    2 +-
+ OpenGL.pod     |    2 +-
+ Release_Notes  |    3 ++-
+ TODO           |    3 ++-
+ 5 files changed, 14 insertions(+), 7 deletions(-)
+
+commit 56a847436c9e452c1b178879e4a5a48f1175d1f0
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date:   Fri Oct 16 10:28:12 2009 -0400
+
+    Fixed freeglut font not found error
+    
+    The problem was the macro to generate the font
+    ID constants was coercing the type to int before
+    calling newSViv() which broke things if the
+    value being generated was a pointer on a 64-bit
+    system with ints defined as 4byte quantities.
+
+ OpenGL.pm     |    2 +-
+ OpenGL.pod    |    2 +-
+ glut_const.h  |   18 +++++++++---------
+ pogl_const.xs |    3 ++-
+ pogl_glut.xs  |    8 ++++----
+ 5 files changed, 17 insertions(+), 16 deletions(-)
+
+commit f22bf1b4ece04ed9c84a96dcdb46e8ad0126a0b1
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date:   Thu Oct 15 14:11:01 2009 -0400
+
+    Start 0.59_001 developers release
+    
+    It looks like another OpenGL release will be needed to
+    resolve build issues for GLUT only systems and for
+    platforms with both GLUT and FreeGLUT present to ensure
+    that FreeGLUT is used for the module build/compile/test.
+
+ OpenGL.pm  |    2 +-
+ OpenGL.pod |    2 +-
+ TODO       |    5 ++++-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 21b377d17d89a976a33a51f9048322c7b7899b92
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date:   Thu Oct 15 14:05:08 2009 -0400
+
+    Add HAVE_FREEGLUT to skip if GLUT only
+    
+    Problems building POGL have been reported for systems
+    when GLUT is being used instead of FreeGLUT for two reasons:
+    (1) FreeGLUT is not installed in which case we would like the
+    build to work but perhaps with less capability, or (2) both
+    GLUT and FreeGLUT are available but the wrong include file is
+    being used (i.e. glut.h instead of freeglut.h).
+
+ glut_const.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
 commit 432033682a7ec79e3066417c795cc2ae72893821
 Author: Chris Marshall <devel.chm.01 at gmail.com>
 Date:   Mon Oct 5 16:18:38 2009 -0400

Modified: branches/upstream/libopengl-perl/current/KNOWN_PROBLEMS
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/KNOWN_PROBLEMS?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/KNOWN_PROBLEMS (original)
+++ branches/upstream/libopengl-perl/current/KNOWN_PROBLEMS Fri Oct 23 14:11:29 2009
@@ -1,3 +1,27 @@
+* Build may not complete if you do not have the
+  required FreeGLUT or Apple GLUT (on Mac OS X systems).
+  While this is not a bug, we would like to enable as
+  much GLUT compatibility as possible.
+
+  NOTE: PDL::Graphics::TriD does require either FreeGLUT
+  or Apple GLUT to function.  An OpenGL using plain old
+  GLUT will not work at the moment.
+
+* On one Mac OS system, glutBitmapCharacter() appears to 
+  to be rendering into the Overlay.  This makes text and
+  legends always on top, even if the glRasterPos() was
+  set with depth.
+  
+  If you see this with PDL::Graphics::TriD, please report.
+  We need help debugging.  Thanks.
+
+* The build may fail if your FreeGLUT installation uses
+  freeglut.h as the name of its include file.  This may
+  happen if you have both original GLUT and FreeGLUT on
+  the same system.  Edit the Makefile produced and add
+  -DHAVE_FREEGLUT_H to the DEFINE = line and things may
+  compile then.
+
 * Configuration and compiling requires an active OpenGL
   context (e.g. a display)
 
@@ -6,13 +30,18 @@
   are in a state of flux and may not be in sync with the
   current API documentation.
 
-* W32API and WGL interface options do not currently work
-  with cygwin.  FreeGLUT does work but using the Mesa SW
-  renderer.
+* The Cygwin interface options W32API and WGL do not work
+  so you don't get hardware accelerated graphics.  The
+  FreeGLUT code does work but uses the Mesa software renderer.
 
 * Too many "extra" variants of standard OpenGL functions.
   Implementation progress with PDL has suggested a way
   to simplify the bindings a la OpenGL::Simple.  TBD.
+
+* examples/planets:  works but has visual artifacts
+  examples/tk_steal: runs but maybe not correctly 
+
+*  Examples using GLX calls need to be ported to GLUT
 
 * Some of the functions taking pointer type arguments
   have inconsistent usage for the gl*_p() variants:

Modified: branches/upstream/libopengl-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/META.yml?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/META.yml (original)
+++ branches/upstream/libopengl-perl/current/META.yml Fri Oct 23 14:11:29 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                OpenGL
-version:             0.59
+version:             0.60
 abstract:            ~
 license:             ~
 author:              

Modified: branches/upstream/libopengl-perl/current/OpenGL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/OpenGL.pm?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/OpenGL.pm (original)
+++ branches/upstream/libopengl-perl/current/OpenGL.pm Fri Oct 23 14:11:29 2009
@@ -11,7 +11,7 @@
 
 use Carp;
 
-$VERSION = '0.59';
+$VERSION = '0.60';
 $BUILD_VERSION = $XS_VERSION = $VERSION;
 $VERSION = eval($VERSION);
 

Modified: branches/upstream/libopengl-perl/current/OpenGL.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/OpenGL.pod?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/OpenGL.pod (original)
+++ branches/upstream/libopengl-perl/current/OpenGL.pod Fri Oct 23 14:11:29 2009
@@ -1,7 +1,7 @@
 
 =head1 NAME
 
-OpenGL - v0.59
+OpenGL - v0.60
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libopengl-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/README?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/README (original)
+++ branches/upstream/libopengl-perl/current/README Fri Oct 23 14:11:29 2009
@@ -24,7 +24,7 @@
 this default.
 
 
-NOTE: POGL automatically installs a binary FreeGLUT library on Windows.
+NOTE: POGL automatically installs a binary FreeGLUT library on win32.
 
 
 POGL provides access to most of the OpenGL 1.0, 1.1, and 1.2 APIs, and

Modified: branches/upstream/libopengl-perl/current/Release_Notes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/Release_Notes?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/Release_Notes (original)
+++ branches/upstream/libopengl-perl/current/Release_Notes Fri Oct 23 14:11:29 2009
@@ -1,5 +1,5 @@
 +------------------------------------------------------------------------+
-|                      OpenGL-0.59 Release Notes                         |
+|                      OpenGL-0.60 Release Notes                         |
 +------------------------------------------------------------------------+
 
   * Now builds out of the box on many linux, PC, and Mac OS X systems
@@ -15,9 +15,9 @@
     A number of bugs stomped.
     
   * Improved linux/GLX+X11 build support control although FreeGLUT or
-    GLUT(on Mac OS X) is preferred.
+    GLUT(on Mac OS X) is preferred for full functionality.
     
-  * Fix MinGW detection logic for ActivePerl configurations
+  * Fixed MinGW detection logic for ActivePerl configurations
     
   * Code clean up and bugs fixed.  Many were discovered as a result of
     the reconcilliation with PDL::Graphics::OpenGL requirements.
@@ -33,3 +33,4 @@
     
   * The test.pl demo program now works more robustly.
 
+  * The mysterious freeglut font ... not found bug has been fixed!

Modified: branches/upstream/libopengl-perl/current/SUPPORTS
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/SUPPORTS?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/SUPPORTS (original)
+++ branches/upstream/libopengl-perl/current/SUPPORTS Fri Oct 23 14:11:29 2009
@@ -1,4 +1,14 @@
-    0.59 This file is still not up to date with the current code.
+    0.60 This file is still not up to date with the current code.
+
+         POGL builds "out of the box" on more system types
+	 than ever, including: Linux, MSWin32, and Mac OS X.
+
+	 Used by PDL-2.4.5 to implement 3D graphics and plots.
+
+	 TBD: generate a more complete/specific list
+
+    ----------------------------------------------------------
+    0.59 This file is not up to date with the current code.
 
          POGL builds "out of the box" on more system types
 	 than ever, including: Linux, MSWin32, and Mac OS X.

Modified: branches/upstream/libopengl-perl/current/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/TODO?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/TODO (original)
+++ branches/upstream/libopengl-perl/current/TODO Fri Oct 23 14:11:29 2009
@@ -1,10 +1,4 @@
-Last saved: Sat 26 Sep 2009 10:18:20 PM
-
-
-Clarify FreeGLUT/GLUT requirments wording
-    * make explicit what you get by OS
-    * add information on installing FreeGLUT
-    * install locations (TBD)
+Last saved: Mon 19 Oct 2009 01:10:42 PM 
 
 
 Evaluate local include directory usage
@@ -51,6 +45,7 @@
         * N.B. *GLUT is on *all* GLX systems but may not use GLX
 	* Keep minimal GLX+X11 code to support Tk bindings
 	* Is Tk even being used?  Contact perl/Tk about better support.
+	* Investigate Gtk+ instead of Tk for embedding
 
 
 Fix examples/ directory
@@ -79,7 +74,7 @@
 
 
 Implement safe glutInit
-    * check if done glutInit before calling glutInit()
+    * check if done_glutInit before calling glutInit()
     * carp/croak/quiet error settings
 
 
@@ -114,11 +109,14 @@
 
 
 OpenGLUT support for building
-    * NOTE: OpenGLUT appears to be a dead project, use FreeGLUT.
+    * OpenGLUT appears to be a dead project, use FreeGLUT.
     * OpenGL support not planned at this time
 
 
 Make POGL GLUT-proof
+    * Make build work with GLUT-only and GLUT+FreeGLUT configurations
+      * GLUT-only: build and run with reduced functionality
+      * GLUT+FreeGLUT: build should correctly select and use FreeGLUT
     * Nothing should break if you have GLUT rather than FreeGLUT
         (as long as you are only using the GLUT subset of FreeGLUT)
     * Some functionality may be quietly disabled (glutMainLoop extensions)
@@ -141,7 +139,7 @@
 		* GLU
 		* GLUT
 		* GLX
-        * What bindings are actually enabled
+        * What bindings are actually enabled?
         * Use the same information to build POGL as glversion
     * Refactor Makefile.PL to be comprehensible.
         * strip out unused options

Modified: branches/upstream/libopengl-perl/current/glut_const.h
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/glut_const.h?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/glut_const.h (original)
+++ branches/upstream/libopengl-perl/current/glut_const.h Fri Oct 23 14:11:29 2009
@@ -67,16 +67,16 @@
 	i(GLUT_NORMAL)
 	i(GLUT_OVERLAY)
 #endif
-	i(GLUT_STROKE_ROMAN)
-	i(GLUT_STROKE_MONO_ROMAN)
-	i(GLUT_BITMAP_9_BY_15)
-	i(GLUT_BITMAP_8_BY_13)
-	i(GLUT_BITMAP_TIMES_ROMAN_10)
-	i(GLUT_BITMAP_TIMES_ROMAN_24)
+	p(GLUT_STROKE_ROMAN)
+	p(GLUT_STROKE_MONO_ROMAN)
+	p(GLUT_BITMAP_9_BY_15)
+	p(GLUT_BITMAP_8_BY_13)
+	p(GLUT_BITMAP_TIMES_ROMAN_10)
+	p(GLUT_BITMAP_TIMES_ROMAN_24)
 #if GLUT_API_VERSION >= 3
-	i(GLUT_BITMAP_HELVETICA_10)
-	i(GLUT_BITMAP_HELVETICA_12)
-	i(GLUT_BITMAP_HELVETICA_18)
+	p(GLUT_BITMAP_HELVETICA_10)
+	p(GLUT_BITMAP_HELVETICA_12)
+	p(GLUT_BITMAP_HELVETICA_18)
 #endif
 	i(GLUT_WINDOW_X)
 	i(GLUT_WINDOW_Y)
@@ -179,6 +179,7 @@
 	i(GLUT_GAME_MODE_REFRESH_RATE)
 	i(GLUT_GAME_MODE_DISPLAY_CHANGED)
 #endif
+#ifdef HAVE_FREEEGLUT
 	/* FreeGLUT Constants */
 	i(GLUT_INIT_STATE)
 	i(GLUT_WINDOW_FORMAT_ID)
@@ -186,6 +187,7 @@
 	i(GLUT_ACTION_GLUTMAINLOOP_RETURNS)
 	i(GLUT_ACTION_CONTINUE_EXECUTION)
 	i(GLUT_ACTION_ON_WINDOW_CLOSE)
+#endif
 	}
 	else
 #endif /* def GTK_API_VERSION */

Modified: branches/upstream/libopengl-perl/current/glut_util.h
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/glut_util.h?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/glut_util.h (original)
+++ branches/upstream/libopengl-perl/current/glut_util.h Fri Oct 23 14:11:29 2009
@@ -1,5 +1,7 @@
 #if defined(HAVE_FREEGLUT) && (defined(_WIN32) || defined(HAVE_W32API))
 #include "./include/GL/freeglut.h"
+#elif defined(HAVE_FREEGLUT_H)
+#include <GL/freeglut.h>
 #else
 #include <GL/glut.h>
 #define GLUT_ACTION_EXIT                         0

Modified: branches/upstream/libopengl-perl/current/pogl_const.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/pogl_const.xs?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/pogl_const.xs (original)
+++ branches/upstream/libopengl-perl/current/pogl_const.xs Fri Oct 23 14:11:29 2009
@@ -1,4 +1,4 @@
-/*  Last saved: Sun 06 Sep 2009 02:09:46 PM*/
+/*  Last saved: Fri 16 Oct 2009 10:25:51 AM */
 
 /*  Copyright (c) 1998 Kenneth Albanowski. All rights reserved.
  *  Copyright (c) 2007 Bob Free. All rights reserved.
@@ -42,6 +42,7 @@
 /* These macros used in neoconstant */
 #define i(test) if (strEQ(name, #test)) return newSViv((int)test);
 #define f(test) if (strEQ(name, #test)) return newSVnv((double)test);
+#define p(test) if (strEQ(name, #test)) return newSViv(PTR2IV(test));
 
 static SV *
 neoconstant(char * name, int arg)

Modified: branches/upstream/libopengl-perl/current/pogl_glut.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopengl-perl/current/pogl_glut.xs?rev=46250&op=diff
==============================================================================
--- branches/upstream/libopengl-perl/current/pogl_glut.xs (original)
+++ branches/upstream/libopengl-perl/current/pogl_glut.xs Fri Oct 23 14:11:29 2009
@@ -1,4 +1,4 @@
-/*  Last saved: Fri 02 Oct 2009 09:59:44 PM*/
+/*  Last saved: Fri 16 Oct 2009 10:11:21 AM */
 
 /*  Copyright (c) 1998 Kenneth Albanowski. All rights reserved.
  *  Copyright (c) 2007 Bob Free. All rights reserved.
@@ -1623,14 +1623,14 @@
 	const unsigned char * string
 	CODE:
 {
-#if defined HAVE_AGL_GLUT
+#if defined HAVE_FREEGLUT
+	glutBitmapString(font, string);
+#else
 	int len, i;
 	len = (int) strlen(string);
 	for (i = 0; i < len; i++) {
 		glutBitmapCharacter(font, string[i]);
 	}
-#elif defined HAVE_FREEGLUT
-	glutBitmapString(font, string);
 #endif
 }
 




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