On Sat, Mar 14, 2009 at 11:36:40AM +0100, Pierre Riteau wrote: > Update to sdlmame 0.130.
Tarball updated following Landry's feedback. Also attached a diff between the old and the new tarball.
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile index 9a49135..d2f13cf 100644 --- a/emulators/sdlmame/Makefile +++ b/emulators/sdlmame/Makefile @@ -21,12 +21,11 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = may not sell PERMIT_DISTFILES_FTP = Yes -WANTLIB = X11 Xinerama c m pthread expat z -WANTLIB += Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi -WANTLIB += Xrandr Xrender fontconfig freetype iconv pixman-1 -WANTLIB += ORBit-2 atk-1.0 cairo glib-2.0 glitz gmodule-2.0 -WANTLIB += gobject-2.0 gthread-2.0 intl pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 png +WANTLIB += ORBit-2 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 glitz gmodule-2.0 +WANTLIB += gobject-2.0 gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pixman-1 png pthread z MASTER_SITES = http://rbelmont.mameworld.info/ EXTRACT_SUFX = .zip @@ -44,7 +43,6 @@ USE_X11 = Yes NO_REGRESS = Yes VMEM_WARNING = Yes -CFLAGS += -DSDLMAME_FREEBSD MAKE_ENV = ARCH=$(ARCH) CC=$(CC) CFLAGS="$(CFLAGS)" LD=$(CC) \ TARGETOS=openbsd .if ${MACHINE_ARCH} == "amd64" @@ -52,13 +50,13 @@ MAKE_ENV+= PTR64=1 .endif MAKE_FILE = makefile -MAME_EXTBIN = chdman jedutil ldresample ldverify romcmp testkeys +MAME_EXTBIN = chdman jedutil ldresample ldverify romcmp MAME_DOC = config.txt license.txt mame.txt newvideo.txt do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mame ${PREFIX}/bin/sdlmame .for i in ${MAME_EXTBIN} - ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/${i}-mame .endfor ${INSTALL_DATA_DIR} ${PREFIX}/share/sdlmame/keymaps ${INSTALL_DATA} ${WRKSRC}/keymaps/km[-_]??.txt \ diff --git a/emulators/sdlmame/patches/patch-makefile b/emulators/sdlmame/patches/patch-makefile index 171e114..d93a195 100644 --- a/emulators/sdlmame/patches/patch-makefile +++ b/emulators/sdlmame/patches/patch-makefile @@ -1,6 +1,6 @@ $OpenBSD$ --- makefile.orig Thu Mar 5 15:16:35 2009 -+++ makefile Mon Mar 9 20:57:56 2009 ++++ makefile Sun Mar 15 15:05:18 2009 @@ -125,10 +125,10 @@ endif # BIGENDIAN = 1 @@ -46,3 +46,12 @@ $OpenBSD$ endif # we compile C-only to C89 standard with GNU extensions +@@ -331,7 +331,7 @@ 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 diff --git a/emulators/sdlmame/patches/patch-src_osd_sdl_sdldir_c b/emulators/sdlmame/patches/patch-src_osd_sdl_sdldir_c new file mode 100644 index 0000000..075bfaf --- /dev/null +++ b/emulators/sdlmame/patches/patch-src_osd_sdl_sdldir_c @@ -0,0 +1,57 @@ +$OpenBSD$ +--- src/osd/sdl/sdldir.c.orig Sun Mar 15 10:50:02 2009 ++++ src/osd/sdl/sdldir.c Sun Mar 15 10:53:02 2009 +@@ -13,7 +13,7 @@ + #ifdef SDLMAME_LINUX + #define __USE_LARGEFILE64 + #endif +-#ifndef SDLMAME_FREEBSD ++#ifndef SDLMAME_BSD + #define _XOPEN_SOURCE 500 + #endif + +@@ -43,7 +43,7 @@ + struct _osd_directory + { + osd_directory_entry ent; +-#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + struct dirent *data; + #else + struct dirent64 *data; +@@ -52,7 +52,7 @@ struct _osd_directory + }; + + +-#if defined (SDLMAME_LINUX) || defined (SDLMAME_FREEBSD) || defined(SDLMAME_DARWIN) ++#if defined (SDLMAME_LINUX) || defined (SDLMAME_BSD) || defined(SDLMAME_DARWIN) + static osd_dir_entry_type get_attributes_enttype(int attributes) + { + if (attributes == DT_DIR) +@@ -85,7 +85,7 @@ static osd_dir_entry_type get_attributes_stat(const ch + + static UINT64 osd_get_file_size(const char *file) + { +-#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + struct stat st; + if(stat(file, &st)) + return 0; +@@ -171,7 +171,7 @@ osd_directory *osd_opendir(const char *dirname) + + const osd_directory_entry *osd_readdir(osd_directory *dir) + { +- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + dir->data = readdir(dir->fd); + #else + dir->data = readdir64(dir->fd); +@@ -181,7 +181,7 @@ const osd_directory_entry *osd_readdir(osd_directory * + return NULL; + + dir->ent.name = dir->data->d_name; +- #if defined (SDLMAME_LINUX) || defined (SDLMAME_FREEBSD) || defined(SDLMAME_DARWIN) ++ #if defined (SDLMAME_LINUX) || defined (SDLMAME_BSD) || defined(SDLMAME_DARWIN) + dir->ent.type = get_attributes_enttype(dir->data->d_type); + #else + dir->ent.type = get_attributes_stat(dir->data->d_name); diff --git a/emulators/sdlmame/patches/patch-src_osd_sdl_sdlfile_c b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlfile_c new file mode 100644 index 0000000..3604729 --- /dev/null +++ b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlfile_c @@ -0,0 +1,82 @@ +$OpenBSD$ +--- src/osd/sdl/sdlfile.c.orig Sun Mar 15 10:50:07 2009 ++++ src/osd/sdl/sdlfile.c Sun Mar 15 10:53:02 2009 +@@ -13,7 +13,7 @@ + #ifdef SDLMAME_LINUX + #define __USE_LARGEFILE64 + #endif +-#ifndef SDLMAME_FREEBSD ++#ifndef SDLMAME_BSD + #define _XOPEN_SOURCE 500 + #endif + +@@ -96,7 +96,7 @@ file_error osd_open(const char *path, UINT32 openflags + UINT32 access; + const char *src; + char *dst; +- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + struct stat st; + #else + struct stat64 st; +@@ -180,7 +180,7 @@ file_error osd_open(const char *path, UINT32 openflags + #endif + + // attempt to open the file +- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + (*file)->handle = open(tmpstr, access, 0666); + #else + (*file)->handle = open64(tmpstr, access, 0666); +@@ -203,7 +203,7 @@ file_error osd_open(const char *path, UINT32 openflags + // attempt to reopen the file + if (error == NO_ERROR) + { +- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + (*file)->handle = open(tmpstr, access, 0666); + #else + (*file)->handle = open64(tmpstr, access, 0666); +@@ -223,7 +223,7 @@ file_error osd_open(const char *path, UINT32 openflags + } + + // get the file size +- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + fstat((*file)->handle, &st); + #else + fstat64((*file)->handle, &st); +@@ -253,7 +253,7 @@ file_error osd_read(osd_file *file, void *buffer, UINT + { + ssize_t result; + +-#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD) ++#if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) + result = pread(file->handle, buffer, count, offset); + if (result < 0) + #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2) +@@ -281,7 +281,7 @@ file_error osd_write(osd_file *file, const void *buffe + { + UINT32 result; + +-#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD) ++#if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) + result = pwrite(file->handle, buffer, count, offset); + if (!result) + #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2) +@@ -465,13 +465,13 @@ osd_directory_entry *osd_stat(const char *path) + { + int err; + osd_directory_entry *result = NULL; +- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + struct stat st; + #else + struct stat64 st; + #endif + +- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) ++ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) + err = stat(path, &st); + #else + err = stat64(path, &st); diff --git a/emulators/sdlmame/patches/patch-src_osd_sdl_sdlmain_c b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlmain_c new file mode 100644 index 0000000..c56aa97 --- /dev/null +++ b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlmain_c @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/osd/sdl/sdlmain.c.orig Sun Mar 15 10:50:13 2009 ++++ src/osd/sdl/sdlmain.c Sun Mar 15 10:53:02 2009 +@@ -455,7 +455,7 @@ static void defines_verbose(void) + MACRO_VERBOSE(SDLMAME_LINUX); + MACRO_VERBOSE(SDLMAME_SOLARIS); + MACRO_VERBOSE(SDLMAME_IRIX); +- MACRO_VERBOSE(SDLMAME_FREEBSD); ++ MACRO_VERBOSE(SDLMAME_BSD); + MACRO_VERBOSE(LSB_FIRST); + MACRO_VERBOSE(PTR64); + MACRO_VERBOSE(MAME_DEBUG); diff --git a/emulators/sdlmame/patches/patch-src_osd_sdl_sdlmisc_c b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlmisc_c new file mode 100644 index 0000000..2a519bd --- /dev/null +++ b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlmisc_c @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/osd/sdl/sdlmisc.c.orig Sun Mar 15 10:50:18 2009 ++++ src/osd/sdl/sdlmisc.c Sun Mar 15 10:53:02 2009 +@@ -50,7 +50,7 @@ void *osd_alloc_executable(size_t size) + { + #if defined(SDLMAME_DARWIN) + return (void *)malloc(size); +-#elif defined(SDLMAME_FREEBSD) ++#elif defined(SDLMAME_BSD) + return (void *)mmap(0, size, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0); + #elif defined(SDLMAME_UNIX) + return (void *)mmap(0, size, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, 0, 0); diff --git a/emulators/sdlmame/patches/patch-src_osd_sdl_sdlprefix_h b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlprefix_h new file mode 100644 index 0000000..c62423d --- /dev/null +++ b/emulators/sdlmame/patches/patch-src_osd_sdl_sdlprefix_h @@ -0,0 +1,14 @@ +$OpenBSD$ +--- src/osd/sdl/sdlprefix.h.orig Sun Mar 15 10:47:29 2009 ++++ src/osd/sdl/sdlprefix.h Sun Mar 15 10:48:01 2009 +@@ -30,8 +30,8 @@ + #elif defined(__linux__) + #define SDLMAME_LINUX 1 + +-#elif defined(__FreeBSD__) || defined(__DragonFly__) +-#define SDLMAME_FREEBSD 1 ++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) ++#define SDLMAME_BSD 1 + #endif + + // fix for Ubuntu 8.10 diff --git a/emulators/sdlmame/pkg/PLIST b/emulators/sdlmame/pkg/PLIST index 20fe5c2..46eb167 100644 --- a/emulators/sdlmame/pkg/PLIST +++ b/emulators/sdlmame/pkg/PLIST @@ -1,11 +1,10 @@ @comment $OpenBSD$ -...@bin bin/chdman -...@bin bin/jedutil -...@bin bin/ldresample -...@bin bin/ldverify -...@bin bin/romcmp +...@bin bin/chdman-mame +...@bin bin/jedutil-mame +...@bin bin/ldresample-mame +...@bin bin/ldverify-mame +...@bin bin/romcmp-mame @bin bin/sdlmame -...@bin bin/testkeys share/doc/sdlmame/ share/doc/sdlmame/SDLMAME.txt share/doc/sdlmame/config.txt
sdlmame-0.130v2.tar.gz
Description: application/tar-gz
