diff options
author | wiz <wiz@pkgsrc.org> | 2015-02-28 11:58:53 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-02-28 11:58:53 +0000 |
commit | e896dec7e98da8bbf9e9c65e87d80b5bae7bce2f (patch) | |
tree | 7e78201b740a8c39631a3746064db2242511ffcc /emulators | |
parent | 479455ee332516419958894e85727d55d53eab1a (diff) | |
download | pkgsrc-e896dec7e98da8bbf9e9c65e87d80b5bae7bce2f.tar.gz |
Update mame and mess to 0.159. The usual changes.
Three patches were accepted upstream.
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/mame/Makefile | 5 | ||||
-rw-r--r-- | emulators/mame/distinfo | 12 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c | 21 | ||||
-rw-r--r-- | emulators/mame/patches/patch-makefile | 25 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_osd_sdl_sdl.mak | 15 | ||||
-rw-r--r-- | emulators/mess/Makefile | 5 |
6 files changed, 12 insertions, 71 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 578d46d6901..367e6ca70b7 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2015/02/09 08:43:13 snj Exp $ +# $NetBSD: Makefile,v 1.38 2015/02/28 11:58:53 wiz Exp $ -DISTNAME= mame0158s +DISTNAME= mame0159s PKGNAME= ${DISTNAME:S/0/-0./:S/s$//} -PKGREVISION= 1 MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ COMMENT= Multiple Arcade Machine Emulator diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index fd03f455dc0..8e4c0232163 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.31 2015/02/10 23:29:18 wiz Exp $ +$NetBSD: distinfo,v 1.32 2015/02/28 11:58:53 wiz Exp $ -SHA1 (mame0158s.zip) = 4c1841674cf158c4288ad3065431b4cf9e82d515 -RMD160 (mame0158s.zip) = 7ffa288bef4455fbec8a1f8de1f0a55bbdc41a75 -Size (mame0158s.zip) = 46615447 bytes -SHA1 (patch-3rdparty_mongoose_mongoose.c) = 6d128eab24efff814f7e2221fdd2c226011f5efe -SHA1 (patch-makefile) = 062bef85b423b9dc6da6988d3b6fbba35c40c97a -SHA1 (patch-src_osd_sdl_sdl.mak) = fce30c08c07680e777d889d8fde5f81556cd0cab +SHA1 (mame0159s.zip) = 0170b73e45dcaa6c9842948f69c54310bf314934 +RMD160 (mame0159s.zip) = 9b02aeeebf956c453b2c041c6c40c2952ce3521c +Size (mame0159s.zip) = 80801723 bytes +SHA1 (patch-makefile) = 0009c7f66fbbb30a085aae6d8b4ace3241c17f61 diff --git a/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c b/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c deleted file mode 100644 index 2b0d6df1420..00000000000 --- a/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-3rdparty_mongoose_mongoose.c,v 1.3 2015/02/10 23:29:18 wiz Exp $ - -If _XOPEN_SOURCE is defined to 600, NetBSD does not provide strtoll -and other stuff. - -https://github.com/cesanta/mongoose/pull/466 - -https://github.com/mamedev/mame/pull/128 - ---- 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 -+#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 index e082f7f5e61..0c43c3983b7 100644 --- a/emulators/mame/patches/patch-makefile +++ b/emulators/mame/patches/patch-makefile @@ -1,12 +1,9 @@ -$NetBSD: patch-makefile,v 1.9 2015/01/29 21:48:15 wiz Exp $ +$NetBSD: patch-makefile,v 1.10 2015/02/28 11:58:53 wiz Exp $ Link against pkgsrc versions of expat, zlib, flac, jpeg, and sqlite3, and add appropriate linker search paths. -*nix: Fixed linking tools against system libraries -https://github.com/mamedev/mame/commit/b55b45a5a99b8bce694b7ed3cd2d4a00d790f6ae - ---- makefile.orig 2015-01-29 21:11:10.000000000 +0000 +--- makefile.orig 2015-02-28 10:39:06.000000000 +0000 +++ makefile @@ -227,19 +227,19 @@ endif # BIGENDIAN = 1 @@ -33,7 +30,7 @@ https://github.com/mamedev/mame/commit/b55b45a5a99b8bce694b7ed3cd2d4a00d790f6ae # uncomment next line to build PortMidi as part of MAME/MESS build BUILD_MIDILIB = 1 -@@ -739,7 +739,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG +@@ -742,7 +742,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG #------------------------------------------------- # start with an empty set of libs @@ -42,19 +39,3 @@ https://github.com/mamedev/mame/commit/b55b45a5a99b8bce694b7ed3cd2d4a00d790f6ae # add expat XML library ifeq ($(BUILD_EXPAT),1) -@@ -756,6 +756,7 @@ INCPATH += -I$(3RDPARTY)/zlib - ZLIB = $(OBJ)/libz.a - else - LIBS += -lz -+BASELIBS += -lz - ZLIB = - endif - -@@ -766,6 +767,7 @@ FLAC_LIB = $(OBJ)/libflac.a - # $(OBJ)/libflac++.a - else - LIBS += -lFLAC -+BASELIBS += -lFLAC - FLAC_LIB = - endif - diff --git a/emulators/mame/patches/patch-src_osd_sdl_sdl.mak b/emulators/mame/patches/patch-src_osd_sdl_sdl.mak deleted file mode 100644 index 6a840a591b8..00000000000 --- a/emulators/mame/patches/patch-src_osd_sdl_sdl.mak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_osd_sdl_sdl.mak,v 1.4 2015/01/29 21:52:10 wiz Exp $ - -Choose a network interface type for NetBSD to fix linking. -https://github.com/mamedev/mame/pull/124 - ---- src/osd/sdl/sdl.mak.orig 2014-11-26 10:37:58.000000000 +0000 -+++ src/osd/sdl/sdl.mak -@@ -235,6 +235,7 @@ BASE_TARGETOS = unix - SYNC_IMPLEMENTATION = ntc - LIBS += -lutil - NO_USE_MIDI = 1 -+SDL_NETWORK = pcap - endif - - ifeq ($(TARGETOS),solaris) diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile index 8f2fc8e3e38..4583394f54a 100644 --- a/emulators/mess/Makefile +++ b/emulators/mess/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2015/02/09 08:43:13 snj Exp $ +# $NetBSD: Makefile,v 1.40 2015/02/28 11:58:53 wiz Exp $ -DISTNAME= mame0158s +DISTNAME= mame0159s PKGNAME= ${DISTNAME:S/mame0/mess-0./:S/s$//} -PKGREVISION= 1 MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ COMMENT= Multi Emulator Super System |