[csw-devel] SF.net SVN: gar:[11065] csw/mgar/pkg/freeglut/trunk

[dmichelsen at users.sourceforge.net]

Revision: 11065
          http://gar.svn.sourceforge.net/gar/?rev=11065&view=rev
Author:   dmichelsen
Date:     2010-09-28 12:18:50 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
freeglut: Use SUNW x11 again and add more patches

Modified Paths:
--------------
    csw/mgar/pkg/freeglut/trunk/Makefile
    csw/mgar/pkg/freeglut/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-28 12:03:51 UTC (rev 11064)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-28 12:18:50 UTC (rev 11065)
@@ -8,8 +8,10 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Add-support-for-Sun.patch
 
+PATCHFILES  = 0001-Add-support-for-Sun.patch
+PATCHFILES += 0002-Fix-windows-line-ending-and-wrong-endif.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -17,23 +19,13 @@
 
 DEP_PKGS = CSWmesa
 
-# If we put the include into CPPFLAGS it is too ear\xC3ly in the commandline
+# If we put the include into CPPFLAGS it is too early in the commandline
 # and the installed headers take precedence over the newly built.
 CPPFLAGS =
-EXTRA_CFLAGS = -I/opt/csw/include
+EXTRA_CFLAGS = -I/opt/csw/include -DSUN_OGL_NO_VERTEX_MACROS
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
-# Drop after CSWmesa has been rebuild against CSW X11
-# Drats, doesn't work here. Wait for CSWmesa
-# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
-
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 TEST_TARGET = check
 

Modified: csw/mgar/pkg/freeglut/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeglut/trunk/checksums	2010-09-28 12:03:51 UTC (rev 11064)
+++ csw/mgar/pkg/freeglut/trunk/checksums	2010-09-28 12:18:50 UTC (rev 11065)
@@ -1,2 +1 @@
-9fc7b274d0c43a9312f19c5d2aee73d9  0001-Add-support-for-Sun.patch
 39f0f2de89f399529d2b981188082218  freeglut-2.6.0.tar.gz

Added: csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch
===================================================================
--- csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch	                        (rev 0)
+++ csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch	2010-09-28 12:18:50 UTC (rev 11065)
@@ -0,0 +1,74 @@
+From 92b7f7a86d9fa0a356c57087b944d37ee24a0231 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 14:08:03 +0200
+Subject: [PATCH 2/2] Fix windows line ending and wrong endif
+
+---
+ progs/demos/smooth_opengl3/smooth_opengl3.c |   44 +++++++++++++--------------
+ 1 files changed, 21 insertions(+), 23 deletions(-)
+
+diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
+index a36f090..8784759 100755
+--- a/progs/demos/smooth_opengl3/smooth_opengl3.c
++++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
+@@ -93,8 +93,7 @@ void checkError(const char *functionName)
+ 
+ typedef ptrdiff_t ourGLsizeiptr;
+ typedef char ourGLchar;
+-
+-#if defined(WIN32)
++
+ #ifndef APIENTRY
+ #define APIENTRY
+ #endif
+@@ -118,27 +117,26 @@ typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size,
+ typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+ typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
+ typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+-#endif  /* defined(WIN32) */
+-
+-PFNGLGENBUFFERSPROC gl_GenBuffers;
+-PFNGLBINDBUFFERPROC gl_BindBuffer;
+-PFNGLBUFFERDATAPROC gl_BufferData;
+-PFNGLCREATESHADERPROC gl_CreateShader;
+-PFNGLSHADERSOURCEPROC gl_ShaderSource;
+-PFNGLCOMPILESHADERPROC gl_CompileShader;
+-PFNGLCREATEPROGRAMPROC gl_CreateProgram;
+-PFNGLATTACHSHADERPROC gl_AttachShader;
+-PFNGLLINKPROGRAMPROC gl_LinkProgram;
+-PFNGLUSEPROGRAMPROC gl_UseProgram;
+-PFNGLGETSHADERIVPROC gl_GetShaderiv;
+-PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;
+-PFNGLGETPROGRAMIVPROC gl_GetProgramiv;
+-PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;
+-PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;
+-PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;
+-PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;
+-PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;
+-PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;
++
++PFNGLGENBUFFERSPROC gl_GenBuffers;
++PFNGLBINDBUFFERPROC gl_BindBuffer;
++PFNGLBUFFERDATAPROC gl_BufferData;
++PFNGLCREATESHADERPROC gl_CreateShader;
++PFNGLSHADERSOURCEPROC gl_ShaderSource;
++PFNGLCOMPILESHADERPROC gl_CompileShader;
++PFNGLCREATEPROGRAMPROC gl_CreateProgram;
++PFNGLATTACHSHADERPROC gl_AttachShader;
++PFNGLLINKPROGRAMPROC gl_LinkProgram;
++PFNGLUSEPROGRAMPROC gl_UseProgram;
++PFNGLGETSHADERIVPROC gl_GetShaderiv;
++PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;
++PFNGLGETPROGRAMIVPROC gl_GetProgramiv;
++PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;
++PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;
++PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;
++PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;
++PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;
++PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;
+ 
+ void initExtensionEntries(void) 
+ {
+-- 
+1.7.3
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.