[redeclipse] 220/494: Add unapplied patch to build with system Enet

[Martin Werner]

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

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit 95767115b2cf1988948d523380fe20e062746f26
Author: Arand Nash <ienorand at gmail.com>
Date:   Wed Sep 14 01:23:49 2011 +0200

    Add unapplied patch to build with system Enet
    
    Add patch to make Red Eclipse build with system Enet library
    instead of bundled version.
    Patch is currently not in use.
---
 patches/40-build-with-system-enet.diff | 51 ++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/patches/40-build-with-system-enet.diff b/patches/40-build-with-system-enet.diff
new file mode 100644
index 0000000..e3b3682
--- /dev/null
+++ b/patches/40-build-with-system-enet.diff
@@ -0,0 +1,51 @@
+Description: Use system Enet instead of bundled version
+ This change is explicitly disliked by upstream, however it is preferred by
+ Debian policy.
+Origin: http://gitorious.org/chakra-packages/games/commit/1aae10c597cf09a281d47570e43c8892531cd9bf
+Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+
+--- Makefile.old	2011-07-31 21:38:04.000000000 +0200
++++ Makefile	2011-07-31 21:50:43.000000000 +0200
+@@ -5,7 +5,7 @@
+ PLATFORM= $(shell uname -s)
+ PLATFORM_SUFFIX=_native
+ 
+-INCLUDES= -Ishared -Iengine -Igame -Ienet/include
++INCLUDES= -Ishared -Iengine -Igame -I/usr/share/enet/include
+ 
+ STRIP=
+ ifeq (,$(findstring -g,$(CXXFLAGS)))
+@@ -22,7 +22,7 @@
+ CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
+ else
+ CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt
+@@ -92,7 +92,7 @@
+ SERVER_LIBS= -mwindows -Llib -lzdll -lenet -lws2_32 -lwinmm
+ else
+ SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES)
+-SERVER_LIBS= -Lenet/.libs -lenet -lz
++SERVER_LIBS= -lenet -lz
+ endif
+ SERVER_OBJS= \
+ 	shared/crypto-standalone.o \
+@@ -157,13 +157,13 @@
+ 	$(STRIP) ../bin/reserver.exe
+ endif
+ else
+-client: libenet $(CLIENT_OBJS)
++client: $(CLIENT_OBJS)
+ 	$(CXX) $(CXXFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS)
+ ifneq (,$(STRIP))
+ 	$(STRIP) reclient
+ endif
+ 
+-server: libenet $(SERVER_OBJS)
++server: $(SERVER_OBJS)
+ 	$(CXX) $(CXXFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS)
+ ifneq (,$(STRIP))
+ 	$(STRIP) reserver

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