r49462 - in /trunk/libopengl-perl: GIT_CHANGES KNOWN_PROBLEMS META.yml Makefile.PL OpenGL.pm OpenGL.pod Release_Notes SUPPORTS debian/changelog glu_util.h glut_const.h glut_util.h test.pl utils/Makefile.macosx utils/glversion.c
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Dec 28 13:24:17 UTC 2009
Author: jawnsy-guest
Date: Mon Dec 28 13:24:09 2009
New Revision: 49462
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=49462
Log:
No need to upload, nothing affects Linux
IGNORE-VERSION: 0.62+dfsg-1
* New upstream release
Modified:
trunk/libopengl-perl/GIT_CHANGES
trunk/libopengl-perl/KNOWN_PROBLEMS
trunk/libopengl-perl/META.yml
trunk/libopengl-perl/Makefile.PL
trunk/libopengl-perl/OpenGL.pm
trunk/libopengl-perl/OpenGL.pod
trunk/libopengl-perl/Release_Notes
trunk/libopengl-perl/SUPPORTS
trunk/libopengl-perl/debian/changelog
trunk/libopengl-perl/glu_util.h
trunk/libopengl-perl/glut_const.h
trunk/libopengl-perl/glut_util.h
trunk/libopengl-perl/test.pl
trunk/libopengl-perl/utils/Makefile.macosx
trunk/libopengl-perl/utils/glversion.c
Modified: trunk/libopengl-perl/GIT_CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/GIT_CHANGES?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/GIT_CHANGES (original)
+++ trunk/libopengl-perl/GIT_CHANGES Mon Dec 28 13:24:09 2009
@@ -1,3 +1,40 @@
+commit 81755ec75df4ec718a3e16fc086a1213a02b211d
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date: Mon Nov 16 21:58:39 2009 -0500
+
+ Prepare for OpenGL-0.61_001 CPAN developers rel
+
+ Update version number info and the Release_Notes.
+
+ OpenGL.pm | 2 +-
+ OpenGL.pod | 2 +-
+ Release_Notes | 11 +++++++++++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+commit f54bc3ebb84114687e4749066eb9e6b7b20c4ceb
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date: Mon Nov 16 21:56:42 2009 -0500
+
+ Fix glut_const.h typos that broke some GLUT macros
+
+ The result, among other things, was that the FreeGLUT event loop
+ exit handling did not work. test.pl was broken in another way
+ so though it appeared to work correctly, it did not---just quietly
+ skipped the exit code which is why we saw no problems there.
+
+ glut_const.h | 4 ++--
+ test.pl | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 061a2c1d52bd6516c20122168d1bd121c88a5532
+Author: Chris Marshall <devel.chm.01 at gmail.com>
+Date: Mon Nov 9 21:52:18 2009 -0500
+
+ Update META.yml for OpenGL-0.61 release
+
+ META.yml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
commit b3832c9295cf6ed2ddaf1cb3f99b8b49178cb643
Author: Chris Marshall <devel.chm.01 at gmail.com>
Date: Mon Nov 9 21:44:52 2009 -0500
Modified: trunk/libopengl-perl/KNOWN_PROBLEMS
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/KNOWN_PROBLEMS?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/KNOWN_PROBLEMS (original)
+++ trunk/libopengl-perl/KNOWN_PROBLEMS Mon Dec 28 13:24:09 2009
@@ -1,20 +1,15 @@
* 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.
+ GLUT will not work with PDL-2.4.6.
* 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.
-
* ActiveState automated PPM builds currently fail due to
what appears to be interface detection failures in their
build environment. You'll need to use another PPM site
Modified: trunk/libopengl-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/META.yml?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/META.yml (original)
+++ trunk/libopengl-perl/META.yml Mon Dec 28 13:24:09 2009
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: OpenGL
-version: 0.61
+version: 0.62
abstract: ~
license: ~
author:
Modified: trunk/libopengl-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/Makefile.PL?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/Makefile.PL (original)
+++ trunk/libopengl-perl/Makefile.PL Mon Dec 28 13:24:09 2009
@@ -120,6 +120,7 @@
-L/usr/X11R6/lib
-L/usr/local/lib
-L/usr/openwin/lib
+ -L/opt/csw/lib
};
our @check_libs = qw
@@ -415,24 +416,22 @@
$OPTS = "/ogity /GDs";
}
- $EXES = ['FreeGLUT/freeglut.dll'];
-
- # This is a suggested fix for the problem of EXE_FILES being intended for perl scripts
- # and *not* binaries as is being done above. This needs to be modified to take place
- # at install time or some such... a work around would be to replace line 418 with this
- # code block:
+ # Using a dll as EXES is incorrect for EU::MM, since the EXES here mean
+ # perl scripts and not windows binaries or DLLs. This puts the DLL in
+ # blib/bin from whence it should be installed correctly. It is not
+ # clear that this step is even needed since the freeglut.dll is installed
+ # by this Makefile.PL if no FreeGLUT is found.
#
- # {
- # system $^X , qw[-MExtUtils::Command -e mkpath --], qw[blib/bin];
- # system $^X , qw[-MExtUtils::Command -e cp --], qw[FreeGLUT/freeglut.dll blib/bin/freeglut.dll];
- # }
-
-
+ ## $EXES = ['FreeGLUT/freeglut.dll'];
+ {
+ system $^X , qw[-MExtUtils::Command -e mkpath --], qw[blib/bin];
+ system $^X , qw[-MExtUtils::Command -e cp --], qw[FreeGLUT/freeglut.dll blib/bin/freeglut.dll];
+ }
}
elsif ($interface_lib eq 'AGL') # Mac OS X
{
- $INCS = '-Iinclude -I/usr/X11/include';
+ $INCS = ""; # no include flags required: Apple gcc will automatically pick up the system frameworks
$DEFS .= " -DHAVE_AGL_GLUT"; # So we know we have glutWMCloseFunc() and glutCheckLoop()
$DYNS = { OTHERLDFLAGS => "-framework OpenGL -framework GLUT" };
}
@@ -461,6 +460,7 @@
-I/usr/X11R6/include
-I/usr/local/include
-I/usr/openwin/include
+ -I/opt/csw/include
};
$INCS = "@includes";
Modified: trunk/libopengl-perl/OpenGL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/OpenGL.pm?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/OpenGL.pm (original)
+++ trunk/libopengl-perl/OpenGL.pm Mon Dec 28 13:24:09 2009
@@ -11,7 +11,7 @@
use Carp;
-$VERSION = '0.61';
+$VERSION = '0.62';
$BUILD_VERSION = $XS_VERSION = $VERSION;
$VERSION = eval($VERSION);
@@ -1123,13 +1123,9 @@
@glu_func = qw(
gluBeginCurve
- gluEndCurve
gluBeginPolygon
- gluEndPolygon
gluBeginSurface
- gluEndSurface
gluBeginTrim
- gluEndTrim
gluBuild1DMipmaps_c
gluBuild1DMipmaps_s
gluBuild2DMipmaps_c
@@ -1139,9 +1135,14 @@
gluDeleteQuadric
gluDeleteTess
gluDisk
+ gluEndCurve
+ gluEndPolygon
+ gluEndSurface
+ gluEndTrim
gluErrorString
gluGetNurbsProperty_p
gluGetString
+ gluGetTessProperty_p
gluLoadSamplingMatrices_p
gluLookAt
gluNewNurbsRenderer
@@ -1162,142 +1163,141 @@
gluQuadricTexture
gluScaleImage_s
gluSphere
- gluGetTessProperty_p
gluTessBeginCountour
+ gluTessBeginPolygon
+ gluTessCallback
gluTessEndContour
- gluTessBeginPolygon
gluTessEndPolygon
gluTessNormal
gluTessProperty
- gluTessCallback
gluTessVertex
gluUnProject_p
);
@glut_func = qw(
- glutInit
done_glutInit
- glutInitWindowSize
- glutInitWindowPosition
- glutInitDisplayMode
- glutMainLoop
- glutCreateWindow
- glutCreateSubWindow
- glutSetWindow
- glutGetWindow
- glutDestroyWindow
- glutPostRedisplay
- glutSwapBuffers
- glutPositionWindow
- glutReshapeWindow
- glutFullScreen
- glutPopWindow
- glutPushWindow
- glutShowWindow
- glutHideWindow
- glutIconifyWindow
- glutSetWindowTitle
- glutSetIconTitle
- glutSetCursor
- glutEstablishOverlay
- glutUseLayer
- glutRemoveOverlay
- glutPostOverlayRedisplay
- glutShowOverlay
- glutHideOverlay
- glutCreateMenu
- glutSetMenu
- glutGetMenu
- glutDestroyMenu
glutAddMenuEntry
glutAddSubMenu
- glutChangeToMenuEntry
- glutChangeToSubMenu
- glutRemoveMenuItem
glutAttachMenu
- glutDetachMenu
- glutDisplayFunc
- glutOverlayDisplayFunc
- glutReshapeFunc
- glutKeyboardFunc
- glutKeyboardUpFunc
- glutMouseFunc
- glutMotionFunc
- glutPassiveMotionFunc
- glutVisibilityFunc
- glutWindowStatusFunc
- glutEntryFunc
- glutSpecialFunc
- glutSpecialUpFunc
- glutSpaceballMotionFunc
- glutSpaceballRotateFunc
- glutSpaceballButtonFunc
- glutButtonBoxFunc
- glutDialsFunc
- glutTabletMotionFunc
- glutTabletButtonFunc
- glutMenuStatusFunc
- glutMenuStateFunc
- glutIdleFunc
- glutTimerFunc
- glutSetColor
- glutGetColor
- glutCopyColormap
- glutGet
- glutLayerGet
- glutDeviceGet
- glutGetModifiers
- glutExtensionSupported
glutBitmapCharacter
- glutStrokeCharacter
- glutBitmapWidth
- glutStrokeWidth
- glutSolidSphere
- glutWireSphere
- glutSolidCube
- glutWireCube
- glutSolidCone
- glutWireCone
- glutSolidTorus
- glutWireTorus
- glutSolidDodecahedron
- glutWireDodecahedron
- glutSolidOctahedron
- glutWireOctahedron
- glutSolidTetrahedron
- glutWireTetrahedron
- glutSolidIcosahedron
- glutWireIcosahedron
- glutSolidTeapot
- glutWireTeapot
- glutSetOption
- glutGameModeString
- glutEnterGameMode
- glutLeaveGameMode
- glutGameModeGet
- glutCloseFunc
- glutLeaveMainLoop
- glutIgnoreKeyRepeat
- glutSetKeyRepeat
- glutForceJoystickFunc
glutBitmapHeight
glutBitmapLength
glutBitmapString
+ glutBitmapWidth
+ glutButtonBoxFunc
+ glutChangeToMenuEntry
+ glutChangeToSubMenu
+ glutCloseFunc
+ glutCopyColormap
+ glutCreateMenu
+ glutCreateSubWindow
+ glutCreateWindow
+ glutDestroyMenu
+ glutDestroyWindow
+ glutDetachMenu
+ glutDeviceGet
+ glutDialsFunc
+ glutDisplayFunc
+ glutEnterGameMode
+ glutEntryFunc
+ glutEstablishOverlay
+ glutExtensionSupported
+ glutForceJoystickFunc
+ glutFullScreen
+ glutGameModeGet
+ glutGameModeString
+ glutGet
+ glutGetColor
+ glutGetMenu
+ glutGetModifiers
+ glutGetWindow
+ glutHideOverlay
+ glutHideWindow
+ glutIconifyWindow
+ glutIdleFunc
+ glutIgnoreKeyRepeat
+ glutInit
+ glutInitDisplayMode
glutInitDisplayString
+ glutInitWindowPosition
+ glutInitWindowSize
+ glutKeyboardFunc
+ glutKeyboardUpFunc
+ glutLayerGet
+ glutLeaveGameMode
+ glutLeaveMainLoop
+ glutMainLoop
glutMainLoopEvent
glutMenuDestroyFunc
+ glutMenuStateFunc
+ glutMenuStatusFunc
+ glutMotionFunc
+ glutMouseFunc
glutMouseWheelFunc
+ glutOverlayDisplayFunc
+ glutPassiveMotionFunc
+ glutPopWindow
+ glutPositionWindow
+ glutPostOverlayRedisplay
+ glutPostRedisplay
glutPostWindowOverlayRedisplay
glutPostWindowRedisplay
+ glutPushWindow
+ glutRemoveMenuItem
+ glutRemoveOverlay
glutReportErrors
+ glutReshapeFunc
+ glutReshapeWindow
+ glutSetColor
+ glutSetCursor
+ glutSetIconTitle
+ glutSetKeyRepeat
+ glutSetMenu
+ glutSetOption
+ glutSetWindow
+ glutSetWindowTitle
+ glutShowOverlay
+ glutShowWindow
+ glutSolidCone
+ glutSolidCube
glutSolidCylinder
+ glutSolidDodecahedron
+ glutSolidIcosahedron
+ glutSolidOctahedron
glutSolidRhombicDodecahedron
+ glutSolidSphere
+ glutSolidTeapot
+ glutSolidTetrahedron
+ glutSolidTorus
+ glutSpaceballButtonFunc
+ glutSpaceballMotionFunc
+ glutSpaceballRotateFunc
+ glutSpecialFunc
+ glutSpecialUpFunc
+ glutStrokeCharacter
glutStrokeHeight
glutStrokeLength
glutStrokeString
+ glutStrokeWidth
+ glutSwapBuffers
+ glutTabletButtonFunc
+ glutTabletMotionFunc
+ glutTimerFunc
+ glutUseLayer
+ glutVisibilityFunc
glutWarpPointer
+ glutWindowStatusFunc
+ glutWireCone
+ glutWireCube
glutWireCylinder
+ glutWireDodecahedron
+ glutWireIcosahedron
+ glutWireOctahedron
glutWireRhombicDodecahedron
+ glutWireSphere
+ glutWireTeapot
+ glutWireTetrahedron
+ glutWireTorus
);
##------------------------------------------------------------------------
Modified: trunk/libopengl-perl/OpenGL.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/OpenGL.pod?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/OpenGL.pod (original)
+++ trunk/libopengl-perl/OpenGL.pod Mon Dec 28 13:24:09 2009
@@ -1,7 +1,7 @@
=head1 NAME
-OpenGL - v0.61
+OpenGL - v0.62
=head1 SYNOPSIS
@@ -66,10 +66,14 @@
=head2 GLUT functions
+ done_glutInit
glutAddMenuEntry
glutAddSubMenu
glutAttachMenu
glutBitmapCharacter
+ glutBitmapHeight
+ glutBitmapLength
+ glutBitmapString
glutBitmapWidth
glutButtonBoxFunc
glutChangeToMenuEntry
@@ -105,6 +109,7 @@
glutIgnoreKeyRepeat
glutInit
glutInitDisplayMode
+ glutInitDisplayString
glutInitWindowPosition
glutInitWindowSize
glutKeyboardFunc
@@ -113,19 +118,25 @@
glutLeaveGameMode
glutLeaveMainLoop
glutMainLoop
+ glutMainLoopEvent
+ glutMenuDestroyFunc
glutMenuStateFunc
glutMenuStatusFunc
glutMotionFunc
glutMouseFunc
+ glutMouseWheelFunc
glutOverlayDisplayFunc
glutPassiveMotionFunc
glutPopWindow
glutPositionWindow
glutPostOverlayRedisplay
glutPostRedisplay
+ glutPostWindowOverlayRedisplay
+ glutPostWindowRedisplay
glutPushWindow
glutRemoveMenuItem
glutRemoveOverlay
+ glutReportErrors
glutReshapeFunc
glutReshapeWindow
glutSetColor
@@ -140,9 +151,11 @@
glutShowWindow
glutSolidCone
glutSolidCube
+ glutSolidCylinder
glutSolidDodecahedron
glutSolidIcosahedron
glutSolidOctahedron
+ glutSolidRhombicDodecahedron
glutSolidSphere
glutSolidTeapot
glutSolidTetrahedron
@@ -153,6 +166,9 @@
glutSpecialFunc
glutSpecialUpFunc
glutStrokeCharacter
+ glutStrokeHeight
+ glutStrokeLength
+ glutStrokeString
glutStrokeWidth
glutSwapBuffers
glutTabletButtonFunc
@@ -160,12 +176,15 @@
glutTimerFunc
glutUseLayer
glutVisibilityFunc
+ glutWarpPointer
glutWindowStatusFunc
glutWireCone
glutWireCube
+ glutWireCylinder
glutWireDodecahedron
glutWireIcosahedron
glutWireOctahedron
+ glutWireRhombicDodecahedron
glutWireSphere
glutWireTeapot
glutWireTetrahedron
@@ -1235,7 +1254,7 @@
GLX is only supported to the degree that Stan's original module supported
it. Without an entire X binding it is of limited use, and I recommend using
-glut instead.
+GLUT/FreeGLUT instead.
XPending
glXSwapBuffers
@@ -1898,7 +1917,7 @@
CPAN: http://search.cpan.org/~chm/
-GIT: TBD
+GIT: git://pdl.git.sourceforge.net/gitroot/pdl/pogl (Read only)
SVN: TBD
Modified: trunk/libopengl-perl/Release_Notes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/Release_Notes?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/Release_Notes (original)
+++ trunk/libopengl-perl/Release_Notes Mon Dec 28 13:24:09 2009
@@ -1,3 +1,36 @@
++------------------------------------------------------------------------+
+| OpenGL-0.62 Release Notes |
++------------------------------------------------------------------------+
+
+ Highlights:
+
+ * Improved build support for Solaris OpenGL and FreeGLUT libraries.
+
+ * Corrected install for win32 DLL.
+
+ * Fixed build for AGL to only use AGL, not X11 on Mac OS X.
+
+ * Fixed _have_freeglut() checks in test.pl and elsewhere.
+
+ * Fix glut_const.h typos that broke some GLUT macros. Exiting
+ the FreeGLUT event loop should work.
+
+ Please see the GIT_CHANGES file for more details. Thanks.
+
+
+
++------------------------------------------------------------------------+
+| OpenGL-0.61_001 Release Notes |
++------------------------------------------------------------------------+
+
+ * Developers release to check out fix for FreeGLUT constants
+ definitions and some include typos that caused them. If this
+ tests ok on CPAN Testers, it will become the stable release.
+
+ * The fix means that exiting the FreeGLUT event loop should work.
+
+
+
+------------------------------------------------------------------------+
| OpenGL-0.61 Release Notes |
+------------------------------------------------------------------------+
Modified: trunk/libopengl-perl/SUPPORTS
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/SUPPORTS?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/SUPPORTS (original)
+++ trunk/libopengl-perl/SUPPORTS Mon Dec 28 13:24:09 2009
@@ -1,3 +1,14 @@
+ 0.62 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.61 This file is still not up to date with the current code.
POGL builds "out of the box" on more system types
Modified: trunk/libopengl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/debian/changelog?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/debian/changelog (original)
+++ trunk/libopengl-perl/debian/changelog Mon Dec 28 13:24:09 2009
@@ -1,3 +1,12 @@
+libopengl-perl (0.62+dfsg-1) UNRELEASED; urgency=low
+
+ No need to upload, nothing affects Linux
+ IGNORE-VERSION: 0.62+dfsg-1
+
+ * New upstream release
+
+ -- Jonathan Yu <jawnsy at cpan.org> Mon, 28 Dec 2009 08:12:46 -0500
+
libopengl-perl (0.61+dfsg-1) unstable; urgency=low
* New upstream release
Modified: trunk/libopengl-perl/glu_util.h
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/glu_util.h?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/glu_util.h (original)
+++ trunk/libopengl-perl/glu_util.h Mon Dec 28 13:24:09 2009
@@ -1,4 +1,8 @@
+#if defined(HAVE_AGL_GLUT)
+#include <OpenGL/glu.h>
+#else
#include <GL/glu.h>
+#endif
#ifndef GLU_VERSION_1_0
#define GLU_VERSION_1_0 1
Modified: trunk/libopengl-perl/glut_const.h
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/glut_const.h?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/glut_const.h (original)
+++ trunk/libopengl-perl/glut_const.h Mon Dec 28 13:24:09 2009
@@ -54,7 +54,7 @@
i(GLUT_MENU_IN_USE)
i(GLUT_NOT_VISIBLE)
i(GLUT_VISIBLE)
-#if GLU_API_VERSION >= 4
+#if GLUT_API_VERSION >= 4
i(GLUT_HIDDEN)
i(GLUT_FULLY_RETAINED)
i(GLUT_PARTIALLY_RETAINED)
@@ -179,7 +179,7 @@
i(GLUT_GAME_MODE_REFRESH_RATE)
i(GLUT_GAME_MODE_DISPLAY_CHANGED)
#endif
-#ifdef HAVE_FREEEGLUT
+#ifdef HAVE_FREEGLUT
/* FreeGLUT Constants */
i(GLUT_INIT_STATE)
i(GLUT_WINDOW_FORMAT_ID)
Modified: trunk/libopengl-perl/glut_util.h
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/glut_util.h?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/glut_util.h (original)
+++ trunk/libopengl-perl/glut_util.h Mon Dec 28 13:24:09 2009
@@ -1,9 +1,19 @@
#if defined(HAVE_FREEGLUT) && (defined(_WIN32) || defined(HAVE_W32API))
+
#include "./include/GL/freeglut.h"
+
#elif defined(HAVE_FREEGLUT_H)
+
#include <GL/freeglut.h>
+
+#else
+
+#if defined(HAVE_AGL_GLUT)
+#include <GLUT/glut.h>
#else
#include <GL/glut.h>
+#endif
+
#define GLUT_ACTION_EXIT 0
#define GLUT_ACTION_GLUTMAINLOOP_RETURNS 1
#define GLUT_ACTION_CONTINUE_EXECUTION 2
@@ -19,4 +29,5 @@
#define GLUT_VERSION 0x01FC
#define GLUT_RENDERING_CONTEXT 0x01FD
#define GLUT_DIRECT_RENDERING 0x01FE
+
#endif
Modified: trunk/libopengl-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/test.pl?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/test.pl (original)
+++ trunk/libopengl-perl/test.pl Mon Dec 28 13:24:09 2009
@@ -1220,7 +1220,7 @@
elsif ($c eq 'K')
{
# ignore keypress if not FreeGLUT
- glutLeaveMainLoop() if $OpenGL::_have_freeglut;
+ glutLeaveMainLoop() if OpenGL::_have_freeglut();
}
elsif ($c eq 'L')
{
@@ -1582,7 +1582,7 @@
#glutPassiveMotionFunc(\&cbMouseTrack);
# Handle window close events.
-glutCloseFunc(\&cbClose) if $OpenGL::_have_freeglut;
+glutCloseFunc(\&cbClose) if OpenGL::_have_freeglut();
# OK, OpenGL's ready to go. Let's call our own init function.
ourInit($Window_Width, $Window_Height);
@@ -1602,7 +1602,7 @@
# Pass off control to OpenGL.
# Above functions are called as appropriate.
-if ($OpenGL::_have_freeglut) {
+if (OpenGL::_have_freeglut()) {
glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_GLUTMAINLOOP_RETURNS)
}
Modified: trunk/libopengl-perl/utils/Makefile.macosx
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/utils/Makefile.macosx?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/utils/Makefile.macosx (original)
+++ trunk/libopengl-perl/utils/Makefile.macosx Mon Dec 28 13:24:09 2009
@@ -3,7 +3,7 @@
CC=cc
# Should not be using local includes on non-win32 systems
# CCFLAGS=-I/usr/X11/include -I../include
-CCFLAGS=-I/usr/X11/include
+CCFLAGS= # no includes needed, Apple GCC will automatically pick up system frameworks
LINK=cc
LDFLAGS=-framework AGL -framework OpenGL -framework GLUT
@@ -21,5 +21,5 @@
${LINK} ${LDFLAGS} -o $@ $<
chmod u+x $@
-%.o: %.c Makefile
+%.o: %.c
${CC} ${CCFLAGS} -c $<
Modified: trunk/libopengl-perl/utils/glversion.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libopengl-perl/utils/glversion.c?rev=49462&op=diff
==============================================================================
--- trunk/libopengl-perl/utils/glversion.c (original)
+++ trunk/libopengl-perl/utils/glversion.c Mon Dec 28 13:24:09 2009
@@ -10,7 +10,15 @@
#else
+#ifdef __APPLE__
+/* NB: not ideal -- this assumes that we always build with AGL interface on Mac OS X
+ * Ideally, the flag HAVE_AGL_GLUT should be set appropriately by Makefile.PL when building glversion
+ * and used to check here, but this will require substantial changes to the get_extensions() there
+ */
+#include <GLUT/glut.h>
+#else
#include <GL/glut.h>
+#endif
#endif
More information about the Pkg-perl-cvs-commits
mailing list