Thu Nov 14 08:18:21 2013 UTC ()
Update to 0.151: the usual changes.


(wiz)
diff -r1.25 -r1.26 pkgsrc/emulators/mame/Makefile
diff -r1.15 -r1.16 pkgsrc/emulators/mame/distinfo
diff -r1.1 -r0 pkgsrc/emulators/mame/patches/patch-src_emu_webengine.c
diff -r0 -r1.1 pkgsrc/emulators/mame/patches/patch-src_osd_sdl_sdl.mak
diff -r1.29 -r1.30 pkgsrc/emulators/mess/Makefile
diff -r1.13 -r1.14 pkgsrc/emulators/mess/PLIST
diff -r1.14 -r1.15 pkgsrc/emulators/mess/distinfo
diff -r1.1 -r0 pkgsrc/emulators/mess/patches/patch-src_emu_webengine.c
diff -r0 -r1.1 pkgsrc/emulators/mess/patches/patch-src_osd_sdl_sdl.mak
cvs diff -r1.25 -r1.26 pkgsrc/emulators/mame/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/mame/Makefile 2013/10/10 14:42:08 1.25
+++ pkgsrc/emulators/mame/Makefile 2013/11/14 08:18:21 1.26
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.25 2013/10/10 14:42:08 ryoon Exp $ 1# $NetBSD: Makefile,v 1.26 2013/11/14 08:18:21 wiz Exp $
2 2
3DISTNAME= mame0150s 3DISTNAME= mame0151s
4PKGNAME= ${DISTNAME:S/0/-0./:S/s$//} 4PKGNAME= ${DISTNAME:S/0/-0./:S/s$//}
5PKGREVISION= 1 
6MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ 5MASTER_SITES= http://mamedev.org/downloader.php?file=releases/
7 6
8COMMENT= Multiple Arcade Machine Emulator 7COMMENT= Multiple Arcade Machine Emulator
9 8
10CONFLICTS= xmame-[0-9]* sdlmame-[0-9]* 9CONFLICTS= xmame-[0-9]* sdlmame-[0-9]*
11 10
12DOCDIR= share/doc/mame 11DOCDIR= share/doc/mame
13INSTALLATION_DIRS= bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6 12INSTALLATION_DIRS= bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6
14 13
15# mame source is double-zipped 14# mame source is double-zipped
16post-extract: 15post-extract:
17 cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip 16 cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
18 rm ${WRKDIR}/mame.zip 17 rm ${WRKDIR}/mame.zip
@@ -26,16 +25,16 @@ do-install: @@ -26,16 +25,16 @@ do-install:
26 ${INSTALL_PROGRAM} ${WRKSRC}/"$$prg" ${DESTDIR}${PREFIX}/bin; \ 25 ${INSTALL_PROGRAM} ${WRKSRC}/"$$prg" ${DESTDIR}${PREFIX}/bin; \
27 done 26 done
28 set -e; \ 27 set -e; \
29 for doc in config.txt license.txt mame.txt; do \ 28 for doc in config.txt license.txt mame.txt; do \
30 ${INSTALL_DATA} ${WRKSRC}/docs/"$$doc" ${DESTDIR}${PREFIX}/${DOCDIR}; \ 29 ${INSTALL_DATA} ${WRKSRC}/docs/"$$doc" ${DESTDIR}${PREFIX}/${DOCDIR}; \
31 done 30 done
32# skipped: ldplayer man page exists, but no binary? 31# skipped: ldplayer man page exists, but no binary?
33# skipped: testkeys, binary not installed 32# skipped: testkeys, binary not installed
34 set -e; \ 33 set -e; \
35 for man in chdman.1 jedutil.1 ldverify.1 romcmp.1; \ 34 for man in chdman.1 jedutil.1 ldverify.1 romcmp.1; \
36 do \ 35 do \
37 ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/"$$man" ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ 36 ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/"$$man" ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
38 done 37 done
39 ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/mame.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6; \ 38 ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/mame.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
40 39
41.include "Makefile.common" 40.include "Makefile.common"
cvs diff -r1.15 -r1.16 pkgsrc/emulators/mame/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/mame/distinfo 2013/10/10 00:06:19 1.15
+++ pkgsrc/emulators/mame/distinfo 2013/11/14 08:18:21 1.16
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.15 2013/10/10 00:06:19 joerg Exp $ 1$NetBSD: distinfo,v 1.16 2013/11/14 08:18:21 wiz Exp $
2 2
3SHA1 (mame0150s.zip) = 14e20123817384f6caf5b7c155be60a745aa4438 3SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52
4RMD160 (mame0150s.zip) = 102147aa275cba2f8466717adfbaff9758fe5d60 4RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca
5Size (mame0150s.zip) = 35999158 bytes 5Size (mame0151s.zip) = 36052471 bytes
6SHA1 (patch-src_emu_webengine.c) = cf8e061a3f7d031ad6b064caa01a44d11de65f55 6SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624
File Deleted: pkgsrc/emulators/mame/patches/Attic/patch-src_emu_webengine.c
File Added: pkgsrc/emulators/mame/patches/Attic/patch-src_osd_sdl_sdl.mak
$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=<path>
 # 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
cvs diff -r1.29 -r1.30 pkgsrc/emulators/mess/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/mess/Attic/Makefile 2013/10/10 14:42:08 1.29
+++ pkgsrc/emulators/mess/Attic/Makefile 2013/11/14 08:18:21 1.30
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.29 2013/10/10 14:42:08 ryoon Exp $ 1# $NetBSD: Makefile,v 1.30 2013/11/14 08:18:21 wiz Exp $
2 2
3DISTNAME= mame0150s 3DISTNAME= mame0151s
4PKGNAME= ${DISTNAME:S/mame0/mess-0./:S/s$//} 4PKGNAME= ${DISTNAME:S/mame0/mess-0./:S/s$//}
5PKGREVISION= 1 
6MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ 5MASTER_SITES= http://mamedev.org/downloader.php?file=releases/
7 6
8COMMENT= Multi Emulator Super System 7COMMENT= Multi Emulator Super System
9 8
10CONFLICTS= xmess-[0-9]* sdlmess-[0-9]* 9CONFLICTS= xmess-[0-9]* sdlmess-[0-9]*
11 10
12DOCDIR= share/doc/mess 11DOCDIR= share/doc/mess
13SHAREDIR= share/mess 12SHAREDIR= share/mess
14INSTALLATION_DIRS= bin ${DOCDIR} ${SHAREDIR}/artwork ${SHAREDIR}/hash 13INSTALLATION_DIRS= bin ${DOCDIR} ${SHAREDIR}/artwork ${SHAREDIR}/hash
15 14
16# mame source is double-zipped 15# mame source is double-zipped
17post-extract: 16post-extract:
18 cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip 17 cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
cvs diff -r1.13 -r1.14 pkgsrc/emulators/mess/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/mess/Attic/PLIST 2013/09/30 20:03:33 1.13
+++ pkgsrc/emulators/mess/Attic/PLIST 2013/11/14 08:18:21 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2013/09/30 20:03:33 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.14 2013/11/14 08:18:21 wiz Exp $
2bin/castool 2bin/castool
3bin/floptool 3bin/floptool
4bin/imgtool 4bin/imgtool
5bin/mess 5bin/mess
6share/doc/mess/imgtool.txt 6share/doc/mess/imgtool.txt
7share/doc/mess/license.txt 7share/doc/mess/license.txt
8share/mess/artwork/aperture.png 8share/mess/artwork/aperture.png
9share/mess/artwork/white.png 9share/mess/artwork/white.png
10share/mess/hash/32x.xml 10share/mess/hash/32x.xml
11share/mess/hash/3do_m2.xml 11share/mess/hash/3do_m2.xml
12share/mess/hash/a2600.xml 12share/mess/hash/a2600.xml
13share/mess/hash/a2600_cass.xml 13share/mess/hash/a2600_cass.xml
14share/mess/hash/a5200.hsi 14share/mess/hash/a5200.hsi
@@ -105,27 +105,29 @@ share/mess/hash/gamecom.xml @@ -105,27 +105,29 @@ share/mess/hash/gamecom.xml
105share/mess/hash/gamegear.xml 105share/mess/hash/gamegear.xml
106share/mess/hash/gamepock.xml 106share/mess/hash/gamepock.xml
107share/mess/hash/gba.xml 107share/mess/hash/gba.xml
108share/mess/hash/gbcolor.xml 108share/mess/hash/gbcolor.xml
109share/mess/hash/genius.xml 109share/mess/hash/genius.xml
110share/mess/hash/gmaster.xml 110share/mess/hash/gmaster.xml
111share/mess/hash/gp32.xml 111share/mess/hash/gp32.xml
112share/mess/hash/gx4000.xml 112share/mess/hash/gx4000.xml
113share/mess/hash/horizon.xml 113share/mess/hash/horizon.xml
114share/mess/hash/hx20_flop.xml 114share/mess/hash/hx20_flop.xml
115share/mess/hash/ibm5140.xml 115share/mess/hash/ibm5140.xml
116share/mess/hash/ibm5150.xml 116share/mess/hash/ibm5150.xml
117share/mess/hash/ibm5150_cass.xml 117share/mess/hash/ibm5150_cass.xml
 118share/mess/hash/ibm5160_flop.xml
118share/mess/hash/ibm5170.xml 119share/mess/hash/ibm5170.xml
 120share/mess/hash/ibm5170_cdrom.xml
119share/mess/hash/ibmpcjr_cart.xml 121share/mess/hash/ibmpcjr_cart.xml
120share/mess/hash/ibmpcjr_flop.xml 122share/mess/hash/ibmpcjr_flop.xml
121share/mess/hash/interact.xml 123share/mess/hash/interact.xml
122share/mess/hash/intv.hsi 124share/mess/hash/intv.hsi
123share/mess/hash/intv.xml 125share/mess/hash/intv.xml
124share/mess/hash/intvecs.xml 126share/mess/hash/intvecs.xml
125share/mess/hash/iq128.xml 127share/mess/hash/iq128.xml
126share/mess/hash/iq151_cart.xml 128share/mess/hash/iq151_cart.xml
127share/mess/hash/iq151_flop.xml 129share/mess/hash/iq151_flop.xml
128share/mess/hash/jaguar.xml 130share/mess/hash/jaguar.xml
129share/mess/hash/juicebox.xml 131share/mess/hash/juicebox.xml
130share/mess/hash/kayproii.xml 132share/mess/hash/kayproii.xml
131share/mess/hash/kc_cart.xml 133share/mess/hash/kc_cart.xml
cvs diff -r1.14 -r1.15 pkgsrc/emulators/mess/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/mess/Attic/distinfo 2013/10/10 00:06:19 1.14
+++ pkgsrc/emulators/mess/Attic/distinfo 2013/11/14 08:18:21 1.15
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.14 2013/10/10 00:06:19 joerg Exp $ 1$NetBSD: distinfo,v 1.15 2013/11/14 08:18:21 wiz Exp $
2 2
3SHA1 (mame0150s.zip) = 14e20123817384f6caf5b7c155be60a745aa4438 3SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52
4RMD160 (mame0150s.zip) = 102147aa275cba2f8466717adfbaff9758fe5d60 4RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca
5Size (mame0150s.zip) = 35999158 bytes 5Size (mame0151s.zip) = 36052471 bytes
6SHA1 (patch-src_emu_webengine.c) = cf8e061a3f7d031ad6b064caa01a44d11de65f55 6SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624
File Deleted: pkgsrc/emulators/mess/patches/Attic/patch-src_emu_webengine.c
File Added: pkgsrc/emulators/mess/patches/Attic/patch-src_osd_sdl_sdl.mak
$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=<path>
 # 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