r8319 - in packages/trunk/teeworlds/debian: . patches
Gonéri Le Bouder
goneri at alioth.debian.org
Mon Nov 3 23:14:33 UTC 2008
Author: goneri
Date: 2008-11-03 23:14:33 +0000 (Mon, 03 Nov 2008)
New Revision: 8319
Added:
packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff
Modified:
packages/trunk/teeworlds/debian/changelog
packages/trunk/teeworlds/debian/control
packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
packages/trunk/teeworlds/debian/patches/series
packages/trunk/teeworlds/debian/patches/system-libs.patch
packages/trunk/teeworlds/debian/rules
Log:
[ Gonéri Le Bouder ]
* New Upstream Release
* Refresh the patches
* Don't link against libasound2 anymore
+ add dont-link-with-asound.diff
+ remove libasound2-dev from the build-deps
* Add myself in uploader
Modified: packages/trunk/teeworlds/debian/changelog
===================================================================
--- packages/trunk/teeworlds/debian/changelog 2008-11-03 17:17:26 UTC (rev 8318)
+++ packages/trunk/teeworlds/debian/changelog 2008-11-03 23:14:33 UTC (rev 8319)
@@ -1,21 +1,22 @@
-teeworlds (0.4.3-1) UNRELEASED; urgency=low
+teeworlds (0.4.3-1) experimental; urgency=low
[ Ansgar Burchardt ]
* debian/control: Add Homepage field
[ Miriam Ruiz ]
- * New Upstream Release
- - Auto team balance
- - Anti-spam fixes
- - Added clear collision to the editor
- - Fixed issue with cursor being hidden on some maps
- - New version notifier
- - F10 for screenshots now works in the editor
* Upgraded Standards-Version from 3.7.3 to 3.8.0: No changes needed
* Added README.source file
- -- Miriam Ruiz <little_miry at yahoo.es> Mon, 06 Oct 2008 17:06:30 +0200
+ [ Gonéri Le Bouder ]
+ * New Upstream Release
+ * Refresh the patches
+ * Don't link against libasound2 anymore
+ + add dont-link-with-asound.diff
+ + remove libasound2-dev from the build-deps
+ * Add myself in uploader
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Tue, 04 Nov 2008 00:40:36 +0100
+
teeworlds (0.4.2-2) unstable; urgency=low
[ Gonéri Le Bouder ]
Modified: packages/trunk/teeworlds/debian/control
===================================================================
--- packages/trunk/teeworlds/debian/control 2008-11-03 17:17:26 UTC (rev 8318)
+++ packages/trunk/teeworlds/debian/control 2008-11-03 23:14:33 UTC (rev 8319)
@@ -2,8 +2,8 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Jack Coulter <jscinoz at gmail.com>
-Build-Depends: debhelper (>= 5), unzip, python, libasound2-dev, freeglut3-dev,
+Uploaders: Jack Coulter <jscinoz at gmail.com>, Gonéri Le Bouder <goneri at rulezlan.org>
+Build-Depends: debhelper (>= 5), unzip, python, freeglut3-dev,
portaudio19-dev, zlib1g-dev, libwavpack-dev, libglfw-dev, quilt,
libpnglite-dev, libx11-dev, libxrandr-dev
Standards-Version: 3.8.0
Added: packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff
===================================================================
--- packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff (rev 0)
+++ packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff 2008-11-03 23:14:33 UTC (rev 8319)
@@ -0,0 +1,12 @@
+Index: default.bam
+===================================================================
+--- default.bam.orig
++++ default.bam
+@@ -299,7 +299,6 @@
+ client_settings.linker.frameworks:add("AudioToolbox")
+ client_settings.linker.frameworks:add("AudioUnit")
+ else
+- client_settings.linker.libs:add("asound")
+ client_settings.linker.libs:add("X11")
+ client_settings.linker.libs:add("GL")
+ client_settings.linker.libs:add("GLU")
Modified: packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch 2008-11-03 17:17:26 UTC (rev 8318)
+++ packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch 2008-11-03 23:14:33 UTC (rev 8319)
@@ -1,58 +1,77 @@
-diff --git a/bam/src/context.h b/bam/src/context.h
-index 640c6d8..288b294 100644
---- a/bam/src/context.h
-+++ b/bam/src/context.h
-@@ -4,7 +4,7 @@ struct TARGET
+Index: bam/src/context.h
+===================================================================
+--- bam/src/context.h.orig
++++ bam/src/context.h
+@@ -4,7 +4,7 @@
{
- struct NODE *node;
- struct TARGET *next;
+ struct NODE *node;
+ struct TARGET *next;
-};
+} __attribute__((packed));
struct CONTEXT
{
-@@ -19,7 +19,7 @@ struct CONTEXT
+@@ -19,7 +19,7 @@
- struct TARGET *firsttarget;
- struct NODE *defaulttarget;
+ struct TARGET *firsttarget;
+ struct NODE *defaulttarget;
-};
+} __attribute__((packed));
const char *context_get_path(lua_State *L);
struct CONTEXT *context_get_pointer(lua_State *L);
-diff --git a/bam/src/main.c b/bam/src/main.c
-index 0d18bbd..33f5c19 100644
---- a/bam/src/main.c
-+++ b/bam/src/main.c
-@@ -325,7 +325,7 @@ struct CPPDEPPATH
+Index: bam/src/main.c
+===================================================================
+--- bam/src/main.c.orig
++++ bam/src/main.c
+@@ -325,13 +325,13 @@
{
- char *path;
- struct CPPDEPPATH *next;
+ char *path;
+ struct CPPDEPPATH *next;
-};
+} __attribute__((packed));
struct CPPDEPINFO
{
-diff --git a/bam/src/node.h b/bam/src/node.h
-index 7cf3273..8e7490f 100644
---- a/bam/src/node.h
-+++ b/bam/src/node.h
-@@ -6,7 +6,7 @@ struct DEPENDENCY
+ struct NODE *node;
+ struct CPPDEPPATH *first_path;
+-};
++} __attribute__((packed));
+
+ /* */
+ static int dependency_cpp_callback(void *user, const char *filename, int sys)
+Index: bam/src/node.h
+===================================================================
+--- bam/src/node.h.orig
++++ bam/src/node.h
+@@ -6,7 +6,7 @@
{
- struct NODE *node;
- struct DEPENDENCY *next;
+ struct NODE *node;
+ struct DEPENDENCY *next;
-};
+} __attribute__((packed));
/**/
struct NODE
-@@ -32,7 +32,7 @@ struct NODE
- unsigned int cached:1;
-
- unsigned int workstatus:2; /* 0 = undone, 1 = in the workings, 2 = done*/
+@@ -32,7 +32,7 @@
+ unsigned int cached:1;
+
+ unsigned int workstatus:2; /* 0 = undone, 1 = in the workings, 2 = done*/
-};
+} __attribute__((packed));
struct HEAP;
struct GRAPH;
-
+Index: default.bam
+===================================================================
+--- default.bam.orig
++++ default.bam
+@@ -292,8 +292,6 @@
+ client_settings.linker.libs:add("dsound.lib")
+ end
+
+- external_settings = settings:copy()
+-
+ engine = Compile(engine_settings, Collect("src/engine/*.c"))
+ client = Compile(client_settings, Collect("src/engine/client/*.c"))
+ server = Compile(server_settings, Collect("src/engine/server/*.c"))
Modified: packages/trunk/teeworlds/debian/patches/series
===================================================================
--- packages/trunk/teeworlds/debian/patches/series 2008-11-03 17:17:26 UTC (rev 8318)
+++ packages/trunk/teeworlds/debian/patches/series 2008-11-03 23:14:33 UTC (rev 8319)
@@ -1,3 +1,4 @@
+dont-link-with-asound.diff -p0
new-wavpack.patch
-system-libs.patch
-fix-bam-FTBFS.patch
+system-libs.patch -p0
+fix-bam-FTBFS.patch -p0
Modified: packages/trunk/teeworlds/debian/patches/system-libs.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/system-libs.patch 2008-11-03 17:17:26 UTC (rev 8318)
+++ packages/trunk/teeworlds/debian/patches/system-libs.patch 2008-11-03 23:14:33 UTC (rev 8319)
@@ -1,7 +1,7 @@
-Index: teeworlds-0.4.3-src/default.bam
+Index: default.bam
===================================================================
---- teeworlds-0.4.3-src.orig/default.bam 2008-08-31 15:30:59.000000000 +0200
-+++ teeworlds-0.4.3-src/default.bam 2008-10-06 17:21:38.000000000 +0200
+--- default.bam.orig
++++ default.bam
@@ -214,7 +214,6 @@
-- set some platform specific settings
@@ -19,7 +19,7 @@
end
elseif family == "windows" then
glfw_platform = "win32"
-@@ -244,30 +245,6 @@
+@@ -244,29 +245,6 @@
settings.linker.libs:add("shell32.lib")
end
@@ -46,11 +46,10 @@
- Collect("src/engine/external/portaudio/src/common/*.c"),
- Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
- Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
--
+
-- build game components
engine_settings = settings:copy()
-
-@@ -287,7 +264,7 @@
+@@ -287,7 +265,7 @@
-- client
client_settings = engine_settings:copy()
@@ -59,9 +58,9 @@
if family == "unix" then
if platform == "macosx" then
-@@ -301,8 +278,13 @@
+@@ -300,8 +278,13 @@
+ client_settings.linker.frameworks:add("AudioUnit")
else
- client_settings.linker.libs:add("asound")
client_settings.linker.libs:add("X11")
+ client_settings.linker.libs:add("Xrandr")
client_settings.linker.libs:add("GL")
@@ -73,7 +72,7 @@
end
elseif family == "windows" then
client_settings.linker.libs:add("opengl32.lib")
-@@ -311,9 +293,6 @@
+@@ -310,9 +293,6 @@
end
external_settings = settings:copy()
@@ -83,38 +82,34 @@
engine = Compile(engine_settings, Collect("src/engine/*.c"))
client = Compile(client_settings, Collect("src/engine/client/*.c"))
-@@ -333,22 +312,22 @@
+@@ -331,19 +311,18 @@
tools = {}
for i,v in objs do
toolname = PathFilename(PathBase(v))
- tools[i] = Link(settings, toolname, v, engine, zlib)
-+ tools[i] = Link(settings, toolname, v, engine)
++ tools[i] = Link(settings, toolname, v, engine)
end
- -- build client, server, version server and master server
+ -- build client, server and master server
client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
- engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
-+ engine, client, game_editor, pnglite,
- client_link_other)
+- client_link_other)
++ engine, client, game_editor, client_link_other)
server_exe = Link(server_settings, "teeworlds_srv", engine, server,
- game_shared, game_server, zlib)
-+ game_shared, game_server)
++ game_shared, game_server)
- versionserver_exe = Link(server_settings, "versionsrv", versionserver,
-- engine, zlib)
-+ engine)
-
masterserver_exe = Link(server_settings, "mastersrv", masterserver,
- engine, zlib)
-+ engine)
++ engine)
if platform == "macosx" then
osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
-Index: teeworlds-0.4.3-src/scripts/gen_keys.py
+Index: scripts/gen_keys.py
===================================================================
---- teeworlds-0.4.3-src.orig/scripts/gen_keys.py 2008-08-31 15:30:59.000000000 +0200
-+++ teeworlds-0.4.3-src/scripts/gen_keys.py 2008-10-06 17:18:56.000000000 +0200
+--- scripts/gen_keys.py.orig
++++ scripts/gen_keys.py
@@ -1,7 +1,7 @@
import sys, os
@@ -124,10 +119,10 @@
lines = [line.strip() for line in file(glfw).readlines()]
# genereate keys.h file
-Index: teeworlds-0.4.3-src/src/engine/client/ec_gfx.c
+Index: src/engine/client/ec_gfx.c
===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/client/ec_gfx.c 2008-08-31 15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/client/ec_gfx.c 2008-10-06 17:18:56.000000000 +0200
+--- src/engine/client/ec_gfx.c.orig
++++ src/engine/client/ec_gfx.c
@@ -1,6 +1,6 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/external/glfw/include/GL/glfw.h>
@@ -137,10 +132,10 @@
#include <engine/e_system.h>
#include <engine/e_client_interface.h>
-Index: teeworlds-0.4.3-src/src/engine/client/ec_inp.c
+Index: src/engine/client/ec_inp.c
===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/client/ec_inp.c 2008-08-31 15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/client/ec_inp.c 2008-10-06 17:18:56.000000000 +0200
+--- src/engine/client/ec_inp.c.orig
++++ src/engine/client/ec_inp.c
@@ -1,6 +1,6 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
#include <string.h>
@@ -149,10 +144,10 @@
#include <engine/e_system.h>
#include <engine/e_client_interface.h>
-Index: teeworlds-0.4.3-src/src/engine/client/ec_snd.c
+Index: src/engine/client/ec_snd.c
===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/client/ec_snd.c 2008-10-06 17:18:39.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/client/ec_snd.c 2008-10-06 17:18:56.000000000 +0200
+--- src/engine/client/ec_snd.c.orig
++++ src/engine/client/ec_snd.c
@@ -3,8 +3,8 @@
#include <engine/e_client_interface.h>
#include <engine/e_config.h>
@@ -164,10 +159,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-Index: teeworlds-0.4.3-src/src/engine/e_datafile.c
+Index: src/engine/e_datafile.c
===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/e_datafile.c 2008-08-31 15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/e_datafile.c 2008-10-06 17:18:56.000000000 +0200
+--- src/engine/e_datafile.c.orig
++++ src/engine/e_datafile.c
@@ -1,7 +1,7 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
#include "e_system.h"
@@ -177,23 +172,10 @@
static const int DEBUG=0;
-Index: teeworlds-0.4.3-src/src/engine/external/pnglite/pnglite.c
+Index: src/tools/dilate.c
===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/external/pnglite/pnglite.c 2008-08-31 15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/external/pnglite/pnglite.c 2008-10-06 17:18:56.000000000 +0200
-@@ -5,7 +5,7 @@
- #define USE_ZLIB 1
-
- #if USE_ZLIB
--#include "../zlib/zlib.h"
-+#include <zlib.h>
- #else
- #include "zlite.h"
- #endif
-Index: teeworlds-0.4.3-src/src/tools/dilate.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/tools/dilate.c 2008-08-31 15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/tools/dilate.c 2008-10-06 17:18:56.000000000 +0200
+--- src/tools/dilate.c.orig
++++ src/tools/dilate.c
@@ -1,6 +1,6 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
@@ -202,15 +184,3 @@
typedef struct pixel_t
{
-Index: teeworlds-0.4.3-src/src/tools/tileset_borderfix.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/tools/tileset_borderfix.c 2008-08-31 15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/tools/tileset_borderfix.c 2008-10-06 17:18:56.000000000 +0200
-@@ -1,6 +1,6 @@
- /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-
--#include "../engine/external/pnglite/pnglite.c"
-+#include <pnglite.h>
-
- typedef struct pixel_t
- {
Modified: packages/trunk/teeworlds/debian/rules
===================================================================
--- packages/trunk/teeworlds/debian/rules 2008-11-03 17:17:26 UTC (rev 8318)
+++ packages/trunk/teeworlds/debian/rules 2008-11-03 23:14:33 UTC (rev 8319)
@@ -34,19 +34,20 @@
rm ../teeworlds-$(VERSION)-src.tar.gz
rm -rf ${TMPDIR}
-build-bam:
+bam/src/bam: $(QUILT_STAMPFN)
dh_testdir
cd bam && ./make_unix.sh
-build: $(QUILT_STAMPFN) build-bam
+build: $(QUILT_STAMPFN) bam/src/bam
dh_testdir
bam/src/bam release
-clean: build-bam unpatch
+clean: $(QUILT_STAMPFN) bam/src/bam
dh_testdir
- [ ! -f bam/src/bam ] || bam/src/bam -c all
- rm -rf bam/src/bam tmp.* bam/src/tools/txt2c
+ bam/src/bam -c all
+ quilt pop -a -f
+ rm -rf bam/src/bam tmp.* bam/src/tools/txt2c debian/stamp-patched bam/src/bam .pc
dh_clean
install: install-indep install-arch
More information about the Pkg-games-commits
mailing list