kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.126:

Browse source 
- lot's of improvments, game additions.
- new gtk2+ based debugger.

Also, move definitions shared with sdlmame to Makefile.common.
This commit is contained in:
Dieter Baron 2008-08-03 15:32:44 +00:00 committed by Thomas Klausner
parent c7a5f83e20
commit 01e4246e61
10 changed files with 137 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
sdlmame/Makefile
View file

@ -1,56 +1,15 @@
# $NetBSD: Makefile,v 1.13 2008/06/30 12:02:57 thomasklausner Exp $
# $NetBSD: Makefile,v 1.14 2008/08/03 15:32:44 dillo Exp $
#
# Don't update to 0.XXXuN, those are development snapshots.
DISTNAME= sdlmame0125
PKGNAME= sdlmame-0.125
CATEGORIES= emulators
MASTER_SITES= http://rbelmont.mameworld.info/
EXTRACT_SUFX= .zip
DISTNAME= sdlmame0126
PKGNAME= sdlmame-0.126
MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://rbelmont.mameworld.info/?page_id=163
COMMENT= Multiple Arcade Machine Emulator, SDL port
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= xmame-[0-9]*
RESTRICTED= selling is not allowed
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
USE_TOOLS+= gmake
UNLIMIT_RESOURCES= datasize
MAKE_FILE= makefile
LICENSE= mame-license
.if ${MACHINE_ARCH:Mi386}
MAKE_FLAGS+= X86_MIPS3_DRC=1
MAKE_FLAGS+= X86_PPC_DRC=1
#MAKE_FLAGS+= X86_ASM=1
.else
MAKE_FLAGS+= X86_MIPS3_DRC=
MAKE_FLAGS+= X86_PPC_DRC=
.endif
# XXX: PTR64
.if ${MACHINE_ARCH:Mx86_64}
MAKE_FLAGS+= PTR64=true
# XXX: FORCE_DRC_C_BACKEND?
.endif
. include "../../mk/endian.mk"
.if ${MACHINE_ENDIAN:Mbig}
MAKE_FLAGS+= BIGENDIAN=true
.endif
MAKE_FLAGS+= SDLMAME_NO64BITIO=true
# Pragma once is not needed, and creates warnings/errors on gcc
SUBST_CLASSES+= pragma
SUBST_STAGE.pragma= pre-configure
SUBST_FILES.pragma= src/*.h src/*/*.h
SUBST_SED.pragma= -e "s|\#pragma once||g"
DOCDIR= share/doc/sdlmame
INSTALLATION_DIRS= bin ${DOCDIR}
@ -66,8 +25,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/mame.txt ${DESTDIR}${PREFIX}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/docs/windows.txt ${DESTDIR}${PREFIX}/${DOCDIR}
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
.include "Makefile.common"

62
sdlmame/Makefile.common Normal file
View file

@ -0,0 +1,62 @@
# $NetBSD: Makefile.common,v 1.1 2008/08/03 15:32:44 dillo Exp $
#
# used by wip/sdlmess/Makefile
CATEGORIES= emulators
MASTER_SITES= http://rbelmont.mameworld.info/
EXTRACT_SUFX= .zip
MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://rbelmont.mameworld.info/?page_id=163
PKG_DESTDIR_SUPPORT= user-destdir
RESTRICTED= selling is not allowed
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
USE_TOOLS+= gmake pkg-config
UNLIMIT_RESOURCES+= datasize
LICENSE= mame-license
.if ${MACHINE_ARCH:Mi386}
MAKE_FLAGS+= X86_MIPS3_DRC=1
MAKE_FLAGS+= X86_PPC_DRC=1
#MAKE_FLAGS+= X86_ASM=1
.else
MAKE_FLAGS+= X86_MIPS3_DRC=
MAKE_FLAGS+= X86_PPC_DRC=
.endif
# XXX: PTR64
.if ${MACHINE_ARCH:Mx86_64}
MAKE_FLAGS+= PTR64=true
# XXX: FORCE_DRC_C_BACKEND?
.endif
. include "../../mk/endian.mk"
.if ${MACHINE_ENDIAN:Mbig}
MAKE_FLAGS+= BIGENDIAN=true
.endif
MAKE_FLAGS+= SDLMAME_NO64BITIO=true
# Pragma once is not needed, and creates warnings/errors on gcc
SUBST_CLASSES+= pragma
SUBST_STAGE.pragma= pre-configure
SUBST_FILES.pragma= src/*.h src/*/*.h
SUBST_SED.pragma= -e "s|\#pragma once||g"
# Using LD with calling conventions of CC is wrong, use CC instead.
SUBST_CLASSES+= ldcc
SUBST_STAGE.ldcc= pre-configure
SUBST_FILES.ldcc= ${MAKE_FILE}
SUBST_FILES.ldcc+= *.mak */*.mak */*/*.mak */*/*/*.mak */*/*/*/*.mak
SUBST_SED.ldcc= -e "s|(LD)|(CC)|"
.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

2
sdlmame/TODO
View file

@ -1,2 +1,2 @@
- correctly set PTR64 (currently only done on x86_64)
- share Makefile.common with sdlmess
- use MAINTAINER?= in Makefile.common (says pkglint)

16
sdlmame/distinfo
View file

@ -1,12 +1,8 @@
$NetBSD: distinfo,v 1.9 2008/06/30 12:02:57 thomasklausner Exp $
$NetBSD: distinfo,v 1.10 2008/08/03 15:32:44 dillo Exp $
SHA1 (sdlmame0125.zip) = ce336396ddf87e327ef28230495d3a39159fcf3f
RMD160 (sdlmame0125.zip) = c0fc73f995ce5a11a260d2a89857132ccd279a0b
Size (sdlmame0125.zip) = 16403503 bytes
SHA1 (patch-aa) = c7ceda5c6e542ab25d7143dbd9d0f24d71c2f0ba
SHA1 (patch-ac) = 19316acda7b30fb04c04f0ee0602b4012834cc1f
SHA1 (patch-ae) = 336d5ef6ed46fbf048d201678db0d7a741258c4b
SHA1 (patch-af) = e2fd90cfa730dfa55c587c95cf4af0ca25462f02
SHA1 (patch-ag) = adef251f8d0e242975fbfe3fb1b9a098cebc9b6c
SHA1 (sdlmame0126.zip) = a067e2ee9e9551cc68a151568c41125c02de83d7
RMD160 (sdlmame0126.zip) = f217ce7890b715f401633834de419732a272c7d1
Size (sdlmame0126.zip) = 16781478 bytes
SHA1 (patch-aa) = 6a91a2a162f30cf9a4b61e07f375068bb38be370
SHA1 (patch-ae) = dbcf17c973733727a6e1cc7a18f879d2b90d7184
SHA1 (patch-ah) = 6a8e0307a58114cfe59d066a4e5e6210895dcc9a
SHA1 (patch-ai) = a6de4739d5e13ac1d7cc2126e10523d46081af03

115
sdlmame/patches/patch-aa
View file

@ -1,34 +1,21 @@
$NetBSD: patch-aa,v 1.6 2008/06/30 12:02:57 thomasklausner Exp $
$NetBSD: patch-aa,v 1.7 2008/08/03 15:32:44 dillo Exp $
--- makefile.orig 2008-05-05 12:44:38.000000000 +0000
--- makefile.orig 2008-07-10 02:34:43.000000000 +0200
+++ makefile
@@ -105,10 +105,10 @@ endif
# PROFILER = 1
# uncomment next line to use DRC MIPS3 engine
-X86_MIPS3_DRC = 1
+# X86_MIPS3_DRC = 1
# uncomment next line to use DRC PowerPC engine
-X86_PPC_DRC = 1
+# X86_PPC_DRC = 1
# uncomment next line to build using unix-style libsdl on Mac OS X
# (vs. the native framework port). Normal users should not enable this.
@@ -127,10 +127,10 @@ X86_PPC_DRC = 1
@@ -125,10 +125,10 @@ endif
# BIGENDIAN = 1
# uncomment next line to build expat as part of MAME build
-BUILD_EXPAT = 1
+#BUILD_EXPAT = 1
+# BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
-BUILD_ZLIB = 1
+#BUILD_ZLIB = 1
+# BUILD_ZLIB = 1
# uncomment next line to include the symbols
# SYMBOLS = 1
@@ -200,9 +200,9 @@ BUILD_EXE = $(EXE)
@@ -193,9 +193,9 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
@ -41,34 +28,31 @@ $NetBSD: patch-aa,v 1.6 2008/06/30 12:02:57 thomasklausner Exp $
MD = -mkdir$(EXE)
RM = @rm -f
@@ -226,7 +226,7 @@ NAME = $(TARGET)$(SUBTARGET)
@@ -219,7 +219,8 @@ NAME = $(TARGET)$(SUBTARGET)
endif
# fullname is prefix+name+suffix+debugsuffix
-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)$(DEBUGSUFFIX)
+#FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)$(DEBUGSUFFIX)
+FULLNAME = $(NAME)$(SUFFIX)$(DEBUGSUFFIX)
# add an EXE suffix to get the final emulator name
EMULATOR = $(FULLNAME)$(EXE)
@@ -289,7 +289,7 @@ ifdef PROFILER
DEFS += -DMAME_PROFILER
endif
-
+DEFS += -DPI=M_PI
@@ -284,10 +285,10 @@ endif
#-------------------------------------------------
# compile flags
@@ -328,19 +328,19 @@ CFLAGS += -pg
endif
# this warning is not supported on the os2 compilers
-ifneq ($(TARGETOS),os2)
-CFLAGS += -Wdeclaration-after-statement
-endif
+#ifneq ($(TARGETOS),os2)
+#CFLAGS += -Wdeclaration-after-statement
+#endif
# we compile to C89 standard with GNU extensions
-CFLAGS = -std=gnu89
+#CFLAGS = -std=gnu89
# this speeds it up a bit by piping between the preprocessor/compiler/assembler
-CFLAGS += -pipe
+#CFLAGS += -pipe
# add -g if we need symbols
ifdef SYMBOLS
@@ -321,14 +322,14 @@ CFLAGS += -Wdeclaration-after-statement
endif
# add the optimization flag
-CFLAGS += -O$(OPTIMIZE)
@ -84,28 +68,47 @@ $NetBSD: patch-aa,v 1.6 2008/06/30 12:02:57 thomasklausner Exp $
endif
endif
@@ -389,13 +389,13 @@ LDFLAGS += -pg
@@ -344,7 +345,7 @@ endif
#-------------------------------------------------
# add core include paths
-CFLAGS += \
+CFLAGS := \
-I$(SRC)/$(TARGET) \
-I$(SRC)/$(TARGET)/includes \
-I$(OBJ)/$(TARGET)/layout \
@@ -354,7 +355,7 @@ CFLAGS += \
-I$(SRC)/lib/util \
-I$(SRC)/osd \
-I$(SRC)/osd/$(OSD) \
-
+ $(CFLAGS)
#-------------------------------------------------
@@ -363,10 +364,10 @@ CFLAGS += \
# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
# flags only used when linking the core emulator
-LDFLAGS =
+#LDFLAGS =
ifneq ($(TARGETOS),macosx)
ifneq ($(TARGETOS),os2)
-LDFLAGS = -Wl,--warn-common
+#LDFLAGS = -Wl,--warn-common
endif
# strip symbols and other metadata in non-symbols and non profiling builds
-ifndef SYMBOLS
-ifndef PROFILE
-ifneq ($(TARGETOS),macosx)
endif
LDFLAGSEMULATOR =
@@ -380,7 +381,7 @@ endif
ifndef SYMBOLS
ifndef PROFILE
ifneq ($(TARGETOS),macosx)
-LDFLAGS += -s
-endif
-endif
-endif
+#ifndef SYMBOLS
+#ifndef PROFILE
+#ifneq ($(TARGETOS),macosx)
+#LDFLAGS += -s
+#endif
+#endif
+#endif
# output a map file (emulator only)
ifdef MAP
@@ -544,7 +544,7 @@ $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(
endif
endif
endif
@@ -532,7 +533,7 @@ $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(
# always recompile the version string
$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
@echo Linking $@...

13
sdlmame/patches/patch-ac
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ac,v 1.5 2008/06/30 10:11:12 dillo Exp $
--- src/emu/cpu/cpu.mak.orig 2008-05-05 12:41:45.000000000 +0000
+++ src/emu/cpu/cpu.mak
@@ -1044,7 +1044,7 @@ BUILD += $(M68KMAKE)
$(M68KMAKE): $(CPUOBJ)/m68000/m68kmake.o $(LIBOCORE)
@echo Linking $@...
- $(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(LIBS) -o $@
endif
# rule to ensure we build the header before building the core CPU file

8
sdlmame/patches/patch-ae
View file

@ -1,12 +1,14 @@
$NetBSD: patch-ae,v 1.3 2007/06/14 12:00:25 dillo Exp $
$NetBSD: patch-ae,v 1.4 2008/08/03 15:32:44 dillo Exp $
--- src/osd/sdl/sdldir.c.orig 2007-05-26 16:19:37.000000000 +0200
--- src/osd/sdl/sdldir.c.orig 2007-09-23 01:06:04.000000000 +0200
+++ src/osd/sdl/sdldir.c
@@ -28,6 +28,7 @@
@@ -28,6 +28,9 @@
#define __USE_BSD // to get DT_xxx on Linux
#endif
#undef _POSIX_C_SOURCE // to get DT_xxx on OS X
+#if defined(__NetBSD__)
+#define _NETBSD_SOURCE // to get DT_xxx on NetBSD
+#endif
#include <dirent.h>
#include "osdcore.h"

64
sdlmame/patches/patch-af
View file

@ -1,64 +0,0 @@
$NetBSD: patch-af,v 1.4 2008/06/30 10:11:12 dillo Exp $
--- src/tools/tools.mak.orig 2008-05-05 12:41:46.000000000 +0000
+++ src/tools/tools.mak
@@ -42,7 +42,7 @@ ROMCMPOBJS = \
romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -56,7 +56,7 @@ CHDMANOBJS = \
chdman$(EXE): $(VERSIONOBJ) $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -69,7 +69,7 @@ JEDUTILOBJS = \
jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -82,7 +82,7 @@ MAKEMETAOBJS = \
makemeta$(EXE): $(MAKEMETAOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -95,7 +95,7 @@ REGREPOBJS = \
regrep$(EXE): $(REGREPOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -108,7 +108,7 @@ SRCCLEANOBJS = \
srcclean$(EXE): $(SRCCLEANOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -121,4 +121,4 @@ SRC2HTMLOBJS = \
src2html$(EXE): $(SRC2HTMLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@

13
sdlmame/patches/patch-ag
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ag,v 1.4 2008/06/30 10:11:12 dillo Exp $
--- src/osd/sdl/sdl.mak.orig 2008-03-10 23:40:14.000000000 +0000
+++ src/osd/sdl/sdl.mak
@@ -307,7 +307,7 @@ TESTKEYSOBJS = \
testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(SDLMAIN) $(SDLOBJ)/strconv.o $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(SDLMAIN) $(LIBS) -o $@
testlib:
-echo LIBS: $(LIBS)

30
sdlmame/patches/patch-ai
View file

@ -1,30 +0,0 @@
$NetBSD: patch-ai,v 1.1 2008/06/30 10:11:12 dillo Exp $
--- src/build/build.mak.orig 2008-05-05 12:41:46.000000000 +0000
+++ src/build/build.mak
@@ -41,7 +41,7 @@ FILE2STROBJS = \
$(FILE2STR): $(FILE2STROBJS) $(LIBOCORE)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -54,7 +54,7 @@ PNG2BDCOBJS = \
$(PNG2BDC): $(PNG2BDCOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
@@ -67,6 +67,6 @@ VERINFOOBJS = \
$(VERINFO): $(VERINFOOBJS) $(LIBOCORE)
@echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
endif