Author: pebender
Date: Sun Apr 5 14:19:43 2009
New Revision: 4559
Added:
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130-cross.patch
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130-no_gtk.patch
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130.patch.gar
Removed:
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.125-cross.patch
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.125.patch.gar
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-todo.txt
trunk/gar-minimyth/script/emulators/sdlmame/Makefile
trunk/gar-minimyth/script/emulators/sdlmame/checksums
Log:
- Updated package emulators/sdlmame.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Apr 5
14:19:43 2009
@@ -53,6 +53,7 @@
Updated packages
Updated db/sqlite.
Updated emulators/stella.
+ Updated emulators/sdlmame.
Updated kernel-2.6.29/linux.
Updated kernel-headers/linux-headers-2.6.29.
Updated lib/bluez.
Modified: trunk/gar-minimyth/html/minimyth/document-todo.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-todo.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-todo.txt Sun Apr 5 14:19:43
2009
@@ -3,7 +3,6 @@
MythTV) do to compiler
optimization bugs.
devel/glibc - 2.9 - getaddrinfo no longer
compatible with
certain broken DNS
servers.
- emulators/sdlmame > 0.125 - requires gtk+ and gconf.
kde/kdelibs - 4.x.x - not compatible with Qt
3.3.x (requires Qt 4.3.x).
kernel-* - 2.6.27.x - causes LIRC to fail
after wake from suspend.
- causes wake-on-USB to
fail.
Modified: trunk/gar-minimyth/script/emulators/sdlmame/Makefile
==============================================================================
--- trunk/gar-minimyth/script/emulators/sdlmame/Makefile (original)
+++ trunk/gar-minimyth/script/emulators/sdlmame/Makefile Sun Apr 5
14:19:43 2009
@@ -1,8 +1,8 @@
GARNAME = sdlmame
-GARVERSION = 0.125
+GARVERSION = 0.130
CATEGORIES = emulators
DISTFILES = $(GARNAME)$(subst .,,$(GARVERSION)).zip
-PATCHFILES = $(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME).patch.gar $(DISTNAME)-no_gtk.patch
ifneq ($(DESTIMG),build)
PATCHFILES += $(DISTNAME)-cross.patch
endif
@@ -45,4 +45,5 @@
@cp -f $(WORKSRC)/obj/sdl/mame/build/file2str
$(DESTDIR)$(bindir)/sdlmame-file2str
@cp -f $(WORKSRC)/obj/sdl/mame/build/png2bdc
$(DESTDIR)$(bindir)/sdlmame-png2bdc
@cp -f $(WORKSRC)/obj/sdl/mame/build/m68kmake
$(DESTDIR)$(bindir)/sdlmame-m68kmake
+ @cp -f $(WORKSRC)/obj/sdl/mame/build/tmsmake
$(DESTDIR)$(bindir)/sdlmame-tmsmake
@$(MAKECOOKIE)
Modified: trunk/gar-minimyth/script/emulators/sdlmame/checksums
==============================================================================
--- trunk/gar-minimyth/script/emulators/sdlmame/checksums (original)
+++ trunk/gar-minimyth/script/emulators/sdlmame/checksums Sun Apr 5
14:19:43 2009
@@ -1,3 +1,4 @@
-0c687b81e9bf7a1fba04a9431b7b8067 download/sdlmame0125.zip
-32804a6390377b2eb2c759896051b581 download/sdlmame-0.125.patch.gar
-f4b13863736353070e3e2007d9215acc download/sdlmame-0.125-cross.patch
+1195da0b6ae762eeebb21f500509d62d download/sdlmame0130.zip
+4a348479918fbdb3cb2ee4fc8219ce53 download/sdlmame-0.130-no_gtk.patch
+cead4cf3f82bccf7a089c1c186b5a54f download/sdlmame-0.130.patch.gar
+3aaa874d9886ad6b7861c121697445a4 download/sdlmame-0.130-cross.patch
Added:
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130-cross.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130-cross.patch
Sun Apr 5 14:19:43 2009
@@ -0,0 +1,40 @@
+diff -Naur sdlmame0130-old/makefile sdlmame0130-new/makefile
+--- sdlmame0130-old/makefile 2009-04-05 13:32:57.000000000 -0700
++++ sdlmame0130-new/makefile 2009-04-05 13:52:21.000000000 -0700
+@@ -584,12 +584,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 sdlmame0130-old/src/emu/cpu/cpu.mak
sdlmame0130-new/src/emu/cpu/cpu.mak
+--- sdlmame0130-old/src/emu/cpu/cpu.mak 2009-04-05 13:32:57.000000000
-0700
++++ sdlmame0130-new/src/emu/cpu/cpu.mak 2009-04-05 13:57:10.000000000
-0700
+@@ -1126,7 +1126,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)
+@@ -1675,7 +1675,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)
Added:
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130-no_gtk.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130-no_gtk.patch
Sun Apr 5 14:19:43 2009
@@ -0,0 +1,34 @@
+diff -Naur sdlmame0130-old/src/osd/sdl/sdl.mak
sdlmame0130-new/src/osd/sdl/sdl.mak
+--- sdlmame0130-old/src/osd/sdl/sdl.mak 2009-04-05 13:32:45.000000000
-0700
++++ sdlmame0130-new/src/osd/sdl/sdl.mak 2009-04-05 13:36:38.000000000
-0700
+@@ -131,7 +131,7 @@
+ endif
+
+ ifeq ($(TARGETOS),unix)
+-DEFS += -DSDLMAME_UNIX
++DEFS += -DSDLMAME_UNIX -DNO_DEBUGGER
+ ifndef NO_X11
+ DEFS += -DSDLMAME_X11
+ else
+@@ -263,14 +263,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 +=
Added:
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.130.patch.gar
Sun Apr 5 14:19:43 2009
@@ -0,0 +1,83 @@
+diff -Naur sdlmame0130-old/makefile sdlmame0130-new/makefile
+--- sdlmame0130-old/makefile 2009-03-05 06:16:35.000000000 -0800
++++ sdlmame0130-new/makefile 2009-04-05 13:06:05.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
+
+
+
+diff -Naur sdlmame0130-old/src/osd/sdl/sdl.mak
sdlmame0130-new/src/osd/sdl/sdl.mak
+--- sdlmame0130-old/src/osd/sdl/sdl.mak 2009-01-02 12:59:12.000000000
-0800
++++ sdlmame0130-new/src/osd/sdl/sdl.mak 2009-04-05 13:08:30.000000000
-0700
+@@ -249,8 +249,8 @@
+ endif
+
+ ifndef SDL_INSTALL_ROOT
+-CFLAGS += `sdl-config --cflags`
+-LIBS += -lm `sdl-config --libs` $(LIBGL)
++CFLAGS += `...@gar_destdir@@GAR_bindir@/sdl-config --cflags`
++LIBS += -lm `...@gar_destdir@@GAR_bindir@/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)
+@@ -273,10 +273,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
+
+@@ -320,9 +320,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 += `...@gar_destdir@@GAR_bindir@/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 += `...@gar_destdir@@GAR_bindir@/sdl-config --libs |
sed 's/-lSDLmain//'` -lpthread
+ endif
+
+ SDLMAIN = $(SDLOBJ)/SDLMain_tmpl.o
+@@ -336,8 +336,8 @@
+ ifeq ($(TARGETOS),os2)
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o
+
+-CFLAGS += `sdl-config --cflags`
+-LIBS += `sdl-config --libs`
++CFLAGS += `...@gar_destdir@@GAR_bindir@/sdl-config --cflags`
++LIBS += `...@gar_destdir@@GAR_bindir@/sdl-config --libs`
+
+ # to avoid name clash of '_brk'
+ $(OBJ)/emu/cpu/h6280/6280dasm.o : CDEFS += -D__STRICT_ANSI__
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
