summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/ufoai/distinfo4
-rw-r--r--games/ufoai/patches/patch-ab22
-rw-r--r--games/ufoai/patches/patch-ac26
3 files changed, 51 insertions, 1 deletions
diff --git a/games/ufoai/distinfo b/games/ufoai/distinfo
index 5d5c2f4c75d..215abfaf9c8 100644
--- a/games/ufoai/distinfo
+++ b/games/ufoai/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/06/05 07:08:42 hasso Exp $
+$NetBSD: distinfo,v 1.3 2010/03/03 07:07:40 wiz Exp $
SHA1 (ufoai-2.2.1-data.tar) = eb071333478bd6860179e12d8655301980f87d60
RMD160 (ufoai-2.2.1-data.tar) = af91dd473f59c73e705181759059bd37ba215f62
@@ -10,3 +10,5 @@ SHA1 (ufoai-2.2.1-source.tar.bz2) = 6ad1b8c357fdbbe9a31839b3bf8de46ad17a40eb
RMD160 (ufoai-2.2.1-source.tar.bz2) = 980405a5d38bcbb5ae2cea4e25c54374c7dd8e99
Size (ufoai-2.2.1-source.tar.bz2) = 7640531 bytes
SHA1 (patch-aa) = 2b196e8d94a1848b42212f32c90a259e56440382
+SHA1 (patch-ab) = 373101e64ca4037bdb6b5c042dbf0c3b607b0955
+SHA1 (patch-ac) = 29069a06c2442060734e32162a9b561c19be8739
diff --git a/games/ufoai/patches/patch-ab b/games/ufoai/patches/patch-ab
new file mode 100644
index 00000000000..ab7b4080e90
--- /dev/null
+++ b/games/ufoai/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2010/03/03 07:07:40 wiz Exp $
+
+--- src/renderer/r_image.c.orig 2008-04-25 16:15:02.000000000 +0000
++++ src/renderer/r_image.c
+@@ -651,17 +651,6 @@ static void jpg_skip_input_data (j_decom
+ cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
+ }
+
+-static void jpeg_mem_src (j_decompress_ptr cinfo, byte * mem, int len)
+-{
+- cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+- cinfo->src->init_source = jpg_null;
+- cinfo->src->fill_input_buffer = jpg_fill_input_buffer;
+- cinfo->src->skip_input_data = jpg_skip_input_data;
+- cinfo->src->resync_to_restart = jpeg_resync_to_restart;
+- cinfo->src->term_source = jpg_null;
+- cinfo->src->bytes_in_buffer = len;
+- cinfo->src->next_input_byte = mem;
+-}
+
+ /**
+ * @sa R_LoadTGA
diff --git a/games/ufoai/patches/patch-ac b/games/ufoai/patches/patch-ac
new file mode 100644
index 00000000000..aa9eb36c285
--- /dev/null
+++ b/games/ufoai/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1 2010/03/03 07:07:40 wiz Exp $
+
+--- src/tools/ufo2map/common/imagelib.c.orig 2008-04-25 16:15:01.000000000 +0000
++++ src/tools/ufo2map/common/imagelib.c
+@@ -301,21 +301,6 @@ static void jpg_skip_input_data (j_decom
+
+ /**
+ * @brief
+- */
+-static void jpeg_mem_src (j_decompress_ptr cinfo, byte * mem, int len)
+-{
+- cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+- cinfo->src->init_source = jpg_null;
+- cinfo->src->fill_input_buffer = jpg_fill_input_buffer;
+- cinfo->src->skip_input_data = jpg_skip_input_data;
+- cinfo->src->resync_to_restart = jpeg_resync_to_restart;
+- cinfo->src->term_source = jpg_null;
+- cinfo->src->bytes_in_buffer = len;
+- cinfo->src->next_input_byte = mem;
+-}
+-
+-/**
+- * @brief
+ * @sa LoadTGA
+ * @sa LoadPNG
+ * @sa R_FindImage