[pkgsrc/trunk]: pkgsrc/games/ufoai Fix build with latest jpeg.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a65d4e56e5f2
branches:  trunk
changeset: 572570:a65d4e56e5f2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 03 07:07:40 2010 +0000

description:
Fix build with latest jpeg.

diffstat:

 games/ufoai/distinfo         |   4 +++-
 games/ufoai/patches/patch-ab |  22 ++++++++++++++++++++++
 games/ufoai/patches/patch-ac |  26 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletions(-)

diffs (71 lines):

diff -r 8c632464e7ff -r a65d4e56e5f2 games/ufoai/distinfo
--- a/games/ufoai/distinfo      Wed Mar 03 06:03:45 2010 +0000
+++ b/games/ufoai/distinfo      Wed Mar 03 07:07:40 2010 +0000
@@ -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 @@
 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 -r 8c632464e7ff -r a65d4e56e5f2 games/ufoai/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/ufoai/patches/patch-ab      Wed Mar 03 07:07:40 2010 +0000
@@ -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 -r 8c632464e7ff -r a65d4e56e5f2 games/ufoai/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/ufoai/patches/patch-ac      Wed Mar 03 07:07:40 2010 +0000
@@ -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