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

[dmichelsen at users.sourceforge.net]

Revision: 9212
          http://gar.svn.sourceforge.net/gar/?rev=9212&view=rev
Author:   dmichelsen
Date:     2010-03-16 19:35:16 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
freeglut: Add patches and flags and tweaks

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

Added Paths:
-----------
    csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2010-03-16 17:46:59 UTC (rev 9211)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2010-03-16 19:35:16 UTC (rev 9212)
@@ -8,6 +8,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-Add-support-for-Sun.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -16,7 +17,24 @@
 
 DEP_PKGS = CSWmesa
 
+# If we put the include into CPPFLAGS it is too ear\xC3ly in the commandline
+# and the installed headers take precedence over the newly built.
+CPPFLAGS =
+EXTRA_CFLAGS = -I/opt/csw/include
+
+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
+
 include gar/category.mk

Modified: csw/mgar/pkg/freeglut/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeglut/trunk/checksums	2010-03-16 17:46:59 UTC (rev 9211)
+++ csw/mgar/pkg/freeglut/trunk/checksums	2010-03-16 19:35:16 UTC (rev 9212)
@@ -1 +1,2 @@
+9fc7b274d0c43a9312f19c5d2aee73d9  0001-Add-support-for-Sun.patch
 39f0f2de89f399529d2b981188082218  freeglut-2.6.0.tar.gz

Added: csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch
===================================================================
--- csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch	                        (rev 0)
+++ csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch	2010-03-16 19:35:16 UTC (rev 9212)
@@ -0,0 +1,25 @@
+From 0694263dbafc44a75be17021bec553c1fcc329ec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 16 Mar 2010 20:10:19 +0100
+Subject: [PATCH] Add support for Sun
+
+---
+ src/freeglut_internal.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
+index 2d77ab0..34f84bc 100644
+--- a/src/freeglut_internal.h
++++ b/src/freeglut_internal.h
+@@ -46,7 +46,7 @@
+     || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) )
+ #   define  TARGET_HOST_MS_WINDOWS 1
+ 
+-#elif defined(__posix__) || defined(__unix__) || defined(__linux__)
++#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)
+ #   define  TARGET_HOST_POSIX_X11  1
+ 
+ #elif defined(__APPLE__)
+-- 
+1.7.0
+


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