Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/sdlmame/files: sdlmame-0.143_p4-makefile.patch sdlmame-0.143_p4-no-opengl.patch
Date: Sun, 04 Sep 2011 02:41:06
Message-Id: 20110904024054.59C0320054@flycatcher.gentoo.org
1 mr_bones_ 11/09/04 02:40:54
2
3 Added: sdlmame-0.143_p4-makefile.patch
4 sdlmame-0.143_p4-no-opengl.patch
5 Log:
6 version bump
7
8 (Portage version: 2.1.10.11/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch?rev=1.1&content-type=text/plain
15
16 Index: sdlmame-0.143_p4-makefile.patch
17 ===================================================================
18 --- work.orig/makefile
19 +++ work/makefile
20 @@ -431,9 +431,6 @@
21 CPPONLYFLAGS += -x c++ -std=gnu++98
22 COBJFLAGS += -x objective-c++
23
24 -# this speeds it up a bit by piping between the preprocessor/compiler/assembler
25 -CCOMFLAGS += -pipe
26 -
27 # add -g if we need symbols, and ensure we have frame pointers
28 ifdef SYMBOLS
29 CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
30 @@ -449,23 +446,6 @@
31 CCOMFLAGS += -pg
32 endif
33
34 -# add the optimization flag
35 -CCOMFLAGS += -O$(OPTIMIZE)
36 -
37 -# if we are optimizing, include optimization options
38 -# and make all errors into warnings
39 -ifneq ($(OPTIMIZE),0)
40 -ifneq ($(TARGETOS),os2)
41 -ifndef NOWERROR
42 -CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
43 -else
44 -CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
45 -endif
46 -else
47 -CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
48 -endif
49 -endif
50 -
51 # add a basic set of warnings
52 CCOMFLAGS += \
53 -Wall \
54 @@ -524,16 +504,6 @@
55 # linking flags
56 #-------------------------------------------------
57
58 -# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
59 -# flags only used when linking the core emulator
60 -LDFLAGS =
61 -ifneq ($(TARGETOS),macosx)
62 -ifneq ($(TARGETOS),os2)
63 -ifneq ($(TARGETOS),solaris)
64 -LDFLAGS = -Wl,--warn-common
65 -endif
66 -endif
67 -endif
68 LDFLAGSEMULATOR =
69
70 # add profiling information for the linker
71 @@ -541,13 +511,6 @@
72 LDFLAGS += -pg
73 endif
74
75 -# strip symbols and other metadata in non-symbols and non profiling builds
76 -ifndef SYMBOLS
77 -ifneq ($(TARGETOS),macosx)
78 -LDFLAGS += -s
79 -endif
80 -endif
81 -
82 # output a map file (emulator only)
83 ifdef MAP
84 LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
85
86
87
88 1.1 games-emulation/sdlmame/files/sdlmame-0.143_p4-no-opengl.patch
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/files/sdlmame-0.143_p4-no-opengl.patch?rev=1.1&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/files/sdlmame-0.143_p4-no-opengl.patch?rev=1.1&content-type=text/plain
92
93 Index: sdlmame-0.143_p4-no-opengl.patch
94 ===================================================================
95 --- ./src/osd/sdl/osdsdl.h.orig
96 +++ ./src/osd/sdl/osdsdl.h
97 @@ -225,6 +225,8 @@
98 const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
99 #if USE_OPENGL
100 const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
101 +#else
102 + const char *gl_lib() const { return NULL; }
103 #endif
104
105 private: