cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MESS to 0.160 -- it is simply a sync with MAME.

Browse Source 
Like MAME, MESS is no longer going to be packaged due to an unresolved
license mess. Build the port yourself if you want MESS.
This commit is contained in:
bcallah 2015-04-19 16:20:26 +00:00
parent 5d7933ecb5
commit dc119a9338
10 changed files with 112 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emulators/sdlmess/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.35 2014/12/01 15:13:52 naddy Exp $
# $OpenBSD: Makefile,v 1.36 2015/04/19 16:20:26 bcallah Exp $
# Other archs have not been tested
ONLY_FOR_ARCHS = amd64 i386
COMMENT = emulates game consoles and old home computers
V = 153
V = 160
DISTNAME = mame0${V}s
PKGNAME = sdlmess-0.${V}
@ -15,13 +15,14 @@ HOMEPAGE = http://messdev.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# MAME Distribution License, see http://mamedev.org/license.html
# MAME Distribution License, see http://mamedev.org/legal.html
# history.dat : Creative Commons Attribution 3.0
PERMIT_PACKAGE_CDROM = may not sell
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = unclear license
PERMIT_PACKAGE_FTP = unclear license
PERMIT_DISTFILES_FTP = unclear license
WANTLIB += SDL SDL_ttf X11 Xinerama c expat fontconfig m pthread
WANTLIB += stdc++ util z
WANTLIB += SDL SDL_ttf X11 Xinerama c expat fontconfig freetype
WANTLIB += m pthread stdc++ util z
MASTER_SITES = http://mamedev.org/downloader.php?file=releases/ \
http://whiper.com/mame/${V}/
@ -45,7 +46,8 @@ MAKE_FLAGS = OPT_FLAGS='-DINI_PATH="\"${SYSCONFDIR}/mess;\""'
MAKE_ENV = ARCH=$(ARCH) CC=$(CC) CFLAGS="$(CFLAGS)" \
TARGETOS=openbsd \
NO_USE_QTDEBUG=1 \
NOWERROR=1
NOWERROR=1 \
SDL_LIBVER=sdl
.if ${MACHINE_ARCH} == "amd64"
MAKE_ENV += PTR64=1
.endif

8
emulators/sdlmess/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (mame/history153.zip) = XOhfcIvZnjsS3SIkYGExG5Kt/KKK6fz/LWJQGKyyYhc=
SHA256 (mame/mame0153s.zip) = q/b7TaSJhczv6vYBau7b6R0HrWsM192nwPPcDrgzVeQ=
SIZE (mame/history153.zip) = 5233618
SIZE (mame/mame0153s.zip) = 37829714
SHA256 (mame/history160.zip) = TMF8viA2HIELyUUt0LPuIy4cSIVSeoDCGt9I0nfi8A8=
SHA256 (mame/mame0160s.zip) = ZYLfrX4Ss2DSkxRE27KGqfOu6HkLOL33njLL7nAR3LU=
SIZE (mame/history160.zip) = 6309037
SIZE (mame/mame0160s.zip) = 80937878

26
emulators/sdlmess/patches/patch-makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-makefile,v 1.5 2014/05/14 23:11:41 bcallah Exp $
--- makefile.orig Thu Apr 17 11:29:59 2014
+++ makefile Thu Apr 17 11:29:59 2014
$OpenBSD: patch-makefile,v 1.6 2015/04/19 16:20:26 bcallah Exp $
--- makefile.orig Sat Apr 18 11:21:38 2015
+++ makefile Sat Apr 18 11:22:40 2015
@@ -24,7 +24,7 @@
#-------------------------------------------------
@ -10,7 +10,7 @@ $OpenBSD: patch-makefile,v 1.5 2014/05/14 23:11:41 bcallah Exp $
endif
ifndef SUBTARGET
@@ -217,10 +217,10 @@ endif
@@ -227,10 +227,10 @@ endif
# BIGENDIAN = 1
# uncomment next line to build expat as part of MAME build
@ -23,7 +23,7 @@ $OpenBSD: patch-makefile,v 1.5 2014/05/14 23:11:41 bcallah Exp $
# uncomment next line to build libflac as part of MAME build
BUILD_FLAC = 1
@@ -337,7 +337,7 @@ endif
@@ -364,7 +364,7 @@ endif
# compiler, linker and utilities
ifneq ($(TARGETOS),emscripten)
AR = @ar
@ -31,31 +31,31 @@ $OpenBSD: patch-makefile,v 1.5 2014/05/14 23:11:41 bcallah Exp $
+CC ?= @gcc
LD = @g++
endif
MD = -mkdir$(EXE)
@@ -387,7 +387,7 @@ NAME = $(TARGET)$(SUBTARGET)
MD = -mkdir$(BUILD_EXE)
@@ -417,7 +417,7 @@ NAME = $(TARGET)$(SUBTARGET)
endif
# fullname is prefix+name+suffix+suffix64+suffixdebug
-FULLNAME ?= $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
-FULLNAME ?= $(BIN)$(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)
@@ -486,7 +486,7 @@ CPPONLYFLAGS =
@@ -520,7 +520,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)
-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)
+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)
# we compile C-only to C89 standard with GNU extensions
# we compile C++ code to C++98 standard with GNU extensions
@@ -519,7 +519,7 @@ CCOMFLAGS += -pg
@@ -562,7 +562,7 @@ CCOMFLAGS += -pg
endif
# add the optimization flag
-CCOMFLAGS += -O$(OPTIMIZE)
+#CCOMFLAGS += -O$(OPTIMIZE)
+# CCOMFLAGS += -O$(OPTIMIZE)
# add the error warning flag
ifndef NOWERROR

12
emulators/sdlmess/patches/patch-src_emu_cpu_m68000_m68kmake_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_emu_cpu_m68000_m68kmake_c,v 1.1 2014/12/01 15:13:53 naddy Exp $
--- src/emu/cpu/m68000/m68kmake.c.orig Mon Dec 1 02:51:23 2014
+++ src/emu/cpu/m68000/m68kmake.c Mon Dec 1 02:51:53 2014
@@ -611,7 +611,7 @@ static int fgetline(char* buff, int nchars, FILE* file
if(fgets(buff, nchars, file) == NULL)
return -1;
if(buff[0] == '\r')
- memcpy(buff, buff + 1, nchars - 1);
+ memmove(buff, buff + 1, nchars - 1);
length = strlen(buff);
while(length && (buff[length-1] == '\r' || buff[length-1] == '\n'))

15
emulators/sdlmess/patches/patch-src_emu_luaengine_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_emu_luaengine_c,v 1.1 2015/04/19 16:20:26 bcallah Exp $
Ugh...
--- src/emu/luaengine.c.orig Sat Apr 4 13:12:44 2015
+++ src/emu/luaengine.c Sat Apr 4 13:14:14 2015
@@ -130,7 +130,7 @@ lua_engine::hook::hook()
cb = -1;
}
-#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__)
+#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__) || defined(__OpenBSD__)
#undef _L
#endif

67
emulators/sdlmess/patches/patch-src_emu_netlist_nl_base_h
View File

@ -1,67 +0,0 @@
$OpenBSD: patch-src_emu_netlist_nl_base_h,v 1.1 2014/05/14 23:11:41 bcallah Exp $
--- 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;

15
emulators/sdlmess/patches/patch-src_emu_netlist_plists_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_emu_netlist_plists_h,v 1.1 2015/04/19 16:20:26 bcallah Exp $
Ugh...
--- src/emu/netlist/plists.h.orig Sat Apr 4 10:46:33 2015
+++ src/emu/netlist/plists.h Sat Apr 4 10:47:00 2015
@@ -199,7 +199,7 @@ class plinearlist_t (private)
// pnamedlist_t: a simple list
// ----------------------------------------------------------------------------------------
-#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__)
+#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__) || defined(__OpenBSD__)
#undef _C
#endif

12
emulators/sdlmess/patches/patch-src_mame_includes_n64_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_mame_includes_n64_h,v 1.1 2015/04/19 16:20:26 bcallah Exp $
--- src/mame/includes/n64.h.orig Sat Apr 4 11:39:24 2015
+++ src/mame/includes/n64.h Sat Apr 4 11:39:29 2015
@@ -227,7 +227,7 @@ class n64_periphs : public device_t, (private)
UINT32 si_pif_addr;
UINT32 si_pif_addr_rd64b;
UINT32 si_pif_addr_wr64b;
- UINT32 si_status;
+ UINT32 esi_status;
UINT32 cic_status;
int cic_type;

39
emulators/sdlmess/patches/patch-src_mame_machine_n64_c Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-src_mame_machine_n64_c,v 1.1 2015/04/19 16:20:26 bcallah Exp $
--- src/mame/machine/n64.c.orig Sat Apr 4 11:41:03 2015
+++ src/mame/machine/n64.c Sat Apr 4 11:41:16 2015
@@ -194,7 +194,7 @@ void n64_periphs::device_reset()
memset(pif_cmd, 0, sizeof(pif_cmd));
si_dram_addr = 0;
si_pif_addr = 0;
- si_status = 0;
+ esi_status = 0;
memset(m_save_data.eeprom, 0, 2048);
@@ -1997,7 +1997,7 @@ void n64_periphs::pif_dma(int direction)
}
}
- si_status |= 0x1000;
+ esi_status |= 0x1000;
signal_rcp_interrupt(SI_INTERRUPT);
}
@@ -2010,7 +2010,7 @@ READ32_MEMBER( n64_periphs::si_reg_r )
//return si_dram_addr;
case 0x18/4: // SI_STATUS_REG
- ret = si_status;
+ ret = esi_status;
}
return ret;
@@ -2039,7 +2039,7 @@ WRITE32_MEMBER( n64_periphs::si_reg_w )
break;
case 0x18/4: // SI_STATUS_REG
- si_status &= ~0x1000;
+ esi_status &= ~0x1000;
clear_rcp_interrupt(SI_INTERRUPT);
break;

8
emulators/sdlmess/patches/patch-src_osd_sdl_sdl_mak
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.9 2014/05/14 23:11:41 bcallah Exp $
--- 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`
$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.10 2015/04/19 16:20:26 bcallah Exp $
--- src/osd/sdl/sdl.mak.orig Sat Apr 18 11:28:40 2015
+++ src/osd/sdl/sdl.mak Sat Apr 18 11:28:40 2015
@@ -868,9 +868,9 @@ LIBS += $(QTLIBS)
endif
# some systems still put important things in a different prefix