[SCM] mess system emulator branch, master, updated. 6764e8a07bd9764f2d2c455a44f623d492cddd95

[Emmanuel Kasper]

The following commit has been merged in the master branch:
commit 6764e8a07bd9764f2d2c455a44f623d492cddd95
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date:   Thu Apr 26 14:35:50 2012 +0200

    Disable static linking of libjpeg and libflac

diff --git a/debian/changelog b/debian/changelog
index b82cac0..bda6101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ mess (0.145-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Use NetBSD distfiles as temporary source for downloading the source code
+  * Add patch to disable static linking of libflac and libjpeg
 
- -- Emmanuel Kasper <emmanuel at libera.cc>  Wed, 15 Feb 2012 14:22:52 +0100
+ -- Emmanuel Kasper <emmanuel at libera.cc>  Thu, 26 Apr 2012 14:34:53 +0200
 
 mess (0.144-2) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index bb2fdb8..1559d06 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 8),
                libexpat1-dev,
                libgconf2-dev,
                libgtk2.0-dev,
+               libflac-dev,
                libjpeg8-dev,
                libsdl1.2-dev,
                libsdl-ttf2.0-dev,
diff --git a/debian/patches/build_with_system_flac.patch b/debian/patches/build_with_system_flac.patch
new file mode 100644
index 0000000..31c7ed3
--- /dev/null
+++ b/debian/patches/build_with_system_flac.patch
@@ -0,0 +1,74 @@
+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/series b/debian/patches/series
index c0cac9f..556867f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 gnu_fixes.patch
 fix_mame_manpage_section.patch
 build_with_system_libjpeg.patch
+build_with_system_flac.patch
diff --git a/debian/rules b/debian/rules
index 604235c..c3e60cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,8 @@ DEB_MAME_OPTS = \
     MACOSX_USE_LIBSDL= \
     BUILD_EXPAT= \
     BUILD_ZLIB= \
-	BUILD_JPEGLIB= \
+    BUILD_JPEGLIB= \
+    BUILD_FLAC= \
     SYMBOLS= \
     SYMLEVEL= \
     DUMPSYM= \

-- 
mess system emulator