r10997 - packages/trunk/teeworlds/debian/patches

[Felix Geyer]

Author: debfx-guest
Date: 2010-05-31 15:48:40 +0000 (Mon, 31 May 2010)
New Revision: 10997

Removed:
   packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff
   packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
   packages/trunk/teeworlds/debian/patches/fix-big-endian.diff
Modified:
   packages/trunk/teeworlds/debian/patches/series
Log:
Remove disabled patches.


Deleted: packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff
===================================================================
--- packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff	2010-05-31 15:46:15 UTC (rev 10996)
+++ packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff	2010-05-31 15:48:40 UTC (rev 10997)
@@ -1,12 +0,0 @@
-Index: b/default.bam
-===================================================================
---- a/default.bam
-+++ b/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")

Deleted: packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch	2010-05-31 15:46:15 UTC (rev 10996)
+++ packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch	2010-05-31 15:48:40 UTC (rev 10997)
@@ -1,77 +0,0 @@
-Index: b/bam/src/context.h
-===================================================================
---- a/bam/src/context.h
-+++ b/bam/src/context.h
-@@ -4,7 +4,7 @@
- {
- 	struct NODE *node;
- 	struct TARGET *next;
--};
-+} __attribute__((packed));
- 
- struct CONTEXT
- {
-@@ -19,7 +19,7 @@
- 
- 	struct TARGET *firsttarget;
- 	struct NODE *defaulttarget;
--};
-+} __attribute__((packed));
- 
- const char *context_get_path(lua_State *L);
- struct CONTEXT *context_get_pointer(lua_State *L);
-Index: b/bam/src/main.c
-===================================================================
---- a/bam/src/main.c
-+++ b/bam/src/main.c
-@@ -325,13 +325,13 @@
- {
- 	char *path;
- 	struct CPPDEPPATH *next;
--};
-+} __attribute__((packed));
- 
- struct CPPDEPINFO
- {
- 	struct NODE *node;
- 	struct CPPDEPPATH *first_path;
--};
-+} __attribute__((packed));
- 
- /* */
- static int dependency_cpp_callback(void *user, const char *filename, int sys)
-Index: b/bam/src/node.h
-===================================================================
---- a/bam/src/node.h
-+++ b/bam/src/node.h
-@@ -6,7 +6,7 @@
- {
- 	struct NODE *node;
- 	struct DEPENDENCY *next;
--};
-+} __attribute__((packed));
- 
- /**/
- struct NODE
-@@ -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: b/default.bam
-===================================================================
---- a/default.bam
-+++ b/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"))

Deleted: packages/trunk/teeworlds/debian/patches/fix-big-endian.diff
===================================================================
--- packages/trunk/teeworlds/debian/patches/fix-big-endian.diff	2010-05-31 15:46:15 UTC (rev 10996)
+++ packages/trunk/teeworlds/debian/patches/fix-big-endian.diff	2010-05-31 15:48:40 UTC (rev 10997)
@@ -1,24 +0,0 @@
-patch by Michel Dänzer <daenzer at debian.org>
-http://bugs.debian.org/504704
-Index: src/engine/e_datafile.c
-===================================================================
---- a/src/engine/e_datafile.c.orig
-+++ b/src/engine/e_datafile.c
-@@ -137,7 +137,7 @@
- 	}
- 
- #if defined(CONF_ARCH_ENDIAN_BIG)
--	swap_endian(df->data, sizeof(int), header.swaplen);
-+	swap_endian(df->data, sizeof(int), header.swaplen/sizeof(int));
- #endif
- 	
- 	if(DEBUG)
-@@ -261,7 +261,7 @@
- 		return ptr;
- 
- #if defined(CONF_ARCH_ENDIAN_BIG)
--	swap_endian(ptr, sizeof(int), size);
-+	swap_endian(ptr, sizeof(int), size/sizeof(int));
- #endif
- 
- 	return ptr;

Modified: packages/trunk/teeworlds/debian/patches/series
===================================================================
--- packages/trunk/teeworlds/debian/patches/series	2010-05-31 15:46:15 UTC (rev 10996)
+++ packages/trunk/teeworlds/debian/patches/series	2010-05-31 15:48:40 UTC (rev 10997)
@@ -1,5 +1,2 @@
-#fix-big-endian.diff
-#dont-link-with-asound.diff 
-system-libs.patch 
-new-wavpack.patch 
-#fix-bam-FTBFS.patch 
+system-libs.patch
+new-wavpack.patch