diff options
author | wiz <wiz> | 2015-01-29 20:00:29 +0000 |
---|---|---|
committer | wiz <wiz> | 2015-01-29 20:00:29 +0000 |
commit | a883c0d04f4e6a1e44a5535944f983b8e524f68e (patch) | |
tree | 9209cc1cbe2c47337e1c7f421a7ccffecb9360fe /emulators/mame/patches | |
parent | 7eb24371e905917a2d3c7dcfff3eec004eb3e66f (diff) | |
download | pkgsrc-a883c0d04f4e6a1e44a5535944f983b8e524f68e.tar.gz |
Update to 0.158. The usual changes.
Diffstat (limited to 'emulators/mame/patches')
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c (renamed from emulators/mame/patches/patch-src_lib_web_mongoose.c) | 13 | ||||
-rw-r--r-- | emulators/mame/patches/patch-makefile | 38 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_build_build.mak | 31 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_mess_tools_castool_castool.mak | 10 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_mess_tools_floptool_floptool.mak | 10 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_mess_tools_imgtool_imgtool.mak | 10 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_osd_osdcore.h | 14 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_tools_tools.mak | 110 |
8 files changed, 216 insertions, 20 deletions
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) + |