[trigger-rally] 05/14: Remove patch to use the system glew, not necessary anymore.

[Bertrand Marc]

This is an automated email from the git hooks/post-receive script.

bmarc pushed a commit to branch master
in repository trigger-rally.

commit a2774f68d7fe301f86fed99b6e51d754cd18f35e
Author: Bertrand Marc <bmarc at debian.org>
Date:   Wed Aug 31 09:42:00 2016 +0200

    Remove patch to use the system glew, not necessary anymore.
---
 debian/patches/10_system_glew.patch | 83 -------------------------------------
 debian/patches/series               |  1 -
 2 files changed, 84 deletions(-)

diff --git a/debian/patches/10_system_glew.patch b/debian/patches/10_system_glew.patch
deleted file mode 100644
index a1e4aba..0000000
--- a/debian/patches/10_system_glew.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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.6.0/autogen.sh
-===================================================================
---- trigger-rally-0.6.0.orig/autogen.sh	2011-10-07 19:10:49.000000000 +0200
-+++ trigger-rally-0.6.0/autogen.sh	2011-11-11 22:26:28.891511342 +0100
-@@ -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.6.0/configure.ac
-===================================================================
---- trigger-rally-0.6.0.orig/configure.ac	2011-10-07 19:10:49.000000000 +0200
-+++ trigger-rally-0.6.0/configure.ac	2011-11-11 22:26:28.891511342 +0100
-@@ -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.6.0/src/Jamfile
-===================================================================
---- trigger-rally-0.6.0.orig/src/Jamfile	2011-10-07 19:10:02.000000000 +0200
-+++ trigger-rally-0.6.0/src/Jamfile	2011-11-11 22:26:28.891511342 +0100
-@@ -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.6.0/src/pengine/Jamfile
-===================================================================
---- trigger-rally-0.6.0.orig/src/pengine/Jamfile	2011-10-07 19:10:01.000000000 +0200
-+++ trigger-rally-0.6.0/src/pengine/Jamfile	2011-11-11 22:26:28.895511341 +0100
-@@ -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.6.0/src/pengine/pengine.h
-===================================================================
---- trigger-rally-0.6.0.orig/src/pengine/pengine.h	2011-10-07 19:10:01.000000000 +0200
-+++ trigger-rally-0.6.0/src/pengine/pengine.h	2011-11-11 22:28:38.447505433 +0100
-@@ -31,9 +31,13 @@
- #include <physfs.h>
- 
- 
-+#ifdef HAVE_GLEW_H
-+#include <GL/glew.h>
-+#else /* use statically shipped version */
- // This is a slightly modified GLEW for internal build
- #define GLEW_STATIC
- #include "GL/glew.h"
-+#endif /* HAVE_GLEW_H */
- 
- 
- // TinyXML is built into the pengine library
diff --git a/debian/patches/series b/debian/patches/series
index b1fbcc5..d3aa7c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-10_system_glew.patch
 20_system_tinyxml.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git