Hi ports --
After missing a few versions (which, amazingly, shipped broken), here's
an update for MAME to its latest verison.
The netlist/nl_base.h patch feels weird, and makes me wonder if I
haven't missed something obvious.
I'll be sending a second mail for sdlmess shortly.
This works well on amd64. Can I get an i386 tester?
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 25 Nov 2013 14:16:22 -0000 1.38
+++ Makefile 17 Apr 2014 13:31:06 -0000
@@ -8,7 +8,7 @@ MULTI_PACKAGES = -main -tools
COMMENT-main = emulates a massive variety of arcades machines
COMMENT-tools = tools to manipulate MAME/MESS roms and disk images
-V = 150
+V = 153
DISTNAME = mame0${V}s
PKGNAME-main = sdlmame-0.${V}
PKGNAME-tools = sdlmame-tools-0.${V}
@@ -24,11 +24,8 @@ MAINTAINER = Brian Callahan <bcallah@op
PERMIT_PACKAGE_CDROM = may not sell
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = SDL SDL_ttf X11 Xcomposite Xcursor Xdamage Xext Xfixes \
- Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
- freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
- glib-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pthread stdc++ util z
+WANTLIB += SDL SDL_ttf X11 Xinerama c expat fontconfig m pthread
+WANTLIB += stdc++ util z
MASTER_SITES = http://mamedev.org/downloader.php?file=releases/ \
http://whiper.com/mame/${V}/
@@ -46,9 +43,7 @@ MODULES = devel/gettext \
lang/python
RUN_DEPENDS-main = fonts/liberation-fonts
-LIB_DEPENDS = devel/gconf2 \
- devel/sdl-ttf \
- x11/gtk+2
+LIB_DEPENDS = devel/sdl-ttf
MAKE_FLAGS = OPT_FLAGS='-DINI_PATH="\"${SYSCONFDIR}/mame;\""'
MAKE_ENV = ARCH=$(ARCH) CC=$(CC) CFLAGS="$(CFLAGS)" \
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 29 Sep 2013 19:36:09 -0000 1.17
+++ distinfo 17 Apr 2014 13:31:06 -0000
@@ -1,4 +1,4 @@
-SHA256 (mame/history150.zip) = fkBuNgkLRznCkPxFSJYMIEyNcBqT7uJ7YlqX8mH9XFE=
-SHA256 (mame/mame0150s.zip) = 5nKwM7qgAeGpCUmLbJIGxo0EVv2IPkEK1Q8aT0wiU/c=
-SIZE (mame/history150.zip) = 4694523
-SIZE (mame/mame0150s.zip) = 35999158
+SHA256 (mame/history153.zip) = XOhfcIvZnjsS3SIkYGExG5Kt/KKK6fz/LWJQGKyyYhc=
+SHA256 (mame/mame0153s.zip) = q/b7TaSJhczv6vYBau7b6R0HrWsM192nwPPcDrgzVeQ=
+SIZE (mame/history153.zip) = 5233618
+SIZE (mame/mame0153s.zip) = 37829714
Index: patches/patch-makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/patches/patch-makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-makefile
--- patches/patch-makefile 29 Sep 2013 19:36:09 -0000 1.7
+++ patches/patch-makefile 17 Apr 2014 13:31:06 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-makefile,v 1.7 2013/09/29 19:36:09 bcallah Exp $
---- makefile.orig Fri Sep 20 12:15:22 2013
-+++ makefile Fri Sep 20 12:15:23 2013
+--- makefile.orig Wed Apr 16 23:16:03 2014
++++ makefile Wed Apr 16 23:16:03 2014
@@ -217,10 +217,10 @@ endif
# BIGENDIAN = 1
@@ -14,16 +14,16 @@ $OpenBSD: patch-makefile,v 1.7 2013/09/2
# uncomment next line to build libflac as part of MAME build
BUILD_FLAC = 1
-@@ -330,7 +330,7 @@ endif
-
+@@ -337,7 +337,7 @@ endif
# compiler, linker and utilities
+ ifneq ($(TARGETOS),emscripten)
AR = @ar
-CC = @gcc
+CC ?= @gcc
LD = @g++
+ endif
MD = -mkdir$(EXE)
- RM = @rm -f
-@@ -379,7 +379,7 @@ NAME = $(TARGET)$(SUBTARGET)
+@@ -387,7 +387,7 @@ NAME = $(TARGET)$(SUBTARGET)
endif
# fullname is prefix+name+suffix+suffix64+suffixdebug
@@ -32,7 +32,7 @@ $OpenBSD: patch-makefile,v 1.7 2013/09/2
# add an EXE suffix to get the final emulator name
EMULATOR = $(FULLNAME)$(EXE)
-@@ -473,7 +473,7 @@ CPPONLYFLAGS =
+@@ -486,7 +486,7 @@ CPPONLYFLAGS =
# CFLAGS is defined based on C or C++ targets
# (remember, expansion only happens when used, so doing it here is ok)
@@ -41,7 +41,7 @@ $OpenBSD: patch-makefile,v 1.7 2013/09/2
# we compile C-only to C89 standard with GNU extensions
# we compile C++ code to C++98 standard with GNU extensions
-@@ -506,7 +506,7 @@ CCOMFLAGS += -pg
+@@ -519,7 +519,7 @@ CCOMFLAGS += -pg
endif
# add the optimization flag
Index: patches/patch-src_emu_netlist_nl_base_h
===================================================================
RCS file: patches/patch-src_emu_netlist_nl_base_h
diff -N patches/patch-src_emu_netlist_nl_base_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_emu_netlist_nl_base_h 17 Apr 2014 13:31:06 -0000
@@ -0,0 +1,67 @@
+$OpenBSD$
+--- src/emu/netlist/nl_base.h.orig Mon Apr 7 08:04:20 2014
++++ src/emu/netlist/nl_base.h Wed Apr 16 23:37:47 2014
+@@ -1043,38 +1043,38 @@ class netlist_base_t : public netlist_object_t, public
+ ATTR_COLD void warning(const char *format, ...) const ATTR_PRINTF(2,3);
+ ATTR_COLD void log(const char *format, ...) const ATTR_PRINTF(2,3);
+
+- template<class _C>
+- netlist_list_t<_C *> get_device_list()
++ template<class AC>
++ netlist_list_t<AC *> get_device_list()
+ {
+- netlist_list_t<_C *> tmp;
++ netlist_list_t<AC *> tmp;
+ for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+ {
+- _C *dev = dynamic_cast<_C *>(entry->object());
++ AC *dev = dynamic_cast<AC *>(entry->object());
+ if (dev != NULL)
+ tmp.add(dev);
+ }
+ return tmp;
+ }
+
+- template<class _C>
+- _C *get_first_device()
++ template<class AC>
++ AC *get_first_device()
+ {
+ for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+ {
+- _C *dev = dynamic_cast<_C *>(entry->object());
++ AC *dev = dynamic_cast<AC *>(entry->object());
+ if (dev != NULL)
+ return dev;
+ }
+ return NULL;
+ }
+
+- template<class _C>
+- _C *get_single_device(const char *classname)
++ template<class AC>
++ AC *get_single_device(const char *classname)
+ {
+- _C *ret = NULL;
++ AC *ret = NULL;
+ for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+ {
+- _C *dev = dynamic_cast<_C *>(entry->object());
++ AC *dev = dynamic_cast<AC *>(entry->object());
+ if (dev != NULL)
+ {
+ if (ret != NULL)
+@@ -1281,11 +1281,11 @@ class netlist_factory_t
(public)
+
+ ATTR_COLD void initialize();
+
+- template<class _C>
++ template<class AC>
+ ATTR_COLD void register_device(const pstring &name, const pstring &classname,
+ const pstring &def_param)
+ {
+- m_list.add(new net_device_t_factory< _C >(name, classname, def_param) );
++ m_list.add(new net_device_t_factory< AC >(name, classname, def_param) );
+ }
+
+ ATTR_COLD netlist_device_t *new_device_by_classname(const pstring &classname, netlist_setup_t &setup) const;
Index: patches/patch-src_osd_sdl_sdl_mak
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/patches/patch-src_osd_sdl_sdl_mak,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_osd_sdl_sdl_mak
--- patches/patch-src_osd_sdl_sdl_mak 29 Sep 2013 19:36:09 -0000 1.10
+++ patches/patch-src_osd_sdl_sdl_mak 17 Apr 2014 13:31:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.10 2013/09/29 19:36:09 bcallah Exp $
---- src/osd/sdl/sdl.mak.orig Fri Sep 20 12:15:23 2013
-+++ src/osd/sdl/sdl.mak Fri Sep 20 12:15:23 2013
-@@ -721,9 +721,9 @@ LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --lib
+--- src/osd/sdl/sdl.mak.orig Wed Apr 16 23:16:03 2014
++++ src/osd/sdl/sdl.mak Wed Apr 16 23:16:03 2014
+@@ -703,9 +703,9 @@ LIBS += `pkg-config QtGui --libs`
endif
# some systems still put important things in a different prefix
@@ -12,4 +12,4 @@ $OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.
+INCPATH += -I${X11BASE}/include
endif # NO_X11
- #-------------------------------------------------
+ # can't use native libs with emscripten
