The following commit has been merged in the master branch: commit 7986b88b4fe54a5500bfd4359c9ad74fa3bf93fe Author: Emmanuel Kasper <emman...@libera.cc> Date: Sat Feb 18 11:31:08 2012 +0100
Begin work on building with system libjpeg compile but does not link yet diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch new file mode 100644 index 0000000..eb9e3c1 --- /dev/null +++ b/debian/patches/build_with_system_libjpeg.patch @@ -0,0 +1,46 @@ +Description: WIP build with system libjpeg +compile but does link properly at the momment +Author: Emmanuel Kasper <emman...@libera.cc> +Forwarded: <no|not-needed|url proving that it has been forwarded> + +--- mame-0.145.orig/src/osd/osdcomm.h ++++ mame-0.145/src/osd/osdcomm.h +@@ -45,6 +45,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <inttypes.h> + //#include <stdlib.h> + + +@@ -143,7 +144,9 @@ __extension__ typedef signed long long + + #endif + +- ++/* avoid typedef conflicts when building with system libjpeg */ ++#define INT32 int32_t ++#define INT64 int64_t + + /*************************************************************************** + FUNDAMENTAL CONSTANTS +--- mame-0.145.orig/src/mame/drivers/sliver.c ++++ mame-0.145/src/mame/drivers/sliver.c +@@ -62,12 +62,16 @@ Notes: + VSync - 60Hz + */ + ++ + #include "emu.h" + #include "cpu/m68000/m68000.h" + #include "sound/okim6295.h" + #include "cpu/mcs51/mcs51.h" + #include "video/ramdac.h" +-#include "../../lib/libjpeg/jpeglib.h" ++#include <X11/Xmd.h> ++#include <jpeglib.h> ++ ++ + + + #define FIFO_SIZE 1024 -- packaging for the mame arcade game emulator _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits