Thu Jan 29 20:08:16 2015 UTC ()
Add upstream bug report URLs.


(wiz)
diff -r1.27 -r1.28 pkgsrc/emulators/mame/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c
diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/patch-src_build_build.mak
diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/patch-src_mess_tools_castool_castool.mak
diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/patch-src_mess_tools_floptool_floptool.mak
diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/patch-src_mess_tools_imgtool_imgtool.mak
diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/patch-src_tools_tools.mak
diff -r1.7 -r1.8 pkgsrc/emulators/mame/patches/patch-makefile
cvs diff -r1.27 -r1.28 pkgsrc/emulators/mame/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/mame/distinfo 2015/01/29 20:00:29 1.27
+++ pkgsrc/emulators/mame/distinfo 2015/01/29 20:08:16 1.28
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.27 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: distinfo,v 1.28 2015/01/29 20:08:16 wiz Exp $
2 2
3SHA1 (mame0158s.zip) = 4c1841674cf158c4288ad3065431b4cf9e82d515 3SHA1 (mame0158s.zip) = 4c1841674cf158c4288ad3065431b4cf9e82d515
4RMD160 (mame0158s.zip) = 7ffa288bef4455fbec8a1f8de1f0a55bbdc41a75 4RMD160 (mame0158s.zip) = 7ffa288bef4455fbec8a1f8de1f0a55bbdc41a75
5Size (mame0158s.zip) = 46615447 bytes 5Size (mame0158s.zip) = 46615447 bytes
6SHA1 (patch-3rdparty_mongoose_mongoose.c) = 1669cfc16f557ceb6e969cadfb805e00a81b87e8 6SHA1 (patch-3rdparty_mongoose_mongoose.c) = 525b9ee03ed90d22eccf086ffbc81e2756ba6e30
7SHA1 (patch-makefile) = ff6ba8115b5793144c8f6e2c3ec86642b75801cc 7SHA1 (patch-makefile) = 344af7c4e4de2fa5cbb8a1e88d66c6bb9acf3e18
8SHA1 (patch-src_build_build.mak) = cc389ece3c1cf76370815fe3ed00936219ebc7ff 8SHA1 (patch-src_build_build.mak) = c786ba768741ead4ca3054c8b867c8c7ecd1d40d
9SHA1 (patch-src_mess_tools_castool_castool.mak) = 50739ba1b9d353e8d450001b42108bfab370c213 9SHA1 (patch-src_mess_tools_castool_castool.mak) = 18e9041b051370578bc96da7e30c664e0a58a614
10SHA1 (patch-src_mess_tools_floptool_floptool.mak) = c1e4d488e331790054631c0c54ebb1dc26206e71 10SHA1 (patch-src_mess_tools_floptool_floptool.mak) = e343faae32caf842be3989ca45caaf16d4700554
11SHA1 (patch-src_mess_tools_imgtool_imgtool.mak) = cec4c31cd0c7c334e5eb145bcb59d3496a1d2408 11SHA1 (patch-src_mess_tools_imgtool_imgtool.mak) = 28855d6f70d50bf1e2bed7f2a0c905b1e5e8390a
12SHA1 (patch-src_osd_sdl_sdl.mak) = 21fbc2902d66e913e0bc4cc4fab7cf78db33ac21 12SHA1 (patch-src_osd_sdl_sdl.mak) = 21fbc2902d66e913e0bc4cc4fab7cf78db33ac21
13SHA1 (patch-src_tools_tools.mak) = bdc12ad9312775b9a4261a24cdfd999480f2e9fe 13SHA1 (patch-src_tools_tools.mak) = d9f09231b3b6067a787fbab148e42df600f28881
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/Attic/patch-3rdparty_mongoose_mongoose.c (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/Attic/patch-3rdparty_mongoose_mongoose.c 2015/01/29 20:00:29 1.1
+++ pkgsrc/emulators/mame/patches/Attic/patch-3rdparty_mongoose_mongoose.c 2015/01/29 20:08:16 1.2
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1$NetBSD: patch-3rdparty_mongoose_mongoose.c,v 1.1 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: patch-3rdparty_mongoose_mongoose.c,v 1.2 2015/01/29 20:08:16 wiz Exp $
2 2
3If _XOPEN_SOURCE is defined to 600, NetBSD does not provide strtoll 3If _XOPEN_SOURCE is defined to 600, NetBSD does not provide strtoll
4and other stuff. 4and other stuff.
5 5
 6https://github.com/cesanta/mongoose/pull/466
 7
6--- 3rdparty/mongoose/mongoose.c.orig 2015-01-29 13:55:43.000000000 +0000 8--- 3rdparty/mongoose/mongoose.c.orig 2015-01-29 13:55:43.000000000 +0000
7+++ 3rdparty/mongoose/mongoose.c 9+++ 3rdparty/mongoose/mongoose.c
8@@ -48,7 +48,9 @@ 10@@ -48,7 +48,9 @@
9 #define _INTEGRAL_MAX_BITS 64 // Enable _stati64() on Windows 11 #define _INTEGRAL_MAX_BITS 64 // Enable _stati64() on Windows
10 #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005+ 12 #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005+
11 #undef WIN32_LEAN_AND_MEAN // Let windows.h always include winsock2.h 13 #undef WIN32_LEAN_AND_MEAN // Let windows.h always include winsock2.h
12+#ifdef __Linux__ 14+#ifdef __Linux__
13 #define _XOPEN_SOURCE 600 // For flockfile() on Linux 15 #define _XOPEN_SOURCE 600 // For flockfile() on Linux
14+#endif 16+#endif
15 #define __STDC_FORMAT_MACROS // <inttypes.h> wants this for C++ 17 #define __STDC_FORMAT_MACROS // <inttypes.h> wants this for C++
16 #define __STDC_LIMIT_MACROS // C++ wants that for INT64_MAX 18 #define __STDC_LIMIT_MACROS // C++ wants that for INT64_MAX
17 #ifndef _LARGEFILE_SOURCE 19 #ifndef _LARGEFILE_SOURCE
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/Attic/patch-src_build_build.mak (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/Attic/patch-src_build_build.mak 2015/01/29 20:00:29 1.1
+++ pkgsrc/emulators/mame/patches/Attic/patch-src_build_build.mak 2015/01/29 20:08:16 1.2
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-src_build_build.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: patch-src_build_build.mak,v 1.2 2015/01/29 20:08:16 wiz Exp $
 2
 3Fix linking against pkgsrc libraries.
 4https://github.com/mamedev/mame/pull/123
2 5
3--- src/build/build.mak.orig 2015-01-28 09:20:10.000000000 +0000 6--- src/build/build.mak.orig 2015-01-28 09:20:10.000000000 +0000
4+++ src/build/build.mak 7+++ src/build/build.mak
5@@ -60,7 +60,7 @@ MAKEDEPOBJS = \ 8@@ -60,7 +60,7 @@ MAKEDEPOBJS = \
6  9
7 $(MAKEDEP_TARGET): $(MAKEDEPOBJS) $(LIBOCORE) $(ZLIB) 10 $(MAKEDEP_TARGET): $(MAKEDEPOBJS) $(LIBOCORE) $(ZLIB)
8 @echo Linking $@... 11 @echo Linking $@...
9- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ 12- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
10+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS) 13+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
11  14
12  15
13  16
14@@ -79,7 +79,7 @@ MAKEMAKOBJS = \ 17@@ -79,7 +79,7 @@ MAKEMAKOBJS = \
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_castool_castool.mak (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_castool_castool.mak 2015/01/29 20:00:29 1.1
+++ pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_castool_castool.mak 2015/01/29 20:08:16 1.2
@@ -1,10 +1,13 @@ @@ -1,10 +1,13 @@
1$NetBSD: patch-src_mess_tools_castool_castool.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: patch-src_mess_tools_castool_castool.mak,v 1.2 2015/01/29 20:08:16 wiz Exp $
 2
 3Fix linking against pkgsrc libraries.
 4https://github.com/mamedev/mame/pull/123
2 5
3--- src/mess/tools/castool/castool.mak.orig 2015-01-28 09:20:10.000000000 +0000 6--- src/mess/tools/castool/castool.mak.orig 2015-01-28 09:20:10.000000000 +0000
4+++ src/mess/tools/castool/castool.mak 7+++ src/mess/tools/castool/castool.mak
5@@ -36,4 +36,4 @@ CASTOOL_OBJS = \ 8@@ -36,4 +36,4 @@ CASTOOL_OBJS = \
6 # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking... 9 # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
7 $(CASTOOL): $(CASTOOL_OBJS) $(FORMATS_LIB) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB) 10 $(CASTOOL): $(CASTOOL_OBJS) $(FORMATS_LIB) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
8 @echo Linking $@... 11 @echo Linking $@...
9- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ 12- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
10+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS) 13+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_floptool_floptool.mak (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_floptool_floptool.mak 2015/01/29 20:00:29 1.1
+++ pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_floptool_floptool.mak 2015/01/29 20:08:16 1.2
@@ -1,10 +1,13 @@ @@ -1,10 +1,13 @@
1$NetBSD: patch-src_mess_tools_floptool_floptool.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: patch-src_mess_tools_floptool_floptool.mak,v 1.2 2015/01/29 20:08:16 wiz Exp $
 2
 3Fix linking against pkgsrc libraries.
 4https://github.com/mamedev/mame/pull/123
2 5
3--- src/mess/tools/floptool/floptool.mak.orig 2015-01-28 09:20:10.000000000 +0000 6--- src/mess/tools/floptool/floptool.mak.orig 2015-01-28 09:20:10.000000000 +0000
4+++ src/mess/tools/floptool/floptool.mak 7+++ src/mess/tools/floptool/floptool.mak
5@@ -36,4 +36,4 @@ FLOPTOOL_OBJS = \ 8@@ -36,4 +36,4 @@ FLOPTOOL_OBJS = \
6 # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking... 9 # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
7 $(FLOPTOOL): $(FLOPTOOL_OBJS) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB) 10 $(FLOPTOOL): $(FLOPTOOL_OBJS) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
8 @echo Linking $@... 11 @echo Linking $@...
9- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ 12- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
10+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS) 13+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_imgtool_imgtool.mak (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_imgtool_imgtool.mak 2015/01/29 20:00:29 1.1
+++ pkgsrc/emulators/mame/patches/Attic/patch-src_mess_tools_imgtool_imgtool.mak 2015/01/29 20:08:16 1.2
@@ -1,10 +1,13 @@ @@ -1,10 +1,13 @@
1$NetBSD: patch-src_mess_tools_imgtool_imgtool.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: patch-src_mess_tools_imgtool_imgtool.mak,v 1.2 2015/01/29 20:08:16 wiz Exp $
 2
 3Fix linking against pkgsrc libraries.
 4https://github.com/mamedev/mame/pull/123
2 5
3--- src/mess/tools/imgtool/imgtool.mak.orig 2015-01-28 09:20:10.000000000 +0000 6--- src/mess/tools/imgtool/imgtool.mak.orig 2015-01-28 09:20:10.000000000 +0000
4+++ src/mess/tools/imgtool/imgtool.mak 7+++ src/mess/tools/imgtool/imgtool.mak
5@@ -76,4 +76,4 @@ IMGTOOL_OBJS = \ 8@@ -76,4 +76,4 @@ IMGTOOL_OBJS = \
6  9
7 $(IMGTOOL): $(IMGTOOL_OBJS) $(LIBIMGTOOL) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE) 10 $(IMGTOOL): $(IMGTOOL_OBJS) $(LIBIMGTOOL) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE)
8 @echo Linking $@... 11 @echo Linking $@...
9- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ 12- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
10+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS) 13+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mame/patches/Attic/patch-src_tools_tools.mak (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/Attic/patch-src_tools_tools.mak 2015/01/29 20:00:29 1.1
+++ pkgsrc/emulators/mame/patches/Attic/patch-src_tools_tools.mak 2015/01/29 20:08:16 1.2
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-src_tools_tools.mak,v 1.1 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: patch-src_tools_tools.mak,v 1.2 2015/01/29 20:08:16 wiz Exp $
 2
 3Fix linking against pkgsrc libraries.
 4https://github.com/mamedev/mame/pull/123
2 5
3--- src/tools/tools.mak.orig 2015-01-28 09:20:10.000000000 +0000 6--- src/tools/tools.mak.orig 2015-01-28 09:20:10.000000000 +0000
4+++ src/tools/tools.mak 7+++ src/tools/tools.mak
5@@ -74,7 +74,7 @@ ROMCMPOBJS = \ 8@@ -74,7 +74,7 @@ ROMCMPOBJS = \
6  9
7 romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE) 10 romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
8 @echo Linking $@... 11 @echo Linking $@...
9- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ 12- $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
10+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS) 13+ $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ $(LIBS)
11  14
12  15
13  16
14@@ -88,7 +88,7 @@ CHDMANOBJS = \ 17@@ -88,7 +88,7 @@ CHDMANOBJS = \
cvs diff -r1.7 -r1.8 pkgsrc/emulators/mame/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/patch-makefile 2015/01/29 20:00:29 1.7
+++ pkgsrc/emulators/mame/patches/patch-makefile 2015/01/29 20:08:16 1.8
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-makefile,v 1.7 2015/01/29 20:00:29 wiz Exp $ 1$NetBSD: patch-makefile,v 1.8 2015/01/29 20:08:16 wiz Exp $
 2
 3Link against pkgsrc versions of expat, zlib, flac, jpeg, and
 4sqlite3, and add appropriate linker search paths.
2 5
3--- makefile.orig 2015-01-29 17:12:56.000000000 +0000 6--- makefile.orig 2015-01-29 17:12:56.000000000 +0000
4+++ makefile 7+++ makefile
5@@ -227,19 +227,19 @@ endif 8@@ -227,19 +227,19 @@ endif
6 # BIGENDIAN = 1 9 # BIGENDIAN = 1
7  10
8 # uncomment next line to build expat as part of MAME build 11 # uncomment next line to build expat as part of MAME build
9-BUILD_EXPAT = 1 12-BUILD_EXPAT = 1
10+#BUILD_EXPAT = 1 13+#BUILD_EXPAT = 1
11  14
12 # uncomment next line to build zlib as part of MAME build 15 # uncomment next line to build zlib as part of MAME build
13-BUILD_ZLIB = 1 16-BUILD_ZLIB = 1
14+#BUILD_ZLIB = 1 17+#BUILD_ZLIB = 1