Revision: 5771 Author: pebender Date: Sun Nov 1 09:33:53 2009 Log: - Updated package emulators/sdlmame.
http://code.google.com/p/minimyth/source/detail?r=5771 Added: /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.135-cross.patch /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.135-no_gtk.patch /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.135.patch.gar Deleted: /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.134-cross.patch /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.134-no_gtk.patch /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.134.patch.gar Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/emulators/sdlmame/Makefile /trunk/gar-minimyth/script/emulators/sdlmame/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.135-cross.patch Sun Nov 1 09:33:53 2009 @@ -0,0 +1,40 @@ +diff -Naur sdlmame0135-old/makefile sdlmame0135-new/makefile +--- sdlmame0135-old/makefile 2009-11-01 09:06:48.000000000 -0800 ++++ sdlmame0135-new/makefile 2009-11-01 09:09:59.000000000 -0800 +@@ -583,12 +583,12 @@ + + $(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR) + @echo Converting $<... +- @$(FILE2STR) $< $@ layout_$(basename $(notdir $<)) ++ @sdlmame-file2str $< $@ layout_$(basename $(notdir $<)) + + $(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC) $(FILE2STR) + @echo Converting $<... +- @$(PNG2BDC) $< $(OBJ)/temp.bdc +- @$(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8 ++ @sdlmame-png2bdc $< $(OBJ)/temp.bdc ++ @sdlmame-file2str $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8 + + $(OBJ)/%.a: + @echo Archiving $...@... +diff -Naur sdlmame0135-old/src/emu/cpu/cpu.mak sdlmame0135-new/src/emu/cpu/cpu.mak +--- sdlmame0135-old/src/emu/cpu/cpu.mak 2009-11-01 09:06:48.000000000 -0800 ++++ sdlmame0135-new/src/emu/cpu/cpu.mak 2009-11-01 09:09:59.000000000 -0800 +@@ -962,7 +962,7 @@ + # rule to generate the C files + $(CPUOBJ)/m68000/m68kops.c: $(M68KMAKE) $(CPUSRC)/m68000/m68k_in.c + @echo Generating M68K source files... +- $(M68KMAKE) $(CPUOBJ)/m68000 $(CPUSRC)/m68000/m68k_in.c ++ sdlmame-m68kmake$(EXE) $(CPUOBJ)/m68000 $(CPUSRC)/m68000/m68k_in.c + + # rule to build the generator + ifneq ($(CROSS_BUILD),1) +@@ -1456,7 +1456,7 @@ + # rule to generate the C file + $(CPUOBJ)/tms57002/tms57002.inc: $(TMSMAKE) $(CPUSRC)/tms57002/tmsinstr.lst + @echo Generating TMS57002 source file... +- $(TMSMAKE) $(CPUSRC)/tms57002/tmsinstr.lst $@ ++ sdlmame-tmsmake$(EXE) $(CPUSRC)/tms57002/tmsinstr.lst $@ + + # rule to build the generator + ifneq ($(CROSS_BUILD),1) ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.135-no_gtk.patch Sun Nov 1 09:33:53 2009 @@ -0,0 +1,34 @@ +diff -Naur sdlmame0135-old/src/osd/sdl/sdl.mak sdlmame0135-new/src/osd/sdl/sdl.mak +--- sdlmame0135-old/src/osd/sdl/sdl.mak 2009-11-01 09:05:14.000000000 -0800 ++++ sdlmame0135-new/src/osd/sdl/sdl.mak 2009-11-01 09:08:41.000000000 -0800 +@@ -155,7 +155,7 @@ + endif + + ifeq ($(TARGETOS),unix) +-DEFS += -DSDLMAME_UNIX ++DEFS += -DSDLMAME_UNIX -DNO_DEBUGGER + ifndef NO_X11 + DEFS += -DSDLMAME_X11 + else +@@ -287,14 +287,14 @@ + + # the new debugger relies on GTK+ in addition to the base SDLMAME needs + # Non-X11 builds can not use the debugger +-ifndef NO_X11 +-OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o +-CFLAGS += `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` +-CFLAGS += -DGTK_DISABLE_DEPRECATED +-else ++#ifndef NO_X11 ++#OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o ++#CFLAGS += `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` ++#CFLAGS += -DGTK_DISABLE_DEPRECATED ++#else + OSDCOREOBJS += $(SDLOBJ)/debugwin.o +-endif # NO_X11 ++#endif # NO_X11 + + # make sure we can find X headers + CFLAGS += ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.135.patch.gar Sun Nov 1 09:33:53 2009 @@ -0,0 +1,58 @@ +diff -Naur sdlmame0135-old/makefile sdlmame0135-new/makefile +--- sdlmame0135-old/makefile 2009-09-24 17:08:08.000000000 -0700 ++++ sdlmame0135-new/makefile 2009-11-01 09:12:32.000000000 -0800 +@@ -125,10 +125,10 @@ + # BIGENDIAN = 1 + + # uncomment next line to build expat as part of MAME build +-BUILD_EXPAT = 1 ++# BUILD_EXPAT = 1 + + # uncomment next line to build zlib as part of MAME build +-BUILD_ZLIB = 1 ++# BUILD_ZLIB = 1 + + # uncomment next line to include the symbols + # SYMBOLS = 1 +@@ -196,11 +196,11 @@ + endif + + # compiler, linker and utilities +-AR = @ar +-CC = @gcc +-LD = @gcc +-MD = -mkdir$(EXE) +-RM = @rm -f ++AR ?= ar ++CC ?= gcc ++LD = $(CC) ++MD = mkdir$(EXE) -p ++RM = rm -f + + + +@@ -338,7 +338,7 @@ + ifneq ($(OPTIMIZE),0) + ifneq ($(TARGETOS),os2) + ifndef IA64 +-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) ++CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) + else + endif + else +diff -Naur sdlmame0135-old/src/osd/sdl/sdl.mak sdlmame0135-new/src/osd/sdl/sdl.mak +--- sdlmame0135-old/src/osd/sdl/sdl.mak 2009-10-25 08:43:25.000000000 -0700 ++++ sdlmame0135-new/src/osd/sdl/sdl.mak 2009-11-01 09:12:32.000000000 -0800 +@@ -297,10 +297,10 @@ + endif # NO_X11 + + # make sure we can find X headers +-CFLAGS += -I/usr/X11/include -I/usr/X11R6/include -I/usr/openwin/include ++CFLAGS += + # some systems still put important things in a different prefix + ifndef NO_X11 +-LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib ++LIBS += + endif + endif # Unix + ======================================= --- /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.134-cross.patch Thu Sep 10 18:44:21 2009 +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur sdlmame0134-old/makefile sdlmame0134-new/makefile ---- sdlmame0134-old/makefile 2009-09-10 14:20:54.000000000 -0700 -+++ sdlmame0134-new/makefile 2009-09-10 14:21:31.000000000 -0700 -@@ -583,12 +583,12 @@ - - $(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR) - @echo Converting $<... -- @$(FILE2STR) $< $@ layout_$(basename $(notdir $<)) -+ @sdlmame-file2str $< $@ layout_$(basename $(notdir $<)) - - $(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC) $(FILE2STR) - @echo Converting $<... -- @$(PNG2BDC) $< $(OBJ)/temp.bdc -- @$(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8 -+ @sdlmame-png2bdc $< $(OBJ)/temp.bdc -+ @sdlmame-file2str $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8 - - $(OBJ)/%.a: - @echo Archiving $...@... -diff -Naur sdlmame0134-old/src/emu/cpu/cpu.mak sdlmame0134-new/src/emu/cpu/cpu.mak ---- sdlmame0134-old/src/emu/cpu/cpu.mak 2009-09-10 14:20:54.000000000 -0700 -+++ sdlmame0134-new/src/emu/cpu/cpu.mak 2009-09-10 14:21:31.000000000 -0700 -@@ -962,7 +962,7 @@ - # rule to generate the C files - $(CPUOBJ)/m68000/m68kops.c: $(M68KMAKE) $(CPUSRC)/m68000/m68k_in.c - @echo Generating M68K source files... -- $(M68KMAKE) $(CPUOBJ)/m68000 $(CPUSRC)/m68000/m68k_in.c -+ sdlmame-m68kmake$(EXE) $(CPUOBJ)/m68000 $(CPUSRC)/m68000/m68k_in.c - - # rule to build the generator - ifneq ($(CROSS_BUILD),1) -@@ -1456,7 +1456,7 @@ - # rule to generate the C file - $(CPUOBJ)/tms57002/tms57002.inc: $(TMSMAKE) $(CPUSRC)/tms57002/tmsinstr.lst - @echo Generating TMS57002 source file... -- $(TMSMAKE) $(CPUSRC)/tms57002/tmsinstr.lst $@ -+ sdlmame-tmsmake$(EXE) $(CPUSRC)/tms57002/tmsinstr.lst $@ - - # rule to build the generator - ifneq ($(CROSS_BUILD),1) ======================================= --- /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.134-no_gtk.patch Thu Sep 10 18:44:21 2009 +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur sdlmame0134-old/src/osd/sdl/sdl.mak sdlmame0134-new/src/osd/sdl/sdl.mak ---- sdlmame0134-old/src/osd/sdl/sdl.mak 2009-09-10 14:20:33.000000000 -0700 -+++ sdlmame0134-new/src/osd/sdl/sdl.mak 2009-09-10 14:21:07.000000000 -0700 -@@ -146,7 +146,7 @@ - endif - - ifeq ($(TARGETOS),unix) --DEFS += -DSDLMAME_UNIX -+DEFS += -DSDLMAME_UNIX -DNO_DEBUGGER - ifndef NO_X11 - DEFS += -DSDLMAME_X11 - else -@@ -278,14 +278,14 @@ - - # the new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --ifndef NO_X11 --OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o --CFLAGS += `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` --CFLAGS += -DGTK_DISABLE_DEPRECATED --else -+#ifndef NO_X11 -+#OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o -+#CFLAGS += `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` -+#CFLAGS += -DGTK_DISABLE_DEPRECATED -+#else - OSDCOREOBJS += $(SDLOBJ)/debugwin.o --endif # NO_X11 -+#endif # NO_X11 - - # make sure we can find X headers - CFLAGS += ======================================= --- /trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.134.patch.gar Thu Sep 17 20:02:23 2009 +++ /dev/null @@ -1,92 +0,0 @@ -diff -Naur sdlmame0134-old/makefile sdlmame0134-new/makefile ---- sdlmame0134-old/makefile 2009-08-30 21:45:36.000000000 -0700 -+++ sdlmame0134-new/makefile 2009-09-10 14:20:33.000000000 -0700 -@@ -125,10 +125,10 @@ - # BIGENDIAN = 1 - - # uncomment next line to build expat as part of MAME build --BUILD_EXPAT = 1 -+# BUILD_EXPAT = 1 - - # uncomment next line to build zlib as part of MAME build --BUILD_ZLIB = 1 -+# BUILD_ZLIB = 1 - - # uncomment next line to include the symbols - # SYMBOLS = 1 -@@ -196,11 +196,11 @@ - endif - - # compiler, linker and utilities --AR = @ar --CC = @gcc --LD = @gcc --MD = -mkdir$(EXE) --RM = @rm -f -+AR ?= ar -+CC ?= gcc -+LD = $(CC) -+MD = mkdir$(EXE) -p -+RM = rm -f - - - -@@ -338,7 +338,7 @@ - ifneq ($(OPTIMIZE),0) - ifneq ($(TARGETOS),os2) - ifndef IA64 --CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) -+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) - else - endif - else -diff -Naur sdlmame0134-old/src/osd/sdl/sdl.mak sdlmame0134-new/src/osd/sdl/sdl.mak ---- sdlmame0134-old/src/osd/sdl/sdl.mak 2009-06-10 21:41:24.000000000 -0700 -+++ sdlmame0134-new/src/osd/sdl/sdl.mak 2009-09-10 14:20:33.000000000 -0700 -@@ -264,8 +264,8 @@ - endif - - ifndef SDL_INSTALL_ROOT --CFLAGS += `sdl-config --cflags` --LIBS += -lm `sdl-config --libs` $(LIBGL) -+CFLAGS += `sdl-config --cflags` -+LIBS += -lm `sdl-config --libs` $(LIBGL) - else - CFLAGS += -I$(SDL_INSTALL_ROOT)/include - #LIBS += -L/opt/intel/cce/9.1.051/lib -limf -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL $(LIBGL) -@@ -288,10 +288,10 @@ - endif # NO_X11 - - # make sure we can find X headers --CFLAGS += -I/usr/X11/include -I/usr/X11R6/include -I/usr/openwin/include -+CFLAGS += - # some systems still put important things in a different prefix - ifndef NO_X11 --LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib -+LIBS += - endif - endif # Unix - -@@ -335,9 +335,9 @@ - # Remove the "/SDL" component from the include path so that we can compile - # files (header files are #include "SDL/something.h", so the extra "/SDL" - # causes a significant problem) --CFLAGS += `sdl-config --cflags | sed 's:/SDL::'` -DNO_SDL_GLEXT -+CFLAGS += `sdl-config --cflags | sed 's:/SDL::'` -DNO_SDL_GLEXT - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -+LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread - endif - - SDLMAIN = $(SDLOBJ)/SDLMain_tmpl.o -@@ -351,8 +351,8 @@ - ifeq ($(TARGETOS),os2) - OSDCOREOBJS += $(SDLOBJ)/debugwin.o - --CFLAGS += `sdl-config --cflags` --LIBS += `sdl-config --libs` -+CFLAGS += `sdl-config --cflags` -+LIBS += `sdl-config --libs` - - # to avoid name clash of '_brk' - $(OBJ)/emu/cpu/h6280/6280dasm.o : CDEFS += -D__STRICT_ANSI__ ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Oct 31 15:54:53 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Nov 1 09:33:53 2009 @@ -5,7 +5,7 @@ MiniMyth release. For earlier changes see the yearly changelog files. -------------------------------------------------------------------------------- -Changes since 70 (2009-10-31): +Changes since 70 (2009-11-01): Current MythTV versions MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch svn 16082 and @@ -68,6 +68,7 @@ Updated db/mysql. Updated devel/fakeroot Updated devel/strace. + Updated emulators/sdlmame. Updated gtk/gtk+. Updated kernel-2.6.31/linux. Updated kernel-headers/linux-headers-2.6.31. ======================================= --- /trunk/gar-minimyth/script/emulators/sdlmame/Makefile Thu Sep 10 18:44:21 2009 +++ /trunk/gar-minimyth/script/emulators/sdlmame/Makefile Sun Nov 1 09:33:53 2009 @@ -1,5 +1,5 @@ GARNAME = sdlmame -GARVERSION = 0.134 +GARVERSION = 0.135 CATEGORIES = emulators DISTFILES = $(GARNAME)$(subst .,,$(GARVERSION)).zip PATCHFILES = $(DISTNAME).patch.gar $(DISTNAME)-no_gtk.patch ======================================= --- /trunk/gar-minimyth/script/emulators/sdlmame/checksums Thu Sep 17 20:02:23 2009 +++ /trunk/gar-minimyth/script/emulators/sdlmame/checksums Sun Nov 1 09:33:53 2009 @@ -1,4 +1,4 @@ -706429e5ecf2ed48c1a732d0dc9c0f94 download/sdlmame0134.zip -310022cb0836b01ea51a10d2b511d9b6 download/sdlmame-0.134.patch.gar -633e2673fcfd4ae57389b036d52b0709 download/sdlmame-0.134-no_gtk.patch -6fc5274de26cbae876be6203fd907a47 download/sdlmame-0.134-cross.patch +526cad3a2f06ac50f9ab74ca410f087b download/sdlmame0135.zip +419d417c95625a9539865d814777a064 download/sdlmame-0.135.patch.gar +a84728131394c6147ebfd9152971f369 download/sdlmame-0.135-no_gtk.patch +143581555a909fbbfb1cdbcd68331836 download/sdlmame-0.135-cross.patch --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
