Yet another release, this time 0.144.
Any oks?
f.-
Index: emulators/sdlmame/Makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- emulators/sdlmame/Makefile 16 Nov 2011 17:42:26 -0000 1.17
+++ emulators/sdlmame/Makefile 26 Nov 2011 01:23:03 -0000
@@ -8,18 +8,14 @@ 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 = 0.132
-DISTNAME = sdlmame${V:S/.//}
-PKGNAME-main = sdlmame-${V}
-REVISION-main = 9
-PKGNAME-tools = sdlmame-tools-${V}
-REVISION-tools = 7
+V = 0144
+DISTNAME = mame${V}s
+PKGNAME-main = sdlmame-${V:S/0/0./}
+PKGNAME-tools = sdlmame-tools-${V:S/0/0./}
CATEGORIES = emulators games
-HOMEPAGE = http://rbelmont.mameworld.info/?page_id=163
-
-MAINTAINER = Pierre Riteau <[email protected]>
+HOMEPAGE = http://mamedev.org/
# MAME Distribution License, see http://mamedev.org/license.html
# history.dat : Creative Commons Attribution 3.0
@@ -30,68 +26,69 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = devel/gettext
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender xcb-render xcb-shm
-WANTLIB += GL atk-1.0 c cairo dbus-1
-WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb z
-WANTLIB += SDL gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
+WANTLIB = GL 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 gmodule-2.0 gobject-2.0 gthread-2.0 \
+ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+ pixman-1 png pthread pthread-stubs stdc++ util xcb \
+ xcb-render xcb-shm z
+
+MASTER_SITES = http://mamedev.org/downloader.php?file=releases/
+MASTER_SITES0 = http://mamedev.org/updates/
+MASTER_SITES1 = http://www.arcade-history.com/dats/
-MASTER_SITES = http://rbelmont.mameworld.info/
EXTRACT_SUFX = .zip
+DIST_SUBDIR = mame
-MASTER_SITES0 = http://www.arcade-history.com/dats/
-DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
- mamehistory137.zip:0
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ mamehistory${V:S/0//}.zip:1
BUILD_DEPENDS = archivers/unzip
-LIB_DEPENDS = devel/sdl \
- devel/gconf2 \
+LIB_DEPENDS = devel/gconf2 \
+ devel/sdl-ttf \
x11/gtk+2
-RUN_DEPENDS-main = ${PKGNAME-tools}:emulators/sdlmame,-tools
-
-USE_GMAKE = Yes
-
-NO_REGRESS = Yes
-VMEM_WARNING = Yes
+RUN_DEPENDS-main = fonts/liberation-fonts
MAKE_FLAGS = OPT_FLAGS='-DINI_PATH="\"${SYSCONFDIR}/mame;\""'
-MAKE_ENV = ARCH=$(ARCH) CC=$(CC) CFLAGS="$(CFLAGS)" LD=$(CC) \
+MAKE_ENV = ARCH=$(ARCH) CC=$(CC) CFLAGS="$(CFLAGS)" \
TARGETOS=openbsd
.if ${MACHINE_ARCH} == "amd64"
-MAKE_ENV+= PTR64=1
-# XXX -Wno-system-headers is needed because of inclusion of *mmintrin.h from
gcc
-# those headers don't compile with -Wsystem-headers -Werror on amd64
-MAKE_FLAGS = OPT_FLAGS='-DINI_PATH="\"${SYSCONFDIR}/mame;\""
-Wno-system-headers'
+MAKE_ENV += PTR64=1
.endif
+USE_GMAKE = Yes
+
MAKE_FILE = makefile
-MAME_EXTBIN = chdman jedutil ldresample ldverify romcmp
-MAME_DOC = config.txt license.txt mame.txt newvideo.txt
-MAME_DATA_DIR = roms samples artwork ctrlr cheat keymaps
+NO_REGRESS = Yes
+VMEM_WARNING = Yes
+
+post-extract:
+ @${UNZIP} -oq ${WRKDIR}/mame.zip -d ${WRKSRC}
+
+pre-patch:
+ @perl -pi -e 's|\r\n|\n|g' ${WRKDIST}/makefile \
+ ${WRKDIST}/src/emu/fileio.h \
+ ${WRKDIST}/src/osd/sdl/sdlos_unix.c \
+ ${WRKDIST}/src/mame/video/mcd212.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mame ${PREFIX}/bin/sdlmame
-.for i in ${MAME_EXTBIN}
- ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/${i}
-.endfor
-.for i in ${MAME_DATA_DIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/sdlmame/${i}
+.for f in chdman jedutil ldresample ldverify romcmp
+ ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
.endfor
- ${INSTALL_DATA} ${WRKSRC}/keymaps/km[-_]??.txt \
- ${PREFIX}/share/sdlmame/keymaps/
- ${INSTALL_DATA} ${WRKSRC}/ui.bdf ${PREFIX}/share/sdlmame
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/sdlmame/keymaps
+ ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/keymaps/km[-_]??.txt \
+ ${PREFIX}/share/sdlmame/keymaps/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sdlmame
-.for i in ${MAME_DOC}
- ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${PREFIX}/share/doc/sdlmame/
+.for f in config.txt hlsl.txt license.txt mame.txt newvideo.txt
+ ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/sdlmame
.endfor
- ${INSTALL_DATA} $(WRKSRC)/SDLMAME.txt ${PREFIX}/share/doc/sdlmame/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sdlmame
${SUBST_CMD} -c ${FILESDIR}/mame.ini \
- ${PREFIX}/share/examples/sdlmame/mame.ini
+ ${PREFIX}/share/examples/sdlmame/mame.ini
chown ${SHAREOWN}:${SHAREGRP} \
- ${PREFIX}/share/examples/sdlmame/mame.ini
+ ${PREFIX}/share/examples/sdlmame/mame.ini
${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/sdlmame
.include <bsd.port.mk>
Index: emulators/sdlmame/distinfo
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- emulators/sdlmame/distinfo 27 Apr 2010 13:00:25 -0000 1.3
+++ emulators/sdlmame/distinfo 26 Nov 2011 01:23:03 -0000
@@ -1,10 +1,10 @@
-MD5 (mamehistory137.zip) = ugx9ewnjOXUtEirdF9cULQ==
-MD5 (sdlmame0132.zip) = TjVpWzHsEHhQ+MUBNz+Pyg==
-RMD160 (mamehistory137.zip) = ixb1XZWd3fHWh5SVQARvJ879OOg=
-RMD160 (sdlmame0132.zip) = bvn5dFyDNzR0zq+s5VL7VUHo/rY=
-SHA1 (mamehistory137.zip) = HqNLBD9xMlQym8M9pepmFE24D/c=
-SHA1 (sdlmame0132.zip) = qDi1Lm28KDVqq6EA5G1X3g9TyN0=
-SHA256 (mamehistory137.zip) = lmn3G7l9TBZieFtBE8aa8efe3hKGPftyeMaCnwb2dLg=
-SHA256 (sdlmame0132.zip) = QuaYVWkeeeT4yjtILqwNUgPEVQKij2mmDMmzOygMqgE=
-SIZE (mamehistory137.zip) = 2476068
-SIZE (sdlmame0132.zip) = 17879263
+MD5 (mame/mame0144s.zip) = dEAHbmDNXWHqM98X/ABxmg==
+MD5 (mame/mamehistory144.zip) = wKfSc9MTsW8VGMXPX7vYlg==
+RMD160 (mame/mame0144s.zip) = V5VWExNo1pwCaSwhR1ITu7XYGVQ=
+RMD160 (mame/mamehistory144.zip) = CCjgl5FOMnjnkTmB/F6ZnGqYj64=
+SHA1 (mame/mame0144s.zip) = 8yvKC0VloHdk2hAoyPJDMf5bKh0=
+SHA1 (mame/mamehistory144.zip) = Hfbh8THLF2U/tmRKTcZWYXiHC/A=
+SHA256 (mame/mame0144s.zip) = jwGRtA+A+KM5PTQfQRxfAqymkz1qnzR77A0vcgbDjgY=
+SHA256 (mame/mamehistory144.zip) = cxZ+S7ag8K0ThaWgLvAvQBbgYOfE7C7YvV0usG+zX2Q=
+SIZE (mame/mame0144s.zip) = 19676308
+SIZE (mame/mamehistory144.zip) = 3072722
Index: emulators/sdlmame/patches/patch-makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/patches/patch-makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-makefile
--- emulators/sdlmame/patches/patch-makefile 23 May 2010 09:19:45 -0000
1.2
+++ emulators/sdlmame/patches/patch-makefile 26 Nov 2011 01:23:03 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-makefile,v 1.2 2010/05/23 09:19:45 espie Exp $
---- makefile.orig Sun Mar 29 01:50:01 2009
-+++ makefile Mon May 17 21:55:57 2010
-@@ -125,10 +125,10 @@ endif
+$OpenBSD$
+--- makefile.orig Sat Feb 12 15:17:48 2011
++++ makefile Thu Jun 2 12:18:06 2011
+@@ -206,10 +206,10 @@ endif
# BIGENDIAN = 1
# uncomment next line to build expat as part of MAME build
@@ -14,39 +14,34 @@ $OpenBSD: patch-makefile,v 1.2 2010/05/2
# uncomment next line to include the symbols
# SYMBOLS = 1
-@@ -197,8 +197,8 @@ endif
+@@ -298,7 +298,7 @@ endif
# compiler, linker and utilities
AR = @ar
-CC = @gcc
--LD = @gcc
+CC ?= @gcc
-+LD ?= @gcc
+ LD = @g++
MD = -mkdir$(EXE)
RM = @rm -f
-
-@@ -227,7 +227,7 @@ NAME = $(TARGET)$(SUBTARGET)
+@@ -347,7 +347,7 @@ NAME = $(TARGET)$(SUBTARGET)
endif
- # fullname is prefix+name+suffix+debugsuffix
--FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
-+FULLNAME = $(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
+ # fullname is prefix+name+suffix+suffix64+suffixdebug
+-FULLNAME =
$(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
++FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
# add an EXE suffix to get the final emulator name
EMULATOR = $(FULLNAME)$(EXE)
-@@ -302,9 +302,9 @@ CPPONLYFLAGS =
+@@ -423,7 +423,7 @@ CPPONLYFLAGS =
+
# CFLAGS is defined based on C or C++ targets
# (remember, expansion only happens when used, so doing it here is ok)
- ifdef CPP_COMPILE
-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
- else
--CFLAGS = $(CCOMFLAGS) $(CONLYFLAGS)
-+CFLAGS += $(CCOMFLAGS) $(CONLYFLAGS)
- endif
# we compile C-only to C89 standard with GNU extensions
-@@ -331,7 +331,7 @@ CCOMFLAGS += -pg
+ # we compile C++ code to C++98 standard with GNU extensions
+@@ -450,7 +450,7 @@ CCOMFLAGS += -pg
endif
# add the optimization flag
@@ -55,13 +50,3 @@ $OpenBSD: patch-makefile,v 1.2 2010/05/2
# if we are optimizing, include optimization options
# and make all errors into warnings
-@@ -355,8 +355,7 @@ CCOMFLAGS += \
- # warnings only applicable to C compiles
- CONLYFLAGS += \
- -Wpointer-arith \
-- -Wbad-function-cast \
-- -Wstrict-prototypes
-+ -Wbad-function-cast
-
- # this warning is not supported on the os2 compilers
- ifneq ($(TARGETOS),os2)
Index: emulators/sdlmame/patches/patch-src_emu_fileio_h
===================================================================
RCS file: emulators/sdlmame/patches/patch-src_emu_fileio_h
diff -N emulators/sdlmame/patches/patch-src_emu_fileio_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ emulators/sdlmame/patches/patch-src_emu_fileio_h 26 Nov 2011 01:23:03
-0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/emu/fileio.h.orig Tue Nov 8 22:52:52 2011
++++ src/emu/fileio.h Tue Nov 8 22:52:52 2011
+@@ -151,6 +151,7 @@ class emu_file (public)
+
+ // reading
+ UINT32 read(void *buffer, UINT32 length);
++#undef getc
+ int getc();
+ int ungetc(int c);
+ char *gets(char *s, int n);
Index: emulators/sdlmame/patches/patch-src_mame_video_mcd212_c
===================================================================
RCS file: emulators/sdlmame/patches/patch-src_mame_video_mcd212_c
diff -N emulators/sdlmame/patches/patch-src_mame_video_mcd212_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ emulators/sdlmame/patches/patch-src_mame_video_mcd212_c 26 Nov 2011
01:23:03 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- src/mame/video/mcd212.c.orig Wed Nov 9 14:44:10 2011
++++ src/mame/video/mcd212.c Wed Nov 9 14:44:30 2011
+@@ -1523,9 +1523,9 @@ void mcd212_init(running_machine &machine, mcd212_regs
+ mcd212->channel[index].ddr = 0;
+ mcd212->channel[index].dcp = 0;
+ mcd212->channel[index].dca = 0;
+- memset(mcd212->channel[index].clut_r, 0, 768);
+- memset(mcd212->channel[index].clut_g, 0, 768);
+- memset(mcd212->channel[index].clut_b, 0, 768);
++ memset(mcd212->channel[index].clut_r, 0, 256);
++ memset(mcd212->channel[index].clut_g, 0, 256);
++ memset(mcd212->channel[index].clut_b, 0, 256);
+ mcd212->channel[index].image_coding_method = 0;
+ mcd212->channel[index].transparency_control = 0;
+ mcd212->channel[index].plane_order = 0;
Index: emulators/sdlmame/patches/patch-src_osd_sdl_dview_c
===================================================================
RCS file: emulators/sdlmame/patches/patch-src_osd_sdl_dview_c
diff -N emulators/sdlmame/patches/patch-src_osd_sdl_dview_c
--- emulators/sdlmame/patches/patch-src_osd_sdl_dview_c 24 Apr 2010 13:54:32
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_osd_sdl_dview_c,v 1.1 2010/04/24 13:54:32 jasper Exp $
-
-Fix build with newer gtk versions.
-
---- src/osd/sdl/dview.c.orig Sat Apr 24 15:34:35 2010
-+++ src/osd/sdl/dview.c Sat Apr 24 15:34:58 2010
-@@ -213,7 +213,7 @@ static void dview_size_allocate(GtkWidget *wdv, GtkAll
- debug_view_set_visible_position(dv->dw, pos);
- debug_view_set_visible_size(dv->dw, vsize);
-
-- if(GTK_WIDGET_REALIZED(wdv))
-+ if(gtk_widget_get_realized(wdv))
- gdk_window_move_resize(wdv->window,
- allocation->x,
allocation->y,
- allocation->width,
allocation->height);
Index: emulators/sdlmame/patches/patch-src_osd_sdl_sdl_mak
===================================================================
RCS file: emulators/sdlmame/patches/patch-src_osd_sdl_sdl_mak
diff -N emulators/sdlmame/patches/patch-src_osd_sdl_sdl_mak
--- emulators/sdlmame/patches/patch-src_osd_sdl_sdl_mak 1 Oct 2010 07:27:23
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.3 2010/10/01 07:27:23 ajacoutot Exp $
-
-XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
-
---- src/osd/sdl/sdl.mak.orig Fri Oct 1 09:17:11 2010
-+++ src/osd/sdl/sdl.mak Fri Oct 1 09:17:19 2010
-@@ -272,7 +272,6 @@ ifndef NO_X11
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o
$(SDLOBJ)/debug-intf.o
- CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
- LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
--CFLAGS += -DGTK_DISABLE_DEPRECATED
- else
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o
- endif # NO_X11
Index: emulators/sdlmame/pkg/DESCR-tools
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/pkg/DESCR-tools,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-tools
--- emulators/sdlmame/pkg/DESCR-tools 17 Mar 2009 19:55:09 -0000 1.1.1.1
+++ emulators/sdlmame/pkg/DESCR-tools 26 Nov 2011 01:23:03 -0000
@@ -1,2 +1,2 @@
This package contains tools to manipulate roms and disk images used by
-SDLMAME and SDLMESS.
+SDLMAME.
Index: emulators/sdlmame/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- emulators/sdlmame/pkg/PLIST-main 9 May 2010 17:45:12 -0000 1.4
+++ emulators/sdlmame/pkg/PLIST-main 26 Nov 2011 01:23:03 -0000
@@ -15,8 +15,8 @@
@pkgpath emulators/xmame,-mame,esd,x11
@bin bin/sdlmame
share/doc/sdlmame/
-share/doc/sdlmame/SDLMAME.txt
share/doc/sdlmame/config.txt
+share/doc/sdlmame/hlsl.txt
share/doc/sdlmame/license.txt
share/doc/sdlmame/mame.txt
share/doc/sdlmame/newvideo.txt
@@ -25,9 +25,6 @@ share/examples/sdlmame/
share/examples/sdlmame/mame.ini
@sample ${SYSCONFDIR}/mame/mame.ini
share/sdlmame/
-share/sdlmame/artwork/
-share/sdlmame/cheat/
-share/sdlmame/ctrlr/
share/sdlmame/history.dat
share/sdlmame/keymaps/
share/sdlmame/keymaps/km-be.txt
@@ -35,6 +32,8 @@ share/sdlmame/keymaps/km-ch.txt
share/sdlmame/keymaps/km-de.txt
share/sdlmame/keymaps/km-fr.txt
share/sdlmame/keymaps/km_it.txt
-share/sdlmame/roms/
-share/sdlmame/samples/
-share/sdlmame/ui.bdf
+@sample share/sdlmame/artwork/
+@sample share/sdlmame/cheat/
+@sample share/sdlmame/ctrlr/
+@sample share/sdlmame/roms/
+@sample share/sdlmame/samples/
