Update to 0.158. The usual changes.

11 files changed, 235 insertions, 31 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 2d09681e220..6db14da1ce3 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2015/01/02 15:54:24 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2015/01/29 20:00:29 wiz Exp $
 
-DISTNAME=	mame0157s
+DISTNAME=	mame0158s
 PKGNAME=	${DISTNAME:S/0/-0./:S/s$//}
 MASTER_SITES=	http://mamedev.org/downloader.php?file=releases/
 
diff --git a/emulators/mame/Makefile.common b/emulators/mame/Makefile.common
index 632b6472d17..32a01338bb0 100644
--- a/emulators/mame/Makefile.common
+++ b/emulators/mame/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2014/12/01 12:39:17 joerg Exp $
+# $NetBSD: Makefile.common,v 1.20 2015/01/29 20:00:29 wiz Exp $
 #
 # used by emulators/mame/Makefile
 # used by emulators/mess/Makefile
@@ -22,7 +22,7 @@ WRKSRC=			${WRKDIR}
 PATCHDIR=		${.CURDIR}/../../emulators/mame/patches
 DISTINFO_FILE=		${.CURDIR}/../../emulators/mame/distinfo
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c99 c++
 USE_TOOLS+=		gmake pkg-config
 UNLIMIT_RESOURCES+=	datasize
 MAKE_FILE=		makefile
@@ -76,16 +76,19 @@ post-extract:
 	cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
 	rm ${WRKDIR}/mame.zip
 	# This needs to be done for every file that is patched.
-	${RUN} for f in src/lib/web/mongoose.c src/osd/osdcore.h; do    \
+	${RUN} for f in 3rdparty/mongoose/mongoose.c makefile src/osd/sdl/sdl.mak; do    \
 		${CP} ${WRKSRC}/$${f} ${WRKSRC}/$${f}.bak;              \
 		${CAT} ${WRKSRC}/$${f}.bak | dos2unix >${WRKSRC}/$${f}; \
 	done
 
 .include "../../lang/python/application.mk"
+.include "../../audio/flac/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 78b0d6590bd..e898368782b 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.26 2015/01/02 15:54:24 wiz Exp $
+$NetBSD: distinfo,v 1.27 2015/01/29 20:00:29 wiz Exp $
 
-SHA1 (mame0157s.zip) = b0f4f850edc1919a633d9b66601ab60ce736da27
-RMD160 (mame0157s.zip) = 4856b9b018027e7760a8df38123dba51f716e909
-Size (mame0157s.zip) = 41008118 bytes
-SHA1 (patch-src_lib_web_mongoose.c) = 58ecfa92b254e915988781360d7d79a73d80e44b
-SHA1 (patch-src_osd_osdcore.h) = 4dbc233a613d1743f97d3cb9c6526fb56ca7b6d6
+SHA1 (mame0158s.zip) = 4c1841674cf158c4288ad3065431b4cf9e82d515
+RMD160 (mame0158s.zip) = 7ffa288bef4455fbec8a1f8de1f0a55bbdc41a75
+Size (mame0158s.zip) = 46615447 bytes
+SHA1 (patch-3rdparty_mongoose_mongoose.c) = 1669cfc16f557ceb6e969cadfb805e00a81b87e8
+SHA1 (patch-makefile) = ff6ba8115b5793144c8f6e2c3ec86642b75801cc
+SHA1 (patch-src_build_build.mak) = cc389ece3c1cf76370815fe3ed00936219ebc7ff
+SHA1 (patch-src_mess_tools_castool_castool.mak) = 50739ba1b9d353e8d450001b42108bfab370c213
+SHA1 (patch-src_mess_tools_floptool_floptool.mak) = c1e4d488e331790054631c0c54ebb1dc26206e71
+SHA1 (patch-src_mess_tools_imgtool_imgtool.mak) = cec4c31cd0c7c334e5eb145bcb59d3496a1d2408
 SHA1 (patch-src_osd_sdl_sdl.mak) = 21fbc2902d66e913e0bc4cc4fab7cf78db33ac21
+SHA1 (patch-src_tools_tools.mak) = bdc12ad9312775b9a4261a24cdfd999480f2e9fe
diff --git a/emulators/mame/patches/patch-src_lib_web_mongoose.c b/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c
index 821cfcb0f22..d3ee428c707 100644
--- a/emulators/mame/patches/patch-src_lib_web_mongoose.c
+++ b/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c
@@ -1,16 +1,17 @@
-$NetBSD: patch-src_lib_web_mongoose.c,v 1.4 2014/10/26 09:36:08 wiz Exp $
+$NetBSD: patch-3rdparty_mongoose_mongoose.c,v 1.1 2015/01/29 20:00:29 wiz Exp $
 
 If _XOPEN_SOURCE is defined to 600, NetBSD does not provide strtoll
 and other stuff.
 
---- src/lib/web/mongoose.c.orig	2014-10-26 08:51:23.000000000 +0000
-+++ src/lib/web/mongoose.c
-@@ -48,7 +48,7 @@
+--- 3rdparty/mongoose/mongoose.c.orig	2015-01-29 13:55:43.000000000 +0000
++++ 3rdparty/mongoose/mongoose.c
+@@ -48,7 +48,9 @@
  #define _INTEGRAL_MAX_BITS 64   // Enable _stati64() on Windows
  #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005+
  #undef WIN32_LEAN_AND_MEAN      // Let windows.h always include winsock2.h
--#define _XOPEN_SOURCE 600       // For flockfile() on Linux
-+//#define _XOPEN_SOURCE 600       // For flockfile() on Linux
++#ifdef __Linux__
+ #define _XOPEN_SOURCE 600       // For flockfile() on Linux
++#endif
  #define __STDC_FORMAT_MACROS    // <inttypes.h> wants this for C++
  #define __STDC_LIMIT_MACROS     // C++ wants that for INT64_MAX
  #ifndef _LARGEFILE_SOURCE
diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile
new file mode 100644
index 00000000000..ac88c00d96d
--- /dev/null
+++ b/emulators/mame/patches/patch-makefile
@@ -0,0 +1,38 @@
+$NetBSD: patch-makefile,v 1.7 2015/01/29 20:00:29 wiz Exp $
+
+--- makefile.orig	2015-01-29 17:12:56.000000000 +0000
++++ makefile
+@@ -227,19 +227,19 @@ endif
+ # BIGENDIAN = 1
+ 
+ # uncomment next line to build expat as part of MAME build
+-BUILD_EXPAT = 1
++#BUILD_EXPAT = 1
+ 
+ # uncomment next line to build zlib as part of MAME build
+-BUILD_ZLIB = 1
++#BUILD_ZLIB = 1
+ 
+ # uncomment next line to build libflac as part of MAME build
+-BUILD_FLAC = 1
++#BUILD_FLAC = 1
+ 
+ # uncomment next line to build jpeglib as part of MAME build
+-BUILD_JPEGLIB = 1
++#BUILD_JPEGLIB = 1
+ 
+ # uncomment next line to build libsqlite3 as part of MAME/MESS build
+-BUILD_SQLITE3 = 1
++#BUILD_SQLITE3 = 1
+ 
+ # uncomment next line to build PortMidi as part of MAME/MESS build
+ BUILD_MIDILIB = 1
+@@ -739,7 +739,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG
+ #-------------------------------------------------
+ 
+ # start with an empty set of libs
+-LIBS = 
++LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
+ 
+ # add expat XML library
+ ifeq ($(BUILD_EXPAT),1)
diff --git a/emulators/mame/patches/patch-src_build_build.mak b/emulators/mame/patches/patch-src_build_build.mak
new file mode 100644
index 00000000000..eac08a86da4
--- /dev/null
+++ b/emulators/mame/patches/patch-src_build_build.mak
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_build_build.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $
+
+--- src/build/build.mak.orig	2015-01-28 09:20:10.000000000 +0000
++++ src/build/build.mak
+@@ -60,7 +60,7 @@ MAKEDEPOBJS = \
+ 
+ $(MAKEDEP_TARGET): $(MAKEDEPOBJS) $(LIBOCORE) $(ZLIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -79,7 +79,7 @@ MAKEMAKOBJS = \
+ 
+ $(MAKEMAK_TARGET): $(MAKEMAKOBJS) $(LIBOCORE) $(ZLIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -98,7 +98,7 @@ MAKELISTOBJS = \
+ 
+ $(MAKELIST_TARGET): $(MAKELISTOBJS) $(LIBOCORE) $(ZLIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
diff --git a/emulators/mame/patches/patch-src_mess_tools_castool_castool.mak b/emulators/mame/patches/patch-src_mess_tools_castool_castool.mak
new file mode 100644
index 00000000000..61e6808c2af
--- /dev/null
+++ b/emulators/mame/patches/patch-src_mess_tools_castool_castool.mak
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_mess_tools_castool_castool.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $
+
+--- src/mess/tools/castool/castool.mak.orig	2015-01-28 09:20:10.000000000 +0000
++++ src/mess/tools/castool/castool.mak
+@@ -36,4 +36,4 @@ CASTOOL_OBJS = \
+ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+ $(CASTOOL): $(CASTOOL_OBJS) $(FORMATS_LIB) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
diff --git a/emulators/mame/patches/patch-src_mess_tools_floptool_floptool.mak b/emulators/mame/patches/patch-src_mess_tools_floptool_floptool.mak
new file mode 100644
index 00000000000..8d4dfb471fa
--- /dev/null
+++ b/emulators/mame/patches/patch-src_mess_tools_floptool_floptool.mak
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_mess_tools_floptool_floptool.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $
+
+--- src/mess/tools/floptool/floptool.mak.orig	2015-01-28 09:20:10.000000000 +0000
++++ src/mess/tools/floptool/floptool.mak
+@@ -36,4 +36,4 @@ FLOPTOOL_OBJS = \
+ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+ $(FLOPTOOL): $(FLOPTOOL_OBJS) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
diff --git a/emulators/mame/patches/patch-src_mess_tools_imgtool_imgtool.mak b/emulators/mame/patches/patch-src_mess_tools_imgtool_imgtool.mak
new file mode 100644
index 00000000000..7a8995323c6
--- /dev/null
+++ b/emulators/mame/patches/patch-src_mess_tools_imgtool_imgtool.mak
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_mess_tools_imgtool_imgtool.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $
+
+--- src/mess/tools/imgtool/imgtool.mak.orig	2015-01-28 09:20:10.000000000 +0000
++++ src/mess/tools/imgtool/imgtool.mak
+@@ -76,4 +76,4 @@ IMGTOOL_OBJS = \
+ 
+ $(IMGTOOL): $(IMGTOOL_OBJS) $(LIBIMGTOOL) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
diff --git a/emulators/mame/patches/patch-src_osd_osdcore.h b/emulators/mame/patches/patch-src_osd_osdcore.h
deleted file mode 100644
index 2bb5939b1d9..00000000000
--- a/emulators/mame/patches/patch-src_osd_osdcore.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_osd_osdcore.h,v 1.3 2014/09/24 20:20:49 wiz Exp $
-
-Include stdarg.h for va_list.
-
---- src/osd/osdcore.h.orig	2014-04-25 09:31:28.000000000 +0000
-+++ src/osd/osdcore.h
-@@ -19,6 +19,7 @@
- #ifndef __OSDCORE_H__
- #define __OSDCORE_H__
- 
-+#include <stdarg.h>
- #include "osdcomm.h"
- #include "delegate.h"
- 
diff --git a/emulators/mame/patches/patch-src_tools_tools.mak b/emulators/mame/patches/patch-src_tools_tools.mak
new file mode 100644
index 00000000000..2002d6ec55f
--- /dev/null
+++ b/emulators/mame/patches/patch-src_tools_tools.mak
@@ -0,0 +1,110 @@
+$NetBSD: patch-src_tools_tools.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $
+
+--- src/tools/tools.mak.orig	2015-01-28 09:20:10.000000000 +0000
++++ src/tools/tools.mak
+@@ -74,7 +74,7 @@ ROMCMPOBJS = \
+ 
+ romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -88,7 +88,7 @@ CHDMANOBJS = \
+ chdman$(EXE): $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE)
+ 	$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $(VERSIONOBJ) $^ $(BASELIBS) $(FLAC_LIB) -o $@
++	$(LD) $(LDFLAGS) $(VERSIONOBJ) $^ $(BASELIBS) $(FLAC_LIB) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -101,7 +101,7 @@ JEDUTILOBJS = \
+ 
+ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -115,7 +115,7 @@ UNIDASMOBJS = \
+ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+ unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM) $(LIBEMU) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -128,7 +128,7 @@ LDRESAMPLEOBJS = \
+ 
+ ldresample$(EXE): $(LDRESAMPLEOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(EXPAT)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -141,7 +141,7 @@ LDVERIFYOBJS = \
+ 
+ ldverify$(EXE): $(LDVERIFYOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(EXPAT)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -154,7 +154,7 @@ REGREPOBJS = \
+ 
+ regrep$(EXE): $(REGREPOBJS) $(LIBUTIL) $(FLAC_LIB) $(LIBOCORE) $(ZLIB) $(EXPAT)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -167,7 +167,7 @@ SRCCLEANOBJS = \
+ 
+ srcclean$(EXE): $(SRCCLEANOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -180,7 +180,7 @@ SRC2HTMLOBJS = \
+ 
+ src2html$(EXE): $(SRC2HTMLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -194,7 +194,7 @@ SPLITOBJS = \
+ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+ split$(EXE): $(SPLITOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ 
+ 
+@@ -207,7 +207,7 @@ PNGCMPOBJS = \
+ 
+ pngcmp$(EXE): $(PNGCMPOBJS) $(LIBUTIL) $(FLAC_LIB) $(LIBOCORE) $(ZLIB)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+ 
+ #-------------------------------------------------
+ # nltool
+@@ -219,5 +219,5 @@ NLTOOLOBJS = \
+ 
+ nltool$(EXE): $(NLTOOLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
++	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
+