[SCM] Packaging for teeworlds branch, master, updated. upstream/0.6.0-32-g4e91891
Felix Geyer
debfx-pkg at fobos.de
Thu Aug 4 12:29:53 UTC 2011
The following commit has been merged in the master branch:
commit 3f21e87fba42ff6b19250c75b383c1c16b5c2616
Author: Felix Geyer <debfx-pkg at fobos.de>
Date: Thu Aug 4 11:41:56 2011 +0200
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index 9761a03..f07023c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ teeworlds (0.6.1-1) UNRELEASED; urgency=low
* New upstream release.
* Update watch file.
+ * Refresh patches.
-- Felix Geyer <debfx-pkg at fobos.de> Thu, 04 Aug 2011 11:30:35 +0200
diff --git a/debian/patches/new-wavpack.patch b/debian/patches/new-wavpack.patch
index 1b049cc..63fd684 100644
--- a/debian/patches/new-wavpack.patch
+++ b/debian/patches/new-wavpack.patch
@@ -77,6 +77,6 @@ diff -Nur teeworlds-0.6.0.orig/src/engine/client/sound.h teeworlds-0.6.0/src/eng
- static IOHANDLE ms_File;
- static int ReadData(void *pBuffer, int Size);
-
- virtual int LoadWV(const char *pFilename);
+ virtual bool IsSoundEnabled() { return m_SoundEnabled != 0; }
- virtual void SetListenerPos(float x, float y);
+ virtual int LoadWV(const char *pFilename);
diff --git a/debian/patches/pass-build-flags.patch b/debian/patches/pass-build-flags.patch
index e8abe45..22e5a39 100644
--- a/debian/patches/pass-build-flags.patch
+++ b/debian/patches/pass-build-flags.patch
@@ -7,6 +7,6 @@ diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
+Import("debian.lua")
+
- if platform == "macosx" and arch == "ia32" then
+ if platform == "macosx" and arch == "ia32" then
debug_settings_ppc = debug_settings:Copy()
debug_settings_ppc.config_name = "debug_ppc"
diff --git a/debian/patches/system-libs.patch b/debian/patches/system-libs.patch
index beb6fe5..4e37775 100644
--- a/debian/patches/system-libs.patch
+++ b/debian/patches/system-libs.patch
@@ -12,7 +12,7 @@ diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
-- data compiler
@@ -165,7 +167,7 @@
end
-
+
-- compile zlib if needed
- if config.zlib.value == 1 then
+ if config.zlib.value then
@@ -49,13 +49,13 @@ diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
+ pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+ settings.cc.includes:Add("src/engine/external/pnglite")
+ end
-
+
-- build game components
engine_settings = settings:Copy()
diff -Nur teeworlds-0.6.0.orig/src/engine/client/graphics.cpp teeworlds-0.6.0/src/engine/client/graphics.cpp
--- teeworlds-0.6.0.orig/src/engine/client/graphics.cpp 2011-04-09 21:15:25.000000000 +0200
+++ teeworlds-0.6.0/src/engine/client/graphics.cpp 2011-05-09 12:07:13.354255984 +0200
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
#endif
#include <base/system.h>
@@ -91,9 +91,9 @@ diff -Nur teeworlds-0.6.0.orig/src/tools/dilate.cpp teeworlds-0.6.0/src/tools/di
diff -Nur teeworlds-0.6.0.orig/src/tools/tileset_borderfix.cpp teeworlds-0.6.0/src/tools/tileset_borderfix.cpp
--- teeworlds-0.6.0.orig/src/tools/tileset_borderfix.cpp 2011-04-09 21:15:25.000000000 +0200
+++ teeworlds-0.6.0/src/tools/tileset_borderfix.cpp 2011-05-09 12:07:13.354255984 +0200
-@@ -2,7 +2,7 @@
+@@ -1,7 +1,7 @@
+ /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
/* If you are missing that file, acquire a complete release at teeworlds.com. */
- #include <stdlib.h>
#include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
--
Packaging for teeworlds
More information about the Pkg-games-commits
mailing list