Attachment #112261 for bug #153645

View | Details | Raw Unified | Return to bug 153645
Collapse All | Expand All

Lines 6-12 Link Here

(-)mame/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= mame	8	PORTNAME= mame
9	PORTVERSION= 0.139	9	PORTVERSION= 0.141
10	CATEGORIES= emulators	10	CATEGORIES= emulators
11	MASTER_SITES= http://www.aarongiles.com/mirror/releases/ \	11	MASTER_SITES= http://www.aarongiles.com/mirror/releases/ \
12	ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/	12	ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
Lines 27-33 Link Here
27	MAKEFILE= makefile	27	MAKEFILE= makefile
28	ONLY_FOR_ARCHS= i386 amd64	28	ONLY_FOR_ARCHS= i386 amd64
29	SUB_FILES= pkg-message	29	SUB_FILES= pkg-message
30	USE_DOS2UNIX= makefile sdl.mak debugcpu.c
31		30
32	OPTIONS= DEBUG "Build mame debugger" off	31	OPTIONS= DEBUG "Build mame debugger" off
33		32

Lines 1-3 Link Here

(-)mame/distinfo (-3 / +2 lines)
1	MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189	1	SHA256 (mame0141s.zip) = 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8
2	SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6	2	SIZE (mame0141s.zip) = 17092788
3	SIZE (mame0139s.zip) = 16706970




# CORE SEARCH PATH OPTIONS
#
rompath                   $HOME/.mame/roms
hashpath                  $HOME/.mame/hash
samplepath                $HOME/.mame/samples
artpath                   $HOME/.mame/artwork
ctrlrpath                 $HOME/.mame/ctrlr

contrast                  1.0
gamma                     1.0
pause_brightness          0.65
effect                    none

#
# CORE VECTOR OPTIONS

bios                      
cheat                     0
skip_gameinfo             0
uifont                    default

#
# DEBUGGING OPTIONS

#
# VIDEO OPTIONS
#
video                     opengl
numscreens                1
window                    1
maximize                  0
keepaspect                1
unevenstretch             1
effect                    none
centerh                   1
centerv                   1
waitvsync                 0

Lines 1-13 Link Here

(-)mame/files/patch-debugcpu.c (-13 lines)
1	--- src/emu/debug/debugcpu.c.orig 2010-07-30 10:55:52.000000000 +0200
2	+++ src/emu/debug/debugcpu.c 2010-07-30 10:56:13.000000000 +0200
3	@@ -49,7 +49,9 @@
4	#include "debugint/debugint.h"
5	#include "uiinput.h"
6	#include <ctype.h>
7	-
8	+#ifdef __FreeBSD__
9	+#undef tolower
10	+#endif
11
12
13	/***************************************************************************




--- makefile.orig	2010-09-28 00:33:10.000000000 +0200
+++ makefile	2010-11-23 02:47:43.000000000 +0100
@@ -295,8 +295,8 @@
 
 # compiler, linker and utilities
 AR = @ar
-CC = @gcc
-LD = @g++
+CC:= @$(CC)
+LD:= @$(CXX)
 MD = -mkdir$(EXE)
 RM = @rm -f
 OBJDUMP = @objdump
@@ -344,7 +344,7 @@
 endif
 
 # fullname is prefix+name+suffix+suffix64+suffixdebug
-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
+FULLNAME = $(NAME)
 
 # add an EXE suffix to get the final emulator name
 EMULATOR = $(FULLNAME)$(EXE)




--- src/osd/sdl/sdl.mak.orig	2011-01-03 01:31:41.000000000 +0100
+++ src/osd/sdl/sdl.mak	2011-01-03 01:32:40.000000000 +0100
@@ -139,7 +139,7 @@
 ifeq ($(TARGETOS),freebsd)
 BASE_TARGETOS = unix
 SYNC_IMPLEMENTATION = tc
-DEFS += -DNO_AFFINITY_NP
+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
 LIBS += -lutil
 # /usr/local/include is not considered a system include directory
 # on FreeBSD. GL.h resides there and throws warnings
@@ -314,7 +314,7 @@
 ifeq ($(BASE_TARGETOS),unix)
 
 DEFS += -DSDLMAME_UNIX
-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
+DEBUGOBJS = $(SDLOBJ)/debugwin.o
 LIBGL = -lGL
 ifeq ($(NO_X11),1)
 NO_DEBUGGER = 1
@@ -481,9 +481,9 @@
 
 # the new debugger relies on GTK+ in addition to the base SDLMAME needs
 # Non-X11 builds can not use the debugger
-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
+#INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
+#CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
 #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
 
 # some systems still put important things in a different prefix
-CCOMFLAGS += `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`
+#CCOMFLAGS += `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`
 #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
 
 # some systems still put important things in a different prefix

Return to bug 153645

Lines 10-15 Link Here

(-)mame/files/mame.ini (-4 / +6 lines)
10	# CORE SEARCH PATH OPTIONS	10	# CORE SEARCH PATH OPTIONS
11	#	11	#
12	rompath $HOME/.mame/roms	12	rompath $HOME/.mame/roms
		13	hashpath $HOME/.mame/hash
13	samplepath $HOME/.mame/samples	14	samplepath $HOME/.mame/samples
14	artpath $HOME/.mame/artwork	15	artpath $HOME/.mame/artwork
15	ctrlrpath $HOME/.mame/ctrlr	16	ctrlrpath $HOME/.mame/ctrlr
Lines 82-87 Link Here
82	contrast 1.0	83	contrast 1.0
83	gamma 1.0	84	gamma 1.0
84	pause_brightness 0.65	85	pause_brightness 0.65
		86	effect none
85		87
86	#	88	#
87	# CORE VECTOR OPTIONS	89	# CORE VECTOR OPTIONS
Lines 144-149 Link Here
144	bios	146	bios
145	cheat 0	147	cheat 0
146	skip_gameinfo 0	148	skip_gameinfo 0
		149	uifont default
147		150
148	#	151	#
149	# DEBUGGING OPTIONS	152	# DEBUGGING OPTIONS
Lines 160-172 Link Here
160	#	163	#
161	# VIDEO OPTIONS	164	# VIDEO OPTIONS
162	#	165	#
163	video soft	166	video opengl
164	numscreens 1	167	numscreens 1
165	window 0	168	window 1
166	maximize 1	169	maximize 0
167	keepaspect 1	170	keepaspect 1
168	unevenstretch 1	171	unevenstretch 1
169	effect none
170	centerh 1	172	centerh 1
171	centerv 1	173	centerv 1
172	waitvsync 0	174	waitvsync 0

Lines 1-22 Link Here

(-)mame/files/patch-makefile (-20 / +20 lines)
1	--- makefile.orig 2010-07-30 10:42:41.000000000 +0200	1	--- makefile.orig 2010-09-28 00:33:10.000000000 +0200
2	+++ makefile 2010-07-30 10:43:26.000000000 +0200	2	+++ makefile 2010-11-23 02:47:43.000000000 +0100
3	@@ -295,8 +295,8 @@	3	@@ -295,8 +295,8 @@
4		4
5	# compiler, linker and utilities	5	# compiler, linker and utilities
6	AR = @ar	6	AR = @ar
7	-CC = @gcc	7	-CC = @gcc
8	-LD = @g++	8	-LD = @g++
9	+CC:= @$(CC)	9	+CC:= @$(CC)
10	+LD:= @$(CXX)	10	+LD:= @$(CXX)
11	MD = -mkdir$(EXE)	11	MD = -mkdir$(EXE)
12	RM = @rm -f	12	RM = @rm -f
13	OBJDUMP = @objdump	13	OBJDUMP = @objdump
14	@@ -344,7 +344,7 @@	14	@@ -344,7 +344,7 @@
15	endif	15	endif
16		16
17	# fullname is prefix+name+suffix+suffix64+suffixdebug	17	# fullname is prefix+name+suffix+suffix64+suffixdebug
18	-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)	18	-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
19	+FULLNAME = $(NAME)	19	+FULLNAME = $(NAME)
20		20
21	# add an EXE suffix to get the final emulator name	21	# add an EXE suffix to get the final emulator name
22	EMULATOR = $(FULLNAME)$(EXE)	22	EMULATOR = $(FULLNAME)$(EXE)

Lines 1-40 Link Here

(-)mame/files/sdl.mak.patch (-39 / +32 lines)
1	--- src/osd/sdl/sdl.mak.orig 2010-02-14 04:47:30.000000000 +0100	1	--- src/osd/sdl/sdl.mak.orig 2011-01-03 01:31:41.000000000 +0100
2	+++ src/osd/sdl/sdl.mak 2010-07-30 12:05:33.000000000 +0200	2	+++ src/osd/sdl/sdl.mak 2011-01-03 01:32:40.000000000 +0100
3	@@ -139,7 +139,7 @@	3	@@ -139,7 +139,7 @@
4	ifeq ($(TARGETOS),freebsd)	4	ifeq ($(TARGETOS),freebsd)
5	BASE_TARGETOS = unix	5	BASE_TARGETOS = unix
6	SYNC_IMPLEMENTATION = tc	6	SYNC_IMPLEMENTATION = tc
7	-DEFS += -DNO_AFFINITY_NP	7	-DEFS += -DNO_AFFINITY_NP
8	+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER	8	+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
9	# /usr/local/include is not considered a system include directory	9	LIBS += -lutil
10	# on FreeBSD. GL.h resides there and throws warnings	10	# /usr/local/include is not considered a system include directory
11	CCOMFLAGS += -isystem /usr/local/include	11	# on FreeBSD. GL.h resides there and throws warnings
12	@@ -205,7 +205,7 @@	12	@@ -314,7 +314,7 @@
13	ifndef GTK_INSTALL_ROOT	13	ifeq ($(BASE_TARGETOS),unix)
14	NO_DEBUGGER = 1	14
15	else	15	DEFS += -DSDLMAME_UNIX
16	-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o	16	-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
17	+DEBUGOBJS = $(SDLOBJ)/debugwin.o	17	+DEBUGOBJS = $(SDLOBJ)/debugwin.o
18	LIBS += -lgtk-win32-2.0 -lgdk-win32-2.0 -lgmodule-2.0 -lglib-2.0 -lgobject-2.0 \	18	LIBGL = -lGL
19	-lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0	19	ifeq ($(NO_X11),1)
20	CCOMFLAGS += -mms-bitfields \	20	NO_DEBUGGER = 1
21	@@ -304,7 +304,7 @@	21	@@ -481,9 +481,9 @@
22	ifeq ($(BASE_TARGETOS),unix)	22
23		23	# the new debugger relies on GTK+ in addition to the base SDLMAME needs
24	DEFS += -DSDLMAME_UNIX	24	# Non-X11 builds can not use the debugger
25	-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o	25	-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
26	+DEBUGOBJS = $(SDLOBJ)/debugwin.o	26	-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
27	LIBGL = -lGL	27	-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
28	ifeq ($(NO_X11),1)	28	+#INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
29	NO_DEBUGGER = 1	29	+#CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
30	@@ -454,8 +454,8 @@	30	+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
31		31	#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
32	# the new debugger relies on GTK+ in addition to the base SDLMAME needs	32
33	# Non-X11 builds can not use the debugger	33	# some systems still put important things in a different prefix
34	-CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
35	-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
36	+#CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
37	+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
38	#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
39
40	# some systems still put important things in a different prefix