[SCM] packaging for the mame arcade game emulator branch, master, updated. 5d3ebe9543b1d994d0a9cac55aee5b35b80006f3

[Cesare Falco]

The following commit has been merged in the master branch:
commit 5d3ebe9543b1d994d0a9cac55aee5b35b80006f3
Author: Cesare Falco <cesare.falco at gmail.com>
Date:   Sun Feb 26 22:25:04 2012 +0100

    Add custom libjpeg library path to linker

diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch
index 8ede82b..923ab0d 100644
--- a/debian/patches/build_with_system_libjpeg.patch
+++ b/debian/patches/build_with_system_libjpeg.patch
@@ -1,7 +1,7 @@
 Index: mame/makefile
 ===================================================================
---- mame.orig/makefile	2012-02-26 00:12:39.000000000 +0100
-+++ mame/makefile	2012-02-26 00:13:15.000000000 +0100
+--- 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
@@ -12,12 +12,13 @@ Index: mame/makefile
  # 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,13 @@
+@@ -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
@@ -28,8 +29,8 @@ Index: mame/makefile
  # '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 00:12:39.000000000 +0100
-+++ mame/src/mame/drivers/sliver.c	2012-02-26 00:13:15.000000000 +0100
+--- 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"
@@ -41,8 +42,8 @@ Index: mame/src/mame/drivers/sliver.c
  #define FIFO_SIZE 1024
 Index: mame/src/osd/osdcomm.h
 ===================================================================
---- mame.orig/src/osd/osdcomm.h	2012-02-26 00:12:39.000000000 +0100
-+++ mame/src/osd/osdcomm.h	2012-02-26 00:13:15.000000000 +0100
+--- 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

-- 
packaging for the mame arcade game emulator