r13568 - in packages/trunk/warzone2100/debian: . patches
Paul Wise
pabs at alioth.debian.org
Tue May 15 04:25:16 UTC 2012
Author: pabs
Date: 2012-05-15 04:25:15 +0000 (Tue, 15 May 2012)
New Revision: 13568
Added:
packages/trunk/warzone2100/debian/patches/use-system-libraries.patch
Removed:
packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch
Modified:
packages/trunk/warzone2100/debian/changelog
packages/trunk/warzone2100/debian/patches/series
Log:
Update patch to use system quesoglc too
Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog 2012-05-15 04:00:22 UTC (rev 13567)
+++ packages/trunk/warzone2100/debian/changelog 2012-05-15 04:25:15 UTC (rev 13568)
@@ -8,6 +8,7 @@
* GLee removed upstream, no need to remove it
* miniupnpc copy moved around remove new location
* Remove the quesoglc embedded code copy too
+ * Update patch to use system quesoglc too
-- Paul Wise <pabs at debian.org> Mon, 24 Oct 2011 10:55:52 +0800
Deleted: packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch 2012-05-15 04:00:22 UTC (rev 13567)
+++ packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch 2012-05-15 04:25:15 UTC (rev 13568)
@@ -1,105 +0,0 @@
-From: Paul Wise <pabs at debian.org>
-Date: Thu, 3 Mar 2011 09:22:38 +0800
-Subject: Switch to using external miniupnpc
---- a/configure.ac
-+++ b/configure.ac
-@@ -413,6 +413,10 @@
- ])
- AM_CONDITIONAL([MOTIF_AVAILABLE], test -n "$MOTIF_LIBS")
-
-+# Look for minupnpc
-+AC_CHECK_HEADER(miniupnpc/miniupnpc.h, , AC_MSG_ERROR([miniupnpc header not found.]))
-+AC_CHECK_LIB(miniupnpc, UPNP_GetExternalIPAddress, AC_SUBST([MINIUPNPC_LIBS], [-lminiupnpc]), AC_MSG_ERROR([miniupnpc not found.]), [${WIN32_LIBS}])
-+
- # Look for Popt
- AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([Popt header not found.]))
- AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS], [-lpopt]), AC_MSG_ERROR([Popt not found.]), [${WIN32_LIBS}])
-@@ -498,7 +502,6 @@
- lib/ivis_opengl/Makefile
- lib/ivis_common/Makefile
- lib/netplay/Makefile
-- lib/netplay/miniupnpc/Makefile
- lib/script/Makefile
- lib/sequence/Makefile
- lib/sound/Makefile
---- a/lib/netplay/Makefile.am
-+++ b/lib/netplay/Makefile.am
-@@ -1,5 +1,3 @@
--SUBDIRS = miniupnpc
--
- AM_CPPFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(WZ_CPPFLAGS)
- AM_CFLAGS = $(WZ_CFLAGS)
- AM_CXXFLAGS = $(WZ_CXXFLAGS)
---- a/lib/netplay/netplay.c
-+++ b/lib/netplay/netplay.c
-@@ -37,9 +37,9 @@
- #include "netplay.h"
- #include "netlog.h"
-
--#include "miniupnpc/miniwget.h"
--#include "miniupnpc/miniupnpc.h"
--#include "miniupnpc/upnpcommands.h"
-+#include <miniupnpc/miniwget.h>
-+#include <miniupnpc/miniupnpc.h>
-+#include <miniupnpc/upnpcommands.h>
- #include "lib/exceptionhandler/dumpinfo.h"
-
- #include "src/multistat.h"
-@@ -2126,9 +2126,9 @@
- int r;
-
- debug(LOG_NET, "upnp_add_redir(%d)\n", port);
-- UPNP_GetExternalIPAddress(urls.controlURL, data.servicetype, externalIP);
-+ UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
- sprintf(port_str, "%d", port);
-- r = UPNP_AddPortMapping(urls.controlURL, data.servicetype,
-+ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
- port_str, port_str, lanaddr, "Warzone 2100", "TCP", 0);
- if (r != UPNPCOMMAND_SUCCESS)
- {
-@@ -2144,7 +2144,7 @@
- char port_str[16];
- debug(LOG_NET, "upnp_rem_redir(%d)", port);
- sprintf(port_str, "%d", port);
-- UPNP_DeletePortMapping(urls.controlURL, data.servicetype, port_str, "TCP", 0);
-+ UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port_str, "TCP", 0);
- }
-
- void NETaddRedirects(void)
---- a/po/update-po.sh
-+++ b/po/update-po.sh
-@@ -11,5 +11,5 @@
- find lib src data -type f |
- grep -v '\/.svn\/' |
- grep -e '\.c\(pp\|xx\)\?$' -e 'data.*strings.*\.txt$' -e 'data.*sequenceaudio.*\.tx.$' -e '\.slo$' -e '\.rmsg$' |
-- grep -v -e '\.lex\.c\(pp\|xx\)\?$' -e '\.tab\.c\(pp\|xx\)\?$' -e 'lib/netplay/miniupnpc/*' -e 'GLee\.c' |
-+ grep -v -e '\.lex\.c\(pp\|xx\)\?$' -e '\.tab\.c\(pp\|xx\)\?$' -e 'GLee\.c' |
- sort >> po/POTFILES.in
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,7 +8,7 @@
- force-linker.cpp:
- touch $@
-
--AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CPPFLAGS) $(GLee_CFLAGS)
-+AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CPPFLAGS) $(GLee_CFLAGS) $(MINIUPNPC_LIBS)
- AM_CFLAGS = $(WZ_CFLAGS)
- AM_CXXFLAGS = $(WZ_CXXFLAGS)
- AM_LFLAGS = $(FLEX_FLAGS)
-@@ -290,7 +290,6 @@
- $(top_builddir)/lib/sound/libsound.a \
- $(top_builddir)/lib/script/libscript.a \
- $(top_builddir)/lib/netplay/libnetplay.a \
-- $(top_builddir)/lib/netplay/miniupnpc/libminiupnpc.a \
- $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
- $(top_builddir)/lib/ivis_common/libivis_common.a \
- $(top_builddir)/lib/gamelib/libgamelib.a \
-@@ -298,7 +297,7 @@
- $(top_builddir)/lib/iniparser/libiniparser.a \
- $(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
-
--warzone2100_LDADD += $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(GLee_LIBS)
-+warzone2100_LDADD += $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(GLee_LIBS) $(MINIUPNPC_LIBS)
-
- if MINGW32
- warzone2100_LDADD += $(top_builddir)/win32/warzone2100.o $(WIN32_LIBS)
Modified: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series 2012-05-15 04:00:22 UTC (rev 13567)
+++ packages/trunk/warzone2100/debian/patches/series 2012-05-15 04:25:15 UTC (rev 13568)
@@ -1 +1 @@
-0001-Switch-to-using-external-miniupnpc.patch
+use-system-libraries.patch
Added: packages/trunk/warzone2100/debian/patches/use-system-libraries.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/use-system-libraries.patch (rev 0)
+++ packages/trunk/warzone2100/debian/patches/use-system-libraries.patch 2012-05-15 04:25:15 UTC (rev 13568)
@@ -0,0 +1,85 @@
+Author: Paul Wise <pabs at debian.org>
+Description: use system libraries instead of embedded code copies
+Forwarded: no
+--- a/configure.ac
++++ b/configure.ac
+@@ -379,6 +379,12 @@
+
+ # Checks for modules:
+
++# Look for minupnpc
++AC_CHECK_HEADER(miniupnpc/miniupnpc.h, , AC_MSG_ERROR([miniupnpc header not found.]))
++AC_CHECK_LIB(miniupnpc, UPNP_GetExternalIPAddress, AC_SUBST([MINIUPNPC_LIBS], [-lminiupnpc]), AC_MSG_ERROR([miniupnpc not found.]), [${WIN32_LIBS}])
++
++PKG_CHECK_MODULES([QUESOGLC], [quesoglc])
++
+ if test "$backend" = "sdl"; then
+ PKG_CHECK_MODULES([SDL], [sdl >= 1.2])
+ fi
+@@ -456,9 +462,6 @@
+ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
+ WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"
+
+-# 3rdparty libs
+-WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/quesoglc"
+-
+
+ AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}])
+ AC_SUBST([WZ_CFLAGS], [${WZ_CFLAGS}])
+@@ -476,8 +479,6 @@
+ pkg/nsis/Makefile
+ win32/Makefile
+ tests/Makefile
+- 3rdparty/miniupnpc/Makefile
+- 3rdparty/quesoglc/Makefile
+ lib/framework/Makefile
+ lib/exceptionhandler/Makefile
+ lib/gamelib/Makefile
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,8 +6,6 @@
+
+ SUBDIRS = \
+ win32 \
+- 3rdparty/miniupnpc \
+- 3rdparty/quesoglc \
+ lib/framework \
+ lib/exceptionhandler \
+ lib/script \
+--- a/po/update-po.sh
++++ b/po/update-po.sh
+@@ -10,6 +10,6 @@
+
+ find lib src data po -type f |
+ grep -e '\.c\(pp\|xx\)\?$' -e 'data.*strings.*\.txt$' -e 'data.*sequenceaudio.*\.tx.$' -e '\.slo$' -e '\.rmsg$' -e 'po/custom/.*\.txt' -e '\.js$' |
+- grep -v -e '\.lex\.c\(pp\|xx\)\?$' -e '\.tab\.c\(pp\|xx\)\?$' -e 'lib/netplay/miniupnpc/*' -e 'lib/betawidget/*' -e '_moc\.' -e 'po/custom/files.js' |
++ grep -v -e '\.lex\.c\(pp\|xx\)\?$' -e '\.tab\.c\(pp\|xx\)\?$' -e 'lib/betawidget/*' -e '_moc\.' -e 'po/custom/files.js' |
+ grep -v -e '_lexer\.cpp' -e '_parser\.cpp' |
+ sort >> po/POTFILES.in
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(VORBISFILE_CFLAGS) $(VORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CPPFLAGS) $(GLEW_CFLAGS)
++AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(VORBISFILE_CFLAGS) $(VORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CPPFLAGS) $(GLEW_CFLAGS) $(MINIUPNPC_CFLAGS) $(QUESOGLC_CFLAGS)
+ AM_CFLAGS = $(WZ_CFLAGS)
+ AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
+ AM_LFLAGS = $(FLEX_FLAGS)
+@@ -270,9 +270,7 @@
+ $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
+ $(top_builddir)/lib/gamelib/libgamelib.a \
+ $(top_builddir)/lib/framework/libframework.a \
+- $(top_builddir)/lib/exceptionhandler/libexceptionhandler.a \
+- $(top_builddir)/3rdparty/miniupnpc/libminiupnpc.a \
+- $(top_builddir)/3rdparty/quesoglc/libquesoglc.a
++ $(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
+
+ if BACKEND_QT
+ warzone2100_LIBS += $(top_builddir)/lib/qtgame/libqtgame.a
+@@ -284,6 +282,7 @@
+
+ warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \
+ $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(GLEW_LIBS) \
++ $(MINIUPNPC_LIBS) $(QUESOGLC_LIBS) \
+ $(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
+
+ if MINGW32
More information about the Pkg-games-commits
mailing list