On 03/27/13 11:46, Brian Callahan wrote:
Hi ports --
Here's an update to bring emulators/sdlmess to the version that
matches emulators/sdlmame.
To fgsch@ - I listed myself as maintainer, but I'll happily turn it
over to you if you want it.
Works for me on amd64.
OK?
~Brian
Ping.
Reattached for convenience.
? sdlmess0148.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmess/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 11 Mar 2013 11:06:04 -0000 1.20
+++ Makefile 27 Mar 2013 15:37:04 -0000
@@ -3,74 +3,98 @@
# Other archs have not been tested
ONLY_FOR_ARCHS = amd64 i386
+# XXX: To prevent conflicts, if you want the tools, install
+# emulators/sdlmame as well.
+# We waste cycles building the tools here, though...
COMMENT = emulates game consoles and old home computers
-V = 0.132
-DISTNAME = sdlmess${V:S/.//}
-PKGNAME = sdlmess-${V}
-REVISION= 8
+V = 0148
+DISTNAME = mame${V}s
+PKGNAME = sdlmess-${V:S/0/0./}pl1
CATEGORIES = emulators games
-HOMEPAGE = http://rbelmont.mameworld.info/?page_id=163
+HOMEPAGE = http://mamedev.org/
+
+MAINTAINER = Brian Callahan <[email protected]>
# MAME Distribution License, see http://mamedev.org/license.html
+# history.dat : Creative Commons Attribution 3.0
PERMIT_PACKAGE_CDROM = may not sell
PERMIT_PACKAGE_FTP = Yes
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender 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 += xcb-render xcb-render-util gdk_pixbuf-2.0 SDL
-WANTLIB += gdk-x11-2.0 gtk-x11-2.0 gconf-2>=5
+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
+
+MASTER_SITES = http://mamedev.org/downloader.php?file=releases/ \
+ http://whiper.com/mame/${V:S/0//}/
+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
-MODULES = devel/gettext
-
-LIB_DEPENDS = devel/sdl devel/gconf2 x11/gtk+2
-
-USE_GMAKE = Yes
-
-NO_TEST = Yes
+# PATCHFILES doesn't work for .zip
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ ${V}u1_diff.zip:0 \
+ history${V:S/0//}e.zip:1
+
+MODULES = devel/gettext \
+ lang/python
+
+RUN_DEPENDS-main = fonts/liberation-fonts
+LIB_DEPENDS = devel/gconf2 \
+ devel/sdl-ttf \
+ x11/gtk+2
MAKE_FLAGS = OPT_FLAGS='-DINI_PATH="\"${SYSCONFDIR}/mess;\""'
-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
+MAKE_ENV += PTR64=1
.endif
-MAKE_FILE = makefile.sdl
+USE_GMAKE = Yes
-MESS_EXTBIN= dat2html imgtool
-MESS_DOC= config.txt credits.htm faq.htm imgtool.txt \
- license.txt mame.txt messnew.txt newvideo.txt
-MESS_DATA_DIR = roms hash samples artwork ctrlr cheat keymaps
+CONFIGURE_STYLE = none
+
+MAKE_FILE = makefile
+
+NO_TEST = Yes
+VMEM_WARNING = Yes
+
+post-extract:
+ @${UNZIP} -oq ${WRKDIR}/mame.zip -d ${WRKSRC}
+
+pre-patch:
+.for v in 1
+ ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/${V}u${v}.diff
+.endfor
+ @perl -pi -e 's|\r\n|\n|g' ${WRKDIST}/makefile \
+ ${WRKDIST}/src/emu/fileio.h \
+ ${WRKDIST}/src/emu/machine/netlist.h \
+ ${WRKDIST}/src/osd/sdl/sdl.mak
+ @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
+
+pre-build:
+ ${SUBST_CMD} ${WRKDIST}/src/osd/sdl/sdl.mak
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mess ${PREFIX}/bin/sdlmess
-.for i in ${MESS_EXTBIN}
- ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/
-.endfor
-.for i in ${MESS_DATA_DIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/sdlmess/${i}
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/keymaps/km[-_]??.txt \
- ${PREFIX}/share/sdlmess/keymaps/
- ${INSTALL_DATA} ${WRKSRC}/ui.bdf ${PREFIX}/share/sdlmess
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/sdlmess/keymaps
+ ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/keymaps/km[-_]??.txt \
+ ${PREFIX}/share/sdlmess/keymaps/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sdlmess
-.for i in ${MESS_DOC}
- ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${PREFIX}/share/doc/sdlmess/
+.for f in config.txt hlsl.txt license.txt newvideo.txt
+ ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/sdlmess
.endfor
- ${INSTALL_DATA} $(WRKSRC)/SDLMESS.txt ${PREFIX}/share/doc/sdlmess/
- ${INSTALL_DATA} $(WRKSRC)/sysinfo.dat ${PREFIX}/share/doc/sdlmess/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sdlmess
${SUBST_CMD} -c ${FILESDIR}/mess.ini \
- ${PREFIX}/share/examples/sdlmess/mess.ini
+ ${PREFIX}/share/examples/sdlmess/mess.ini
chown ${SHAREOWN}:${SHAREGRP} \
- ${PREFIX}/share/examples/sdlmess/mess.ini
-
+ ${PREFIX}/share/examples/sdlmess/mess.ini
+ ${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/sdlmess
+
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/sdlmess/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 19 Jul 2009 11:29:12 -0000 1.2
+++ distinfo 27 Mar 2013 15:37:04 -0000
@@ -1,5 +1,6 @@
-MD5 (sdlmess0132.zip) = ABXPQvJ541tYzyupTX8XAA==
-RMD160 (sdlmess0132.zip) = WeCFCbhUeyt0HszgZZFEG7Gg2yo=
-SHA1 (sdlmess0132.zip) = 53QFsVF87ZAyt5OyQcckBlQTIAg=
-SHA256 (sdlmess0132.zip) = umyIowESy2kV33DYXOvkJ6COvfENDjTkW9FrQXMl3oc=
-SIZE (sdlmess0132.zip) = 32310226
+SHA256 (mame/0148u1_diff.zip) = JzeNCeUPMcoN1POd9MR0AWZxlGZX63r56lqg/7rh2bs=
+SHA256 (mame/history148e.zip) = avUNQJMhmJnZWrLO5fjxIwlHw+YhiFRZk+ia9dzXxo4=
+SHA256 (mame/mame0148s.zip) = eNimi6U5NP38iV9FDAhoLa2oH37D50qY+wQlOVBtkyE=
+SIZE (mame/0148u1_diff.zip) = 3386949
+SIZE (mame/history148e.zip) = 3779373
+SIZE (mame/mame0148s.zip) = 33822494
Index: patches/patch-makefile
===================================================================
RCS file: patches/patch-makefile
diff -N patches/patch-makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-makefile 27 Mar 2013 15:37:04 -0000
@@ -0,0 +1,61 @@
+$OpenBSD: patch-makefile,v 1.4 2013/01/31 22:27:36 fgsch Exp $
+--- makefile.orig Tue Mar 26 23:40:25 2013
++++ makefile Tue Mar 26 23:43:17 2013
+@@ -24,7 +24,7 @@
+ #-------------------------------------------------
+
+ ifndef TARGET
+-TARGET = mame
++TARGET = mess
+ endif
+
+ ifndef SUBTARGET
+@@ -214,10 +214,10 @@ endif
+ # BIGENDIAN = 1
+
+ # uncomment next line to build expat as part of MAME build
+-BUILD_EXPAT = 1
++# BUILD_EXPAT = 1
+
+ # uncomment next line to build zlib as part of MAME build
+-BUILD_ZLIB = 1
++# BUILD_ZLIB = 1
+
+ # uncomment next line to build libflac as part of MAME build
+ BUILD_FLAC = 1
+@@ -315,7 +315,7 @@ endif
+
+ # compiler, linker and utilities
+ AR = @ar
+-CC = @gcc
++CC ?= @gcc
+ LD = @g++
+ MD = -mkdir$(EXE)
+ RM = @rm -f
+@@ -364,7 +364,7 @@ NAME = $(TARGET)$(SUBTARGET)
+ endif
+
+ # 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)
+@@ -455,7 +455,7 @@ CPPONLYFLAGS =
+
+ # CFLAGS is defined based on C or C++ targets
+ # (remember, expansion only happens when used, so doing it here is ok)
+-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
++CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
+
+ # we compile C-only to C89 standard with GNU extensions
+ # we compile C++ code to C++98 standard with GNU extensions
+@@ -482,7 +482,7 @@ CCOMFLAGS += -pg
+ endif
+
+ # add the optimization flag
+-CCOMFLAGS += -O$(OPTIMIZE)
++#CCOMFLAGS += -O$(OPTIMIZE)
+
+ # add the error warning flag
+ ifndef NOWERROR
Index: patches/patch-makefile_sdl
===================================================================
RCS file: patches/patch-makefile_sdl
diff -N patches/patch-makefile_sdl
--- patches/patch-makefile_sdl 17 Mar 2009 19:58:21 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-$OpenBSD: patch-makefile_sdl,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $
---- makefile.sdl.orig Fri Mar 13 17:53:53 2009
-+++ makefile.sdl Sun Mar 15 15:52:01 2009
-@@ -125,10 +125,10 @@ endif
- # BIGENDIAN = 1
-
- # uncomment next line to build expat as part of MAME build
--BUILD_EXPAT = 1
-+# BUILD_EXPAT = 1
-
- # uncomment next line to build zlib as part of MAME build
--BUILD_ZLIB = 1
-+# BUILD_ZLIB = 1
-
- # uncomment next line to include the symbols
- # SYMBOLS = 1
-@@ -197,8 +197,8 @@ endif
-
- # compiler, linker and utilities
- AR = @ar
--CC = @gcc
--LD = @gcc
-+CC ?= @gcc
-+LD ?= @gcc
- MD = -mkdir$(EXE)
- RM = @rm -f
-
-@@ -227,7 +227,7 @@ NAME = $(TARGET)$(SUBTARGET)
- endif
-
- # fullname is prefix+name+suffix+debugsuffix
--FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
-+FULLNAME = $(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
-
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
-@@ -302,9 +302,9 @@ 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,16 +331,12 @@ CCOMFLAGS += -pg
- endif
-
- # add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
-+#CCOMFLAGS += -O$(OPTIMIZE)
-
- # if we are optimizing, include optimization options
- # and make all errors into warnings
- ifneq ($(OPTIMIZE),0)
--ifneq ($(TARGETOS),os2)
--CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
--else
- CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
--endif
- endif
-
- # add a basic set of warnings
Index: patches/patch-src_emu_fileio_h
===================================================================
RCS file: patches/patch-src_emu_fileio_h
diff -N patches/patch-src_emu_fileio_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_emu_fileio_h 27 Mar 2013 15:37:04 -0000
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_emu_fileio_h,v 1.2 2013/01/31 22:27:36 fgsch Exp $
+--- src/emu/fileio.h.orig Sun Jan 20 20:15:29 2013
++++ src/emu/fileio.h Sun Jan 20 20:15:29 2013
+@@ -153,6 +153,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: patches/patch-src_emu_machine_netlist_h
===================================================================
RCS file: patches/patch-src_emu_machine_netlist_h
diff -N patches/patch-src_emu_machine_netlist_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_emu_machine_netlist_h 27 Mar 2013 15:37:04 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_emu_machine_netlist_h,v 1.2 2013/03/10 10:56:50 fgsch Exp $
+--- src/emu/machine/netlist.h.orig Tue Mar 5 19:13:20 2013
++++ src/emu/machine/netlist.h Tue Mar 5 19:14:44 2013
+@@ -99,7 +99,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &ne
+
+ #define NETLIST_MEMREGION(_name)
\
+ netlist.parse((char *)downcast<netlist_t
&>(netlist.netlist()).machine().root_device().memregion(_name)->base());
+-#if defined(__GNUC__) && (__GNUC__ >= 3)
++#if defined(__GNUC__) && (__GNUC__ > 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ >= 3))
+ #if !defined(__ppc__) && !defined (__PPC__) && !defined(__ppc64__) &&
!defined(__PPC64__)
+ #define ATTR_ALIGN __attribute__ ((aligned(128)))
+ #else
Index: patches/patch-src_osd_sdl_dview_c
===================================================================
RCS file: patches/patch-src_osd_sdl_dview_c
diff -N patches/patch-src_osd_sdl_dview_c
--- patches/patch-src_osd_sdl_dview_c 26 Apr 2010 21:02:26 -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/26 21:02:26 ajacoutot Exp $
-
-Fix build with newer gtk versions.
-
---- src/osd/sdl/dview.c.orig Mon Apr 26 21:23:55 2010
-+++ src/osd/sdl/dview.c Mon Apr 26 21:21:28 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: patches/patch-src_osd_sdl_sdl_mak
===================================================================
RCS file: /cvs/ports/emulators/sdlmess/patches/patch-src_osd_sdl_sdl_mak,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_osd_sdl_sdl_mak
--- patches/patch-src_osd_sdl_sdl_mak 30 Sep 2010 07:26:05 -0000 1.3
+++ patches/patch-src_osd_sdl_sdl_mak 27 Mar 2013 15:37:04 -0000
@@ -1,16 +1,15 @@
-$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.3 2010/09/30 07:26:05 ajacoutot Exp $
-
-XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
-src/osd/sdl/dview.c:138: warning: implicit declaration of function
'GTK_OBJECT_FLAGS'
-src/osd/sdl/dview.c:138: error: lvalue required as left operand of assignment
-
---- src/osd/sdl/sdl.mak.orig Wed Sep 29 17:27:36 2010
-+++ src/osd/sdl/sdl.mak Wed Sep 29 17:27:43 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
+$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.6 2013/03/10 10:56:50 fgsch Exp $
+--- src/osd/sdl/sdl.mak.orig Tue Mar 5 19:13:20 2013
++++ src/osd/sdl/sdl.mak Tue Mar 5 19:13:20 2013
+@@ -702,9 +702,9 @@ LIBS += `pkg-config QtGui --libs`
+ endif
+
+ # some systems still put important things in a different prefix
+-LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib
++LIBS += -L${X11BASE}/lib
+ # make sure we can find X headers
+-INCPATH += -I/usr/X11/include -I/usr/X11R6/include -I/usr/openwin/include
++INCPATH += -I${X11BASE}/include
endif # NO_X11
+
+ #-------------------------------------------------
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/sdlmess/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 9 May 2010 17:45:12 -0000 1.4
+++ pkg/PLIST 27 Mar 2013 15:37:04 -0000
@@ -13,35 +13,26 @@
@pkgpath emulators/xmame,-mess,x11
@pkgpath emulators/xmame,-mess,esd,sdl
@pkgpath emulators/xmame,-mess,esd,x11
-@bin bin/dat2html
-@bin bin/imgtool
@bin bin/sdlmess
share/doc/sdlmess/
-share/doc/sdlmess/SDLMESS.txt
share/doc/sdlmess/config.txt
-share/doc/sdlmess/credits.htm
-share/doc/sdlmess/faq.htm
-share/doc/sdlmess/imgtool.txt
+share/doc/sdlmess/hlsl.txt
share/doc/sdlmess/license.txt
-share/doc/sdlmess/mame.txt
-share/doc/sdlmess/messnew.txt
share/doc/sdlmess/newvideo.txt
-share/doc/sdlmess/sysinfo.dat
share/examples/sdlmess/
@sample ${SYSCONFDIR}/mess/
share/examples/sdlmess/mess.ini
@sample ${SYSCONFDIR}/mess/mess.ini
share/sdlmess/
-share/sdlmess/artwork/
-share/sdlmess/cheat/
-share/sdlmess/ctrlr/
-share/sdlmess/hash/
+share/sdlmess/history.dat
share/sdlmess/keymaps/
share/sdlmess/keymaps/km-be.txt
share/sdlmess/keymaps/km-ch.txt
share/sdlmess/keymaps/km-de.txt
share/sdlmess/keymaps/km-fr.txt
share/sdlmess/keymaps/km_it.txt
-share/sdlmess/roms/
-share/sdlmess/samples/
-share/sdlmess/ui.bdf
+@sample share/sdlmess/artwork/
+@sample share/sdlmess/cheat/
+@sample share/sdlmess/ctrlr/
+@sample share/sdlmess/roms/
+@sample share/sdlmess/samples/
