r10880 - in packages/trunk/trigger/debian: . patches

[Stefan Potyra]

Author: sistpoty-guest
Date: 2010-03-28 14:13:49 +0000 (Sun, 28 Mar 2010)
New Revision: 10880

Added:
   packages/trunk/trigger/debian/patches/10_system_glew.patch
Modified:
   packages/trunk/trigger/debian/changelog
   packages/trunk/trigger/debian/control
   packages/trunk/trigger/debian/patches/series
Log:
* add a rough patch to link against the system libglew instead of the
  internal copy.
* b-d on libglew1.5-dev.


Modified: packages/trunk/trigger/debian/changelog
===================================================================
--- packages/trunk/trigger/debian/changelog	2010-03-28 13:45:34 UTC (rev 10879)
+++ packages/trunk/trigger/debian/changelog	2010-03-28 14:13:49 UTC (rev 10880)
@@ -15,8 +15,11 @@
   * debian/control: wrap build-dependencies and Uploaders.
   * debian/control: Add DM-Upload-Allowed: yes.
   * debian/README.source: dropped, doesn't use a patch system any longer.
+  * debian/control: Add libglew1.5-dev to build-depends.
+  * debian/patches/10_system_glew.patch: Don't link against the internal
+    copy of libglew, but rather use the system libglew.
 
- -- Stefan Potyra <sistpoty at ubuntu.com>  Sun, 28 Mar 2010 15:44:02 +0200
+ -- Stefan Potyra <sistpoty at ubuntu.com>  Sun, 28 Mar 2010 15:56:02 +0200
 
 trigger-rally (0.5.2.1-1) unstable; urgency=low
 

Modified: packages/trunk/trigger/debian/control
===================================================================
--- packages/trunk/trigger/debian/control	2010-03-28 13:45:34 UTC (rev 10879)
+++ packages/trunk/trigger/debian/control	2010-03-28 14:13:49 UTC (rev 10880)
@@ -9,7 +9,8 @@
  libphysfs-dev, 
  libsdl-image1.2-dev, 
  docbook-to-man, 
- automake (>= 1.9)
+ automake (>= 1.9),
+ libglew1.5-dev
 Standards-Version: 3.8.3
 Uploaders: Stefan Potyra <sistpoty at ubuntu.com>, 
  Alexander Reichle-Schmehl <tolimar at debian.org>, 

Added: packages/trunk/trigger/debian/patches/10_system_glew.patch
===================================================================
--- packages/trunk/trigger/debian/patches/10_system_glew.patch	                        (rev 0)
+++ packages/trunk/trigger/debian/patches/10_system_glew.patch	2010-03-28 14:13:49 UTC (rev 10880)
@@ -0,0 +1,85 @@
+# Description: trigger-rally ships an internal copy of glew. This patch forces
+#  trigger to use the system glew library.
+#  .
+#  It's not clean enough yet to be committed upstream, I'll work on this.
+# Author: Stefan Potyra <sistpoty at ubuntu.com>
+Index: trigger-rally-0.5.2.1/autogen.sh
+===================================================================
+--- trigger-rally-0.5.2.1.orig/autogen.sh	2010-03-28 15:52:27.155526849 +0200
++++ trigger-rally-0.5.2.1/autogen.sh	2010-03-28 15:49:28.356327937 +0200
+@@ -18,6 +18,7 @@
+ # seems autoconf --trace misses some things :-/
+ echo 'INSTALL ?= "@INSTALL@" ;' >> Jamconfig.in
+ echo 'JAMCONFIG_READ = yes ;' >> Jamconfig.in
++echo 'HAVE_GLEW = "@HAVE_GLEW@" ;' >> Jamconfig.in
+ 
+ # autoheader/config.h not used by trigger yet
+ autoheader
+Index: trigger-rally-0.5.2.1/configure.ac
+===================================================================
+--- trigger-rally-0.5.2.1.orig/configure.ac	2010-03-28 15:52:26.705514097 +0200
++++ trigger-rally-0.5.2.1/configure.ac	2010-03-28 15:49:08.525590227 +0200
+@@ -123,6 +123,12 @@
+ 	AC_MSG_ERROR([Couldn't find GLU library and headers])
+ fi
+ 
++# FIXME ugly.
++HAVE_GLEW=1
++AC_DEFINE([HAVE_GLEW])
++AC_SUBST([HAVE_GLEW])
++AC_SEARCH_LIBS([__glewActiveTextureARB], [GLEW])
++
+ # Um, can't get this to substitute [app]datadir :/
+ #AC_DEFINE([DATADIR], [$(datadir)], [comment])
+ 
+Index: trigger-rally-0.5.2.1/src/Jamfile
+===================================================================
+--- trigger-rally-0.5.2.1.orig/src/Jamfile	2010-03-28 15:52:26.975526812 +0200
++++ trigger-rally-0.5.2.1/src/Jamfile	2010-03-28 15:50:28.346233037 +0200
+@@ -7,7 +7,10 @@
+ C++FLAGS += -DDATADIR='\"$(datadir)\"' ;
+ 
+ 
+-SubInclude TOP src glew ;
++if ! $(HAVE_GLEW) {
++	SubInclude TOP src glew ;
++}
++
+ SubInclude TOP src pengine ;
+ SubInclude TOP src psim ;
+ SubInclude TOP src trigger ;
+Index: trigger-rally-0.5.2.1/src/pengine/Jamfile
+===================================================================
+--- trigger-rally-0.5.2.1.orig/src/pengine/Jamfile	2010-03-28 15:52:26.805523301 +0200
++++ trigger-rally-0.5.2.1/src/pengine/Jamfile	2010-03-28 15:52:19.539998764 +0200
+@@ -4,6 +4,8 @@
+ Library pengine : [ Wildcard *.c *.cpp *.h ]
+                   [ Wildcard GL : *.h ] ;
+ ExternalLibs pengine : SDL SDLIMAGE AUDIOLIB GL GLU PHYSFS ;
+-LinkWith pengine : glew ;
+ 
+-IncludeDir pengine : ../glew ;
++if ! $(HAVE_GLEW) {
++	LinkWith pengine : glew ;
++	IncludeDir pengine : ../glew ;
++}
+Index: trigger-rally-0.5.2.1/src/pengine/pengine.h
+===================================================================
+--- trigger-rally-0.5.2.1.orig/src/pengine/pengine.h	2010-03-28 15:52:26.875527960 +0200
++++ trigger-rally-0.5.2.1/src/pengine/pengine.h	2010-03-28 15:51:25.717564253 +0200
+@@ -30,11 +30,12 @@
+ // The PhysicsFS game file system
+ #include <physfs.h>
+ 
+-
+-// This is a slightly modified GLEW for internal build
++#ifdef HAVE_GLEW_H
++#include <GL/glew.h>
++#else /* use statically shipped version */
+ #define GLEW_STATIC
+ #include "GL/glew.h"
+-
++#endif
+ 
+ // TinyXML is built into the pengine library
+ #include "tinyxml.h"

Modified: packages/trunk/trigger/debian/patches/series
===================================================================
--- packages/trunk/trigger/debian/patches/series	2010-03-28 13:45:34 UTC (rev 10879)
+++ packages/trunk/trigger/debian/patches/series	2010-03-28 14:13:49 UTC (rev 10880)
@@ -1 +1,2 @@
 05_Makefile.am.patch
+10_system_glew.patch