[SCM] mess system emulator branch, master, updated. 2c98793c3945f4c268bf9b594eb0ad78d4e329bb
Emmanuel Kasper
emmanuel at libera.cc
Wed Feb 29 16:41:05 UTC 2012
The following commit has been merged in the master branch:
commit 2c98793c3945f4c268bf9b594eb0ad78d4e329bb
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date: Wed Feb 29 17:40:00 2012 +0100
Disable building of embedded upstream libjpeg
diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch
new file mode 100644
index 0000000..923ab0d
--- /dev/null
+++ b/debian/patches/build_with_system_libjpeg.patch
@@ -0,0 +1,57 @@
+Index: mame/makefile
+===================================================================
+--- mame.orig/makefile 2012-02-26 22:21:48.000000000 +0100
++++ mame/makefile 2012-02-26 22:22:36.000000000 +0100
+@@ -214,6 +214,9 @@
+ # uncomment next line to include the symbols
+ # SYMBOLS = 1
+
++# uncomment next line to build jpeglib as part of MAME build
++BUILD_JPEGLIB = 1
++
+ # specify symbols level or leave commented to use the default
+ # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace)
+ # SYMLEVEL = 2
+@@ -628,7 +631,14 @@
+ # add formats emulation library
+ FORMATS_LIB = $(OBJ)/libformats.a
+
++# add jpeglib image library
++ifeq ($(BUILD_JPEGLIB),1)
++INCPATH += -I$(SRC)/lib/libjpeg
+ JPEG_LIB = $(OBJ)/libjpeg.a
++else
++LIBS += -ljpeg
++JPEG_LIB =
++endif
+
+ #-------------------------------------------------
+ # 'default' target needs to go here, before the
+Index: mame/src/mame/drivers/sliver.c
+===================================================================
+--- mame.orig/src/mame/drivers/sliver.c 2012-02-26 22:21:48.000000000 +0100
++++ mame/src/mame/drivers/sliver.c 2012-02-26 22:21:53.000000000 +0100
+@@ -67,7 +67,7 @@
+ #include "sound/okim6295.h"
+ #include "cpu/mcs51/mcs51.h"
+ #include "video/ramdac.h"
+-#include "../../lib/libjpeg/jpeglib.h"
++#include <jpeglib.h>
+
+
+ #define FIFO_SIZE 1024
+Index: mame/src/osd/osdcomm.h
+===================================================================
+--- mame.orig/src/osd/osdcomm.h 2012-02-26 22:21:48.000000000 +0100
++++ mame/src/osd/osdcomm.h 2012-02-26 22:21:53.000000000 +0100
+@@ -143,6 +143,10 @@
+
+ #endif
+
++/* This should prevent libjpeg of typedef'ing INT32 */
++#ifndef XMD_H
++#define XMD_H
++#endif
+
+
+ /***************************************************************************
diff --git a/debian/patches/series b/debian/patches/series
index eb1f11b..c0cac9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
gnu_fixes.patch
fix_mame_manpage_section.patch
+build_with_system_libjpeg.patch
diff --git a/debian/rules b/debian/rules
index df0e790..7886f41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,7 @@ DEB_MAME_OPTS = \
MACOSX_USE_LIBSDL= \
BUILD_EXPAT= \
BUILD_ZLIB= \
+ BUILD_JPEGLIB= \
SYMBOLS= \
SYMLEVEL= \
DUMPSYM= \
@@ -140,7 +141,7 @@ endif
dh $@
override_dh_auto_build:
- $(MAKE) -j3 $(DEB_MESS_OPTS) all
+ $(MAKE) -j5 $(DEB_MESS_OPTS) all
$(CURDIR)/mess -createconfig
mv mess.ini default.mess.ini
--
mess system emulator
More information about the Pkg-games-commits
mailing list