From c95f98bffaa6795750ca19cccba8a10703b06141 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 14 Nov 2013 08:18:21 +0000 Subject: Update to 0.151: the usual changes. --- emulators/mame/Makefile | 7 ++- emulators/mame/distinfo | 10 ++-- emulators/mame/patches/patch-src_emu_webengine.c | 18 ------- emulators/mame/patches/patch-src_osd_sdl_sdl.mak | 63 ++++++++++++++++++++++++ emulators/mess/Makefile | 5 +- emulators/mess/PLIST | 4 +- emulators/mess/distinfo | 10 ++-- emulators/mess/patches/patch-src_emu_webengine.c | 18 ------- emulators/mess/patches/patch-src_osd_sdl_sdl.mak | 63 ++++++++++++++++++++++++ 9 files changed, 144 insertions(+), 54 deletions(-) delete mode 100644 emulators/mame/patches/patch-src_emu_webengine.c create mode 100644 emulators/mame/patches/patch-src_osd_sdl_sdl.mak delete mode 100644 emulators/mess/patches/patch-src_emu_webengine.c create mode 100644 emulators/mess/patches/patch-src_osd_sdl_sdl.mak diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 8bd72b14c9a..3a3d8cdaf1e 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2013/10/10 14:42:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.26 2013/11/14 08:18:21 wiz Exp $ -DISTNAME= mame0150s +DISTNAME= mame0151s PKGNAME= ${DISTNAME:S/0/-0./:S/s$//} -PKGREVISION= 1 MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ COMMENT= Multiple Arcade Machine Emulator @@ -36,6 +35,6 @@ do-install: do \ ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/"$$man" ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ done - ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/mame.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6; \ + ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/mame.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6 .include "Makefile.common" diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index b65a785bef6..57eeb7dc2bc 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2013/10/10 00:06:19 joerg Exp $ +$NetBSD: distinfo,v 1.16 2013/11/14 08:18:21 wiz Exp $ -SHA1 (mame0150s.zip) = 14e20123817384f6caf5b7c155be60a745aa4438 -RMD160 (mame0150s.zip) = 102147aa275cba2f8466717adfbaff9758fe5d60 -Size (mame0150s.zip) = 35999158 bytes -SHA1 (patch-src_emu_webengine.c) = cf8e061a3f7d031ad6b064caa01a44d11de65f55 +SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52 +RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca +Size (mame0151s.zip) = 36052471 bytes +SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624 diff --git a/emulators/mame/patches/patch-src_emu_webengine.c b/emulators/mame/patches/patch-src_emu_webengine.c deleted file mode 100644 index 8f8a84b1a3c..00000000000 --- a/emulators/mame/patches/patch-src_emu_webengine.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_emu_webengine.c,v 1.1 2013/10/10 00:06:19 joerg Exp $ - ---- src/emu/webengine.c.orig 2013-10-09 11:04:31.000000000 +0000 -+++ src/emu/webengine.c -@@ -37,12 +37,12 @@ - - ***************************************************************************/ - -+#include "web/json/json.h" - #include "emu.h" - #include "emuopts.h" - #include "ui.h" - #include "webengine.h" - #include "web/mongoose.h" --#include "web/json/json.h" - - //************************************************************************** - // WEB ENGINE diff --git a/emulators/mame/patches/patch-src_osd_sdl_sdl.mak b/emulators/mame/patches/patch-src_osd_sdl_sdl.mak new file mode 100644 index 00000000000..7d4fe36d3ae --- /dev/null +++ b/emulators/mame/patches/patch-src_osd_sdl_sdl.mak @@ -0,0 +1,63 @@ +$NetBSD: patch-src_osd_sdl_sdl.mak,v 1.1 2013/11/14 08:18:21 wiz Exp $ + +r26155 | rbelmont | 2013-11-14 04:58:10 +0100 (Thu, 14 Nov 2013) | 3 lines + +SDL: fix non-Qt non-Windows build (MT #5364) [R. Belmont] + +--- src/osd/sdl/sdl.mak.orig 2013-11-05 07:59:52.000000000 +0000 ++++ src/osd/sdl/sdl.mak +@@ -59,17 +59,16 @@ USE_DISPATCH_GL = 1 + # active development on sdlmame or SDL. + + # uncomment the next line to compile and link against SDL2.0 +- + # SDL_LIBVER = sdl2 + +-# uncomment the next line to use couriersud's multi-keyboard patch for sdl2.0 ++# uncomment the next line to use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release) + # SDL2_MULTIAPI = 1 + + # uncomment the next line to specify where you have installed + # SDL. Equivalent to the ./configure --prefix= + # SDL_INSTALL_ROOT = /usr/local/sdl13 + +-# uncomment to disable the Qt debugger and fall back to a system default ++# uncomment to disable the Qt debugger (on non-OSX this disables all debugging) + # NO_USE_QTDEBUG = 1 + + # uncomment to disable MIDI +@@ -307,11 +306,6 @@ SDLMAIN = $(SDLOBJ)/main.o + LDFLAGS += -Wl,--allow-multiple-definition + SDL_NETWORK = pcap + +-# if no Qt, no debugger +-ifdef NO_USE_QTDEBUG +-NO_DEBUGGER = 1 +-endif +- + # enable UNICODE + DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE + LDFLAGS += -municode +@@ -355,6 +349,13 @@ ifeq ($(BASE_TARGETOS),) + $(error $(TARGETOS) not supported !) + endif + ++# if no Qt and not OS X, no debugger ++ifneq ($(TARGETOS),macosx) ++ifdef NO_USE_QTDEBUG ++NO_DEBUGGER = 1 ++endif ++endif ++ + #------------------------------------------------- + # object and source roots + #------------------------------------------------- +@@ -528,8 +529,6 @@ endif + QT_INSTALL_HEADERS = $(shell $(QMAKE) -query QT_INSTALL_HEADERS) + INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS) + LIBS += -L$(shell $(QMAKE) -query QT_INSTALL_LIBS) -lQtGui -lQtCore +-else +-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o + endif + + LIBGL = -lGL diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile index bdc3309a100..26638559ff6 100644 --- a/emulators/mess/Makefile +++ b/emulators/mess/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2013/10/10 14:42:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2013/11/14 08:18:21 wiz Exp $ -DISTNAME= mame0150s +DISTNAME= mame0151s PKGNAME= ${DISTNAME:S/mame0/mess-0./:S/s$//} -PKGREVISION= 1 MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ COMMENT= Multi Emulator Super System diff --git a/emulators/mess/PLIST b/emulators/mess/PLIST index 60a98c57961..69fcabdf102 100644 --- a/emulators/mess/PLIST +++ b/emulators/mess/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2013/09/30 20:03:33 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2013/11/14 08:18:21 wiz Exp $ bin/castool bin/floptool bin/imgtool @@ -115,7 +115,9 @@ share/mess/hash/hx20_flop.xml share/mess/hash/ibm5140.xml share/mess/hash/ibm5150.xml share/mess/hash/ibm5150_cass.xml +share/mess/hash/ibm5160_flop.xml share/mess/hash/ibm5170.xml +share/mess/hash/ibm5170_cdrom.xml share/mess/hash/ibmpcjr_cart.xml share/mess/hash/ibmpcjr_flop.xml share/mess/hash/interact.xml diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo index da92d905a3b..754b7e27edb 100644 --- a/emulators/mess/distinfo +++ b/emulators/mess/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2013/10/10 00:06:19 joerg Exp $ +$NetBSD: distinfo,v 1.15 2013/11/14 08:18:21 wiz Exp $ -SHA1 (mame0150s.zip) = 14e20123817384f6caf5b7c155be60a745aa4438 -RMD160 (mame0150s.zip) = 102147aa275cba2f8466717adfbaff9758fe5d60 -Size (mame0150s.zip) = 35999158 bytes -SHA1 (patch-src_emu_webengine.c) = cf8e061a3f7d031ad6b064caa01a44d11de65f55 +SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52 +RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca +Size (mame0151s.zip) = 36052471 bytes +SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624 diff --git a/emulators/mess/patches/patch-src_emu_webengine.c b/emulators/mess/patches/patch-src_emu_webengine.c deleted file mode 100644 index 8f8a84b1a3c..00000000000 --- a/emulators/mess/patches/patch-src_emu_webengine.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_emu_webengine.c,v 1.1 2013/10/10 00:06:19 joerg Exp $ - ---- src/emu/webengine.c.orig 2013-10-09 11:04:31.000000000 +0000 -+++ src/emu/webengine.c -@@ -37,12 +37,12 @@ - - ***************************************************************************/ - -+#include "web/json/json.h" - #include "emu.h" - #include "emuopts.h" - #include "ui.h" - #include "webengine.h" - #include "web/mongoose.h" --#include "web/json/json.h" - - //************************************************************************** - // WEB ENGINE diff --git a/emulators/mess/patches/patch-src_osd_sdl_sdl.mak b/emulators/mess/patches/patch-src_osd_sdl_sdl.mak new file mode 100644 index 00000000000..7d4fe36d3ae --- /dev/null +++ b/emulators/mess/patches/patch-src_osd_sdl_sdl.mak @@ -0,0 +1,63 @@ +$NetBSD: patch-src_osd_sdl_sdl.mak,v 1.1 2013/11/14 08:18:21 wiz Exp $ + +r26155 | rbelmont | 2013-11-14 04:58:10 +0100 (Thu, 14 Nov 2013) | 3 lines + +SDL: fix non-Qt non-Windows build (MT #5364) [R. Belmont] + +--- src/osd/sdl/sdl.mak.orig 2013-11-05 07:59:52.000000000 +0000 ++++ src/osd/sdl/sdl.mak +@@ -59,17 +59,16 @@ USE_DISPATCH_GL = 1 + # active development on sdlmame or SDL. + + # uncomment the next line to compile and link against SDL2.0 +- + # SDL_LIBVER = sdl2 + +-# uncomment the next line to use couriersud's multi-keyboard patch for sdl2.0 ++# uncomment the next line to use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release) + # SDL2_MULTIAPI = 1 + + # uncomment the next line to specify where you have installed + # SDL. Equivalent to the ./configure --prefix= + # SDL_INSTALL_ROOT = /usr/local/sdl13 + +-# uncomment to disable the Qt debugger and fall back to a system default ++# uncomment to disable the Qt debugger (on non-OSX this disables all debugging) + # NO_USE_QTDEBUG = 1 + + # uncomment to disable MIDI +@@ -307,11 +306,6 @@ SDLMAIN = $(SDLOBJ)/main.o + LDFLAGS += -Wl,--allow-multiple-definition + SDL_NETWORK = pcap + +-# if no Qt, no debugger +-ifdef NO_USE_QTDEBUG +-NO_DEBUGGER = 1 +-endif +- + # enable UNICODE + DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE + LDFLAGS += -municode +@@ -355,6 +349,13 @@ ifeq ($(BASE_TARGETOS),) + $(error $(TARGETOS) not supported !) + endif + ++# if no Qt and not OS X, no debugger ++ifneq ($(TARGETOS),macosx) ++ifdef NO_USE_QTDEBUG ++NO_DEBUGGER = 1 ++endif ++endif ++ + #------------------------------------------------- + # object and source roots + #------------------------------------------------- +@@ -528,8 +529,6 @@ endif + QT_INSTALL_HEADERS = $(shell $(QMAKE) -query QT_INSTALL_HEADERS) + INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS) + LIBS += -L$(shell $(QMAKE) -query QT_INSTALL_LIBS) -lQtGui -lQtCore +-else +-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o + endif + + LIBGL = -lGL -- cgit v1.2.3