Author: pebender
Date: Fri Apr 24 22:03:47 2009
New Revision: 4655
Added:
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.131-cross.patch
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.131-no_gtk.patch
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.131.patch.gar
Removed:
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
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.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 Fri Apr 24
22:03:47 2009
@@ -27,6 +27,7 @@
Added nvidia/nvidia-180.51.
Updated packages
+ Updated emulators/sdlmame.
Updated lib/ffmpeg.
Updated lib/libdvdnav.
Updated lib/libdvdread.
Modified: trunk/gar-minimyth/script/emulators/sdlmame/Makefile
==============================================================================
--- trunk/gar-minimyth/script/emulators/sdlmame/Makefile (original)
+++ trunk/gar-minimyth/script/emulators/sdlmame/Makefile Fri Apr 24
22:03:47 2009
@@ -1,5 +1,5 @@
GARNAME = sdlmame
-GARVERSION = 0.130
+GARVERSION = 0.131
CATEGORIES = emulators
DISTFILES = $(GARNAME)$(subst .,,$(GARVERSION)).zip
PATCHFILES = $(DISTNAME).patch.gar $(DISTNAME)-no_gtk.patch
Modified: trunk/gar-minimyth/script/emulators/sdlmame/checksums
==============================================================================
--- trunk/gar-minimyth/script/emulators/sdlmame/checksums (original)
+++ trunk/gar-minimyth/script/emulators/sdlmame/checksums Fri Apr 24
22:03:47 2009
@@ -1,4 +1,4 @@
-1195da0b6ae762eeebb21f500509d62d download/sdlmame0130.zip
-4a348479918fbdb3cb2ee4fc8219ce53 download/sdlmame-0.130-no_gtk.patch
-490c29a228090b7feb731fe51c95a967 download/sdlmame-0.130.patch.gar
-3aaa874d9886ad6b7861c121697445a4 download/sdlmame-0.130-cross.patch
+d4891999ec2ee11cb0d75a1596e17060 download/sdlmame0131.zip
+fa899aedbb3394192217cd83880ab190 download/sdlmame-0.131.patch.gar
+5fb62b9bd407717a48dba455a828e6af download/sdlmame-0.131-no_gtk.patch
+a0b6dd9ce04e85fd39e7028cd32dfcd2 download/sdlmame-0.131-cross.patch
Added:
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.131-cross.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.131-cross.patch
Fri Apr 24 22:03:47 2009
@@ -0,0 +1,40 @@
+diff -Naur sdlmame0131-old/makefile sdlmame0131-new/makefile
+--- sdlmame0131-old/makefile 2009-04-24 08:48:19.000000000 -0700
++++ sdlmame0131-new/makefile 2009-04-24 08:51:35.000000000 -0700
+@@ -579,12 +579,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 sdlmame0131-old/src/emu/cpu/cpu.mak
sdlmame0131-new/src/emu/cpu/cpu.mak
+--- sdlmame0131-old/src/emu/cpu/cpu.mak 2009-04-24 08:48:19.000000000
-0700
++++ sdlmame0131-new/src/emu/cpu/cpu.mak 2009-04-24 08:51:35.000000000
-0700
+@@ -933,7 +933,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)
+@@ -1391,7 +1391,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.131-no_gtk.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.131-no_gtk.patch
Fri Apr 24 22:03:47 2009
@@ -0,0 +1,34 @@
+diff -Naur sdlmame0131-old/src/osd/sdl/sdl.mak
sdlmame0131-new/src/osd/sdl/sdl.mak
+--- sdlmame0131-old/src/osd/sdl/sdl.mak 2009-04-24 08:47:50.000000000
-0700
++++ sdlmame0131-new/src/osd/sdl/sdl.mak 2009-04-24 08:51:02.000000000
-0700
+@@ -136,7 +136,7 @@
+ endif
+
+ ifeq ($(TARGETOS),unix)
+-DEFS += -DSDLMAME_UNIX
++DEFS += -DSDLMAME_UNIX -DNO_DEBUGGER
+ ifndef NO_X11
+ DEFS += -DSDLMAME_X11
+ else
+@@ -268,14 +268,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.131.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/emulators/sdlmame/files/sdlmame-0.131.patch.gar
Fri Apr 24 22:03:47 2009
@@ -0,0 +1,92 @@
+diff -Naur sdlmame0131-old/makefile sdlmame0131-new/makefile
+--- sdlmame0131-old/makefile 2009-03-28 20:50:02.000000000 -0700
++++ sdlmame0131-new/makefile 2009-04-24 08:47:50.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
+
+
+
+@@ -337,7 +337,7 @@
+ # and make all errors into warnings
+ ifneq ($(OPTIMIZE),0)
+ ifneq ($(TARGETOS),os2)
+-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
++CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
+ else
+ CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
+ endif
+diff -Naur sdlmame0131-old/src/osd/sdl/sdl.mak
sdlmame0131-new/src/osd/sdl/sdl.mak
+--- sdlmame0131-old/src/osd/sdl/sdl.mak 2009-04-21 09:22:16.000000000
-0700
++++ sdlmame0131-new/src/osd/sdl/sdl.mak 2009-04-24 08:47:50.000000000
-0700
+@@ -254,8 +254,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)
+@@ -278,10 +278,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
+
+@@ -325,9 +325,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
+@@ -341,8 +341,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
-~----------~----~----~----~------~----~------~--~---
