diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-09-11 06:10:42 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-09-11 06:10:42 +0000 |
| commit | 741c13b9dc0bff905879a550590deb45c49344b0 (patch) | |
| tree | faf94688d64b563910cfd981d69a17731b11a5d6 /games-emulation/sdlmame/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-741c13b9dc0bff905879a550590deb45c49344b0.tar.gz gentoo-2-741c13b9dc0bff905879a550590deb45c49344b0.tar.bz2 gentoo-2-741c13b9dc0bff905879a550590deb45c49344b0.zip | |
version bump (bug #382529)
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'games-emulation/sdlmame/files')
| -rw-r--r-- | games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch | 67 | ||||
| -rw-r--r-- | games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch | 11 |
2 files changed, 78 insertions, 0 deletions
diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch new file mode 100644 index 000000000000..444c5e9688b2 --- /dev/null +++ b/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch @@ -0,0 +1,67 @@ +--- work.orig/makefile ++++ work/makefile +@@ -431,9 +431,6 @@ + CPPONLYFLAGS += -x c++ -std=gnu++98 + COBJFLAGS += -x objective-c++ + +-# this speeds it up a bit by piping between the preprocessor/compiler/assembler +-CCOMFLAGS += -pipe +- + # add -g if we need symbols, and ensure we have frame pointers + ifdef SYMBOLS + CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer +@@ -449,23 +446,6 @@ + CCOMFLAGS += -pg + endif + +-# add the optimization flag +-CCOMFLAGS += -O$(OPTIMIZE) +- +-# if we are optimizing, include optimization options +-# and make all errors into warnings +-ifneq ($(OPTIMIZE),0) +-ifneq ($(TARGETOS),os2) +-ifndef NOWERROR +-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) +-else +-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) +-endif +-else +-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) +-endif +-endif +- + # add a basic set of warnings + CCOMFLAGS += \ + -Wall \ +@@ -524,16 +504,6 @@ + # linking flags + #------------------------------------------------- + +-# LDFLAGS are used generally; LDFLAGSEMULATOR are additional +-# flags only used when linking the core emulator +-LDFLAGS = +-ifneq ($(TARGETOS),macosx) +-ifneq ($(TARGETOS),os2) +-ifneq ($(TARGETOS),solaris) +-LDFLAGS = -Wl,--warn-common +-endif +-endif +-endif + LDFLAGSEMULATOR = + + # add profiling information for the linker +@@ -541,13 +511,6 @@ + LDFLAGS += -pg + endif + +-# strip symbols and other metadata in non-symbols and non profiling builds +-ifndef SYMBOLS +-ifneq ($(TARGETOS),macosx) +-LDFLAGS += -s +-endif +-endif +- + # output a map file (emulator only) + ifdef MAP + LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch new file mode 100644 index 000000000000..87eeae5b50c7 --- /dev/null +++ b/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch @@ -0,0 +1,11 @@ +--- ./src/osd/sdl/osdsdl.h.orig ++++ ./src/osd/sdl/osdsdl.h +@@ -225,6 +225,8 @@ + const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } + #if USE_OPENGL + const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } ++#else ++ const char *gl_lib() const { return NULL; } + #endif + + private: |