Date: Thu, 6 Jan 2011 18:30:12 GMT From: Emmanuel Vadot <elbarto@arcadebsd.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/153645: Update ports: emulators/mame update to v0.141 Message-ID: <201101061830.p06IUC4O076836@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/153645; it has been noted by GNATS. From: Emmanuel Vadot <elbarto@arcadebsd.org> To: bug-followup@FreeBSD.org, elbarto@arcadebsd.org Cc: Subject: Re: ports/153645: Update ports: emulators/mame update to v0.141 Date: Thu, 6 Jan 2011 19:04:18 +0100 This is a multi-part message in MIME format. --Multipart=_Thu__6_Jan_2011_19_04_18_+0100_QmYpEUYlH1gNbE=w Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Followup with correct email address. -- Emmanuel Vadot <manu@megadrive.org> --Multipart=_Thu__6_Jan_2011_19_04_18_+0100_QmYpEUYlH1gNbE=w Content-Type: text/plain; name="mame.txt" Content-Disposition: attachment; filename="mame.txt" Content-Transfer-Encoding: 7bit diff -uNr /usr/ports/emulators/mame/Makefile mame/Makefile --- /usr/ports/emulators/mame/Makefile 2010-11-21 00:41:54.000000000 +0100 +++ mame/Makefile 2011-01-03 00:53:45.000000000 +0100 @@ -6,7 +6,7 @@ # PORTNAME= mame -PORTVERSION= 0.139 +PORTVERSION= 0.141 CATEGORIES= emulators MASTER_SITES= http://www.aarongiles.com/mirror/releases/ \ ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ @@ -27,7 +27,6 @@ MAKEFILE= makefile ONLY_FOR_ARCHS= i386 amd64 SUB_FILES= pkg-message -USE_DOS2UNIX= makefile sdl.mak debugcpu.c OPTIONS= DEBUG "Build mame debugger" off diff -uNr /usr/ports/emulators/mame/distinfo mame/distinfo --- /usr/ports/emulators/mame/distinfo 2010-11-21 00:41:54.000000000 +0100 +++ mame/distinfo 2011-01-03 01:15:13.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189 -SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6 -SIZE (mame0139s.zip) = 16706970 +SHA256 (mame0141s.zip) = 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8 +SIZE (mame0141s.zip) = 17092788 diff -uNr /usr/ports/emulators/mame/files/mame.ini mame/files/mame.ini --- /usr/ports/emulators/mame/files/mame.ini 2010-11-21 00:41:54.000000000 +0100 +++ mame/files/mame.ini 2011-01-03 01:30:28.000000000 +0100 @@ -10,6 +10,7 @@ # CORE SEARCH PATH OPTIONS # rompath $HOME/.mame/roms +hashpath $HOME/.mame/hash samplepath $HOME/.mame/samples artpath $HOME/.mame/artwork ctrlrpath $HOME/.mame/ctrlr @@ -82,6 +83,7 @@ contrast 1.0 gamma 1.0 pause_brightness 0.65 +effect none # # CORE VECTOR OPTIONS @@ -144,6 +146,7 @@ bios cheat 0 skip_gameinfo 0 +uifont default # # DEBUGGING OPTIONS @@ -160,13 +163,12 @@ # # VIDEO OPTIONS # -video soft +video opengl numscreens 1 -window 0 -maximize 1 +window 1 +maximize 0 keepaspect 1 unevenstretch 1 -effect none centerh 1 centerv 1 waitvsync 0 diff -uNr /usr/ports/emulators/mame/files/patch-debugcpu.c mame/files/patch-debugcpu.c --- /usr/ports/emulators/mame/files/patch-debugcpu.c 2010-08-01 19:22:55.000000000 +0200 +++ mame/files/patch-debugcpu.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- src/emu/debug/debugcpu.c.orig 2010-07-30 10:55:52.000000000 +0200 -+++ src/emu/debug/debugcpu.c 2010-07-30 10:56:13.000000000 +0200 -@@ -49,7 +49,9 @@ - #include "debugint/debugint.h" - #include "uiinput.h" - #include <ctype.h> -- -+#ifdef __FreeBSD__ -+#undef tolower -+#endif - - - /*************************************************************************** diff -uNr /usr/ports/emulators/mame/files/patch-makefile mame/files/patch-makefile --- /usr/ports/emulators/mame/files/patch-makefile 2010-11-21 00:41:54.000000000 +0100 +++ mame/files/patch-makefile 2010-11-23 02:47:45.000000000 +0100 @@ -1,22 +1,22 @@ ---- makefile.orig 2010-07-30 10:42:41.000000000 +0200 -+++ makefile 2010-07-30 10:43:26.000000000 +0200 +--- 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 + + # 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) + 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) diff -uNr /usr/ports/emulators/mame/files/sdl.mak.patch mame/files/sdl.mak.patch --- /usr/ports/emulators/mame/files/sdl.mak.patch 2010-11-21 00:41:54.000000000 +0100 +++ mame/files/sdl.mak.patch 2011-01-03 01:33:02.000000000 +0100 @@ -1,40 +1,33 @@ ---- src/osd/sdl/sdl.mak.orig 2010-02-14 04:47:30.000000000 +0100 -+++ src/osd/sdl/sdl.mak 2010-07-30 12:05:33.000000000 +0200 +--- 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 - # /usr/local/include is not considered a system include directory - # on FreeBSD. GL.h resides there and throws warnings - CCOMFLAGS += -isystem /usr/local/include -@@ -205,7 +205,7 @@ - ifndef GTK_INSTALL_ROOT - NO_DEBUGGER = 1 - else --DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o -+DEBUGOBJS = $(SDLOBJ)/debugwin.o - LIBS += -lgtk-win32-2.0 -lgdk-win32-2.0 -lgmodule-2.0 -lglib-2.0 -lgobject-2.0 \ - -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 - CCOMFLAGS += -mms-bitfields \ -@@ -304,7 +304,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 -@@ -454,8 +454,8 @@ - - # the new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --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 + 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 --Multipart=_Thu__6_Jan_2011_19_04_18_+0100_QmYpEUYlH1gNbE=w--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101061830.p06IUC4O076836>