[SCM] packaging for the mame arcade game emulator branch, master, updated. 33d2561fd0d9f603965c69597570b980961a8e33
Emmanuel Kasper
emmanuel at libera.cc
Thu Feb 23 23:51:33 UTC 2012
The following commit has been merged in the master branch:
commit 33d2561fd0d9f603965c69597570b980961a8e33
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date: Fri Feb 24 00:49:28 2012 +0100
Refactoring of the patch
diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch
index f218dc3..2a2bddc 100644
--- a/debian/patches/build_with_system_libjpeg.patch
+++ b/debian/patches/build_with_system_libjpeg.patch
@@ -16,18 +16,25 @@ Forwarded: Yes
# 'default' target needs to go here, before the
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
-@@ -67,7 +67,13 @@
+@@ -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
+--- a/src/osd/osdcomm.h
++++ b/src/osd/osdcomm.h
+@@ -143,6 +143,10 @@
+
+ #endif
+
+/* This should prevent libjpeg of typedef'ing INT32 */
+#ifndef XMD_H
-+# define XMD_H
++#define XMD_H
+#endif
-+
-+#include <jpeglib.h>
- #define FIFO_SIZE 1024
+ /***************************************************************************
--
packaging for the mame arcade game emulator
More information about the Pkg-games-commits
mailing list