[SCM] mess system emulator branch, master, updated. f53cecb0670681980f1ad3263c51212e28ccb6f8

[Emmanuel Kasper]

The following commit has been merged in the master branch:
commit f53cecb0670681980f1ad3263c51212e28ccb6f8
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date:   Mon Jun 11 12:33:20 2012 +0200

    Drop patches to link with flac and jpeg system lib: all this has been pushed
    upstream by Cesare Falco.

diff --git a/debian/patches/build_with_system_flac.patch b/debian/patches/build_with_system_flac.patch
deleted file mode 100644
index 31c7ed3..0000000
--- a/debian/patches/build_with_system_flac.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Author: Emmanuel Kasper <emmanuel at libera.cc>
-Description: Add new makefile switch to allow the use of system flac headers
-Forwarded: no
-
---- a/makefile
-+++ b/makefile
-@@ -217,6 +217,9 @@
- # uncomment next line to build jpeglib as part of MAME build
- BUILD_JPEGLIB = 1
- 
-+# uncomment next line to build libflac as part of MAME build
-+BUILD_FLAC = 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
-@@ -414,8 +417,9 @@
- endif
- 
- # need to ensure FLAC functions are statically linked
-+ifeq ($(BUILD_FLAC),1)
- DEFS += -DFLAC__NO_DLL
--
-+endif
- 
- 
- #-------------------------------------------------
-@@ -640,6 +644,15 @@
- JPEG_LIB =
- endif
- 
-+# add flac library
-+ifeq ($(BUILD_FLAC),1)
-+INCPATH += -I$(SRC)/lib/libflac/include
-+FLAC_LIB = $(OBJ)/libflac.a
-+else
-+LIBS += -lFLAC
-+FLAC_LIB =
-+endif
-+
- #-------------------------------------------------
- # 'default' target needs to go here, before the 
- # include files which define additional targets
-@@ -649,8 +662,6 @@
- 
- all: default tools
- 
--FLAC_LIB = $(OBJ)/libflac.a 
--# $(OBJ)/libflac++.a
- 
- 
- #-------------------------------------------------
---- a/src/emu/sound/samples.c
-+++ b/src/emu/sound/samples.c
-@@ -16,7 +16,7 @@
- #include "emu.h"
- #include "emuopts.h"
- #include "samples.h"
--#include "../../lib/libflac/include/flac/all.h"
-+#include <FLAC/all.h>
- 
- typedef struct _sample_channel sample_channel;
- struct _sample_channel
---- a/src/lib/util/chd.c
-+++ b/src/lib/util/chd.c
-@@ -48,7 +48,7 @@
- #include <stdlib.h>
- #include <new>
- 
--#include "../../lib/libflac/include/flac/all.h"
-+#include <FLAC/all.h>
- 
- 
- /***************************************************************************
diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch
deleted file mode 100644
index 923ab0d..0000000
--- a/debian/patches/build_with_system_libjpeg.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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 556867f..eb1f11b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 gnu_fixes.patch
 fix_mame_manpage_section.patch
-build_with_system_libjpeg.patch
-build_with_system_flac.patch

-- 
mess system emulator