pkg/42701: games/ufoai compile errors with jpeg-8 (+FIX)

[kre%munnari.OZ.AU@localhost]

>Number:         42701
>Category:       pkg
>Synopsis:       games/ufoai compile errors with jpeg-8   (+FIX)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jan 30 08:00:00 +0000 2010
>Originator:     Robert Elz
>Release:        NetBSD 4.0 / i386    (pkgsrc current 2010-01-30)
>Organization:
        Prince of Songkla University
>Environment:
System: NetBSD jade.coe.psu.ac.th 4.0_STABLE NetBSD 4.0_STABLE 
(JADE-1.696-20080517) #9: Fri May 23 18:55:13 ICT 2008 
kre%jade.coe.psu.ac.th@localhost:/usr/obj/4/kernels/JADE i386
Architecture: i386
Machine: i386
>Description:
        jpeg-8 added a prototype for jpeg_mem_src() info jpeglib.h
        games/ufoai's jpeg functions (two separate instances) have
        their own versions of that function with different parameters.

>How-To-Repeat:
        I use pkg_comp (blah blah - all irrelevant for this one)....

        With jpeg-8 (or 8nb1 - this is not the symtab issue), and
        building games/ufoai expect to see:

 * [UFO] src/renderer/r_image.c
src/renderer/r_image.c:655: error: conflicting types for 'jpeg_mem_src'
/pkg_comp/obj/pkgsrc/games/ufoai/4x/.buildlink/include/jpeglib.h:959: error: 
previous declaration of 'jpeg_mem_src' was here
gmake: *** [debug-netbsd-i386/client/renderer/r_image.o] Error 1
*** Error code 2

Stop.
make: stopped in /usr/pkgsrc/games/ufoai
*** Error code 1

Stop.

        After correcting that one (patches/patch-ab below) start
        again, this time expect:

 * [MAP] src/tools/ufo2map/common/imagelib.c
src/tools/ufo2map/common/imagelib.c:306: error: conflicting types for 
'jpeg_mem_src'
/pkg_comp/obj/pkgsrc/games/ufoai/4x/.buildlink/include/jpeglib.h:959: error: 
previous declaration of 'jpeg_mem_src' was here
gmake: *** [debug-netbsd-i386/tools/ufo2map/tools/ufo2map/common/imagelib.o] 
Error 1
*** Error code 2

Stop.
make: stopped in /usr/pkgsrc/games/ufoai
*** Error code 1

Stop.

        ps: this is the same basic problem as reported in PR's 42698 42699
        and 42700 - just occurring twice

>Fix:
        Unpack the following shar file to produce patches/patch-ab and
        patches/patch-ac then rebuild the distinfo file.  After that
        games/ufoai at least compiles and packages successfully.

        Note that while very similar these patches are not the same
        one as in the previous PR's.

        The same caveat applies though, there's likely to be (soon, if not
        already) an updated version (or at least a patch) for this problem
        available from upstream.

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       patches/patch-ab
#       patches/patch-ac
#
echo x - patches/patch-ab
sed 's/^X//' >patches/patch-ab << 'END-of-patches/patch-ab'
X--- src/renderer/r_image.c.WAS 2008-04-25 16:15:02.000000000 +0000
X+++ src/renderer/r_image.c     2010-01-30 07:28:16.000000000 +0000
X@@ -32,6 +32,8 @@
X #include <jpeglib.h>
X #include <png.h>
X 
X+#define       jpeg_mem_src    my_jpeg_mem_src
X+
X static char glerrortex[MAX_GLERRORTEX];
X static char *glerrortexend;
X static image_t gltextures[MAX_GLTEXTURES];
END-of-patches/patch-ab
echo x - patches/patch-ac
sed 's/^X//' >patches/patch-ac << 'END-of-patches/patch-ac'
X--- src/tools/ufo2map/common/imagelib.c.WAS    2010-01-30 07:34:31.000000000 
+0000
X+++ src/tools/ufo2map/common/imagelib.c        2010-01-30 07:36:07.000000000 
+0000
X@@ -27,6 +27,8 @@
X #include "cmdlib.h"
X #include "imagelib.h"
X 
X+#define       jpeg_mem_src    my_jpeg_mem_src
X+
X /*
X ============================================================================
X TARGA IMAGE
END-of-patches/patch-ac
exit