Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libsfml/files: libsfml-1.6-csfml-destdir.patch libsfml-1.6-deps-and-flags.patch libsfml-1.6-destdir.patch
Date: Sat, 05 Feb 2011 05:38:31
Message-Id: 20110205053821.0EF7B20054@flycatcher.gentoo.org
1 radhermit 11/02/05 05:38:21
2
3 Added: libsfml-1.6-csfml-destdir.patch
4 libsfml-1.6-deps-and-flags.patch
5 libsfml-1.6-destdir.patch
6 Log:
7 Initial import for bug #258895. Ebuild by me.
8
9 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch?rev=1.1&content-type=text/plain
16
17 Index: libsfml-1.6-csfml-destdir.patch
18 ===================================================================
19 --- SFML-1.6.orig/CSFML/src/SFML/Audio/Makefile
20 +++ SFML-1.6/CSFML/src/SFML/Audio/Makefile
21 @@ -20,4 +20,4 @@
22 @rm -rf $(LIBNAME)
23
24 install:
25 - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
26 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))
27 --- SFML-1.6.orig/CSFML/src/SFML/Graphics/Makefile
28 +++ SFML-1.6/CSFML/src/SFML/Graphics/Makefile
29 @@ -20,4 +20,4 @@
30 @rm -rf $(LIBNAME)
31
32 install:
33 - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
34 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))
35 --- SFML-1.6.orig/CSFML/src/SFML/Makefile
36 +++ SFML-1.6/CSFML/src/SFML/Makefile
37 @@ -1,15 +1,18 @@
38 export CC = gcc
39 export CPP = g++
40 -export CFLAGS = -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS -O2
41 -export LDFLAGS = -shared
42 +export CFLAGS += -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS
43 +export LDFLAGS += -shared
44 export LIBPATH = ../../../lib
45 export VERSION = 1.6
46 export CP = cp
47 export LN = ln
48 export LNFLAGS = -s -f
49 -export DESTDIR = /usr/local
50 -export DESTLIBDIR = $(DESTDIR)/lib
51 -export DESTINCDIR = $(DESTDIR)/include
52 +export DESTDIR =
53 +ifeq ($(origin prefix), undefined)
54 + export prefix = /usr/local
55 +endif
56 +export libdir = $(prefix)/lib
57 +export includedir = $(prefix)/include
58
59 all: csfml-system csfml-window csfml-network csfml-graphics csfml-audio
60
61 @@ -42,6 +45,6 @@
62 @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
63
64 install:
65 - @(mkdir -p $(DESTLIBDIR))
66 - @(mkdir -p $(DESTINCDIR))
67 - @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR))
68 + @(mkdir -p $(DESTDIR)/$(libdir))
69 + @(mkdir -p $(DESTDIR)/$(includedir))
70 + @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/$(includedir))
71 --- SFML-1.6.orig/CSFML/src/SFML/Network/Makefile
72 +++ SFML-1.6/CSFML/src/SFML/Network/Makefile
73 @@ -20,4 +20,4 @@
74 @rm -rf $(LIBNAME)
75
76 install:
77 - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
78 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))
79 --- SFML-1.6.orig/CSFML/src/SFML/System/Makefile
80 +++ SFML-1.6/CSFML/src/SFML/System/Makefile
81 @@ -20,4 +20,4 @@
82 @rm -rf $(LIBNAME)
83
84 install:
85 - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
86 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))
87 --- SFML-1.6.orig/CSFML/src/SFML/Window/Makefile
88 +++ SFML-1.6/CSFML/src/SFML/Window/Makefile
89 @@ -20,4 +20,4 @@
90 @rm -rf $(LIBNAME)
91
92 install:
93 - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
94 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))
95
96
97
98 1.1 media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch
99
100 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch?rev=1.1&view=markup
101 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch?rev=1.1&content-type=text/plain
102
103 Index: libsfml-1.6-deps-and-flags.patch
104 ===================================================================
105 --- SFML-1.6.orig/src/SFML/Audio/Makefile
106 +++ SFML-1.6/src/SFML/Audio/Makefile
107 @@ -25,7 +25,7 @@
108 $(CPP) -o $@ -c $< $(CFLAGS)
109
110 $(OBJVORBIS): %.o: %.c
111 - $(CC) -o $@ -c $< $(CFLAGSEXT)
112 + $(CC) -o $@ -c $< $(CFLAGS)
113
114 .PHONY: clean mrproper
115
116 --- SFML-1.6.orig/src/SFML/Graphics/GraphicsContext.hpp
117 +++ SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp
118 @@ -30,7 +30,7 @@
119 ////////////////////////////////////////////////////////////
120 #include <SFML/Config.hpp>
121 #include <SFML/System/NonCopyable.hpp>
122 -#include <SFML/Graphics/GLEW/glew.h>
123 +#include <GL/glew.h>
124 #include <iostream>
125 #include <string>
126
127 --- SFML-1.6.orig/src/SFML/Graphics/ImageLoader.cpp
128 +++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
129 @@ -28,10 +28,10 @@
130 #include <SFML/Graphics/ImageLoader.hpp>
131 extern "C"
132 {
133 - #include <SFML/Graphics/libjpeg/jpeglib.h>
134 - #include <SFML/Graphics/libjpeg/jerror.h>
135 + #include <jpeglib.h>
136 + #include <jerror.h>
137 }
138 -#include <SFML/Graphics/libpng/png.h>
139 +#include <png.h>
140 #include <SFML/Graphics/SOIL/SOIL.h>
141 #include <iostream>
142
143 --- SFML-1.6.orig/src/SFML/Graphics/Makefile
144 +++ SFML-1.6/src/SFML/Graphics/Makefile
145 @@ -1,15 +1,7 @@
146 SRC = $(wildcard *.cpp)
147 -SRCGLEW = $(wildcard ./GLEW/*.c)
148 -SRCJPEG = $(wildcard ./libjpeg/*.c)
149 -SRCPNG = $(wildcard ./libpng/*.c)
150 SRCSOIL = $(wildcard ./SOIL/*.c)
151 -SRCZLIB = $(wildcard ./zlib/*.c)
152 OBJ = $(SRC:.cpp=.o)
153 -OBJGLEW = $(SRCGLEW:.c=.o)
154 -OBJJPEG = $(SRCJPEG:.c=.o)
155 -OBJPNG = $(SRCPNG:.c=.o)
156 OBJSOIL = $(SRCSOIL:.c=.o)
157 -OBJZLIB = $(SRCZLIB:.c=.o)
158
159 ifeq ($(STATIC), yes)
160 LIB = libsfml-graphics-s.a
161 @@ -23,22 +15,22 @@
162
163 all: $(LIB)
164
165 -libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
166 - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
167 +libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)
168 + $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJSOIL)
169
170 -libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
171 - $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
172 +libsfml-graphics.so: $(OBJ) $(OBJSOIL)
173 + $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lGLEW -ljpeg -lpng -lz -lfreetype -lX11 -lGL
174
175 $(OBJ): %.o: %.cpp
176 $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
177
178 -$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
179 - $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
180 +$(OBJSOIL): %.o: %.c
181 + $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
182
183 .PHONY: clean mrproper
184
185 clean:
186 - @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
187 + @rm -rf $(OBJ) $(OBJSOIL)
188
189 mrproper: clean
190 @rm -rf $(LIBNAME)
191 --- SFML-1.6.orig/src/SFML/Makefile
192 +++ SFML-1.6/src/SFML/Makefile
193 @@ -4,7 +4,7 @@
194 ifeq ($(DEBUGBUILD), yes)
195 DEBUGFLAGS = -g -DDEBUG
196 else
197 - DEBUGFLAGS = -O2 -DNDEBUG
198 + DEBUGFLAGS = -DNDEBUG
199 endif
200
201 ifeq ($(STATIC), no)
202 @@ -17,9 +17,8 @@
203
204 export CC = gcc
205 export CPP = g++
206 -export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
207 -export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
208 -export LDFLAGS = $(LINKFLAGS)
209 +export CFLAGS += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
210 +export LDFLAGS += $(LINKFLAGS)
211 export LIBPATH = ../../../lib
212 export VERSION = 1.6
213 export CP = cp
214
215
216
217 1.1 media-libs/libsfml/files/libsfml-1.6-destdir.patch
218
219 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsfml/files/libsfml-1.6-destdir.patch?rev=1.1&view=markup
220 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsfml/files/libsfml-1.6-destdir.patch?rev=1.1&content-type=text/plain
221
222 Index: libsfml-1.6-destdir.patch
223 ===================================================================
224 --- SFML-1.6.orig/src/SFML/Audio/Makefile
225 +++ SFML-1.6/src/SFML/Audio/Makefile
226 @@ -10,7 +10,7 @@
227 else
228 LIB = libsfml-audio.so
229 LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
230 - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
231 + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
232 endif
233
234 all: $(LIB)
235 @@ -36,4 +36,4 @@
236 @rm -rf $(LIBNAME)
237
238 install:
239 - @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
240 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
241 --- SFML-1.6.orig/src/SFML/Graphics/Makefile
242 +++ SFML-1.6/src/SFML/Graphics/Makefile
243 @@ -18,7 +18,7 @@
244 else
245 LIB = libsfml-graphics.so
246 LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
247 - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
248 + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
249 endif
250
251 all: $(LIB)
252 @@ -44,4 +44,4 @@
253 @rm -rf $(LIBNAME)
254
255 install:
256 - @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
257 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
258 --- SFML-1.6.orig/src/SFML/Makefile
259 +++ SFML-1.6/src/SFML/Makefile
260 @@ -28,8 +28,11 @@
261 export AR = ar
262 export ARFLAGS = rcs
263 -export DESTDIR = /usr/local
264 -export DESTLIBDIR = $(DESTDIR)/lib
265 -export DESTINCDIR = $(DESTDIR)/include
266 +export DESTDIR =
267 +ifeq ($(origin prefix), undefined)
268 + export prefix = /usr/local
269 +endif
270 +export libdir = $(prefix)/lib
271 +export includedir = $(prefix)/include
272
273 all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
274
275 @@ -62,6 +66,6 @@
276 @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
277
278 install:
279 - @(mkdir -p $(DESTLIBDIR))
280 - @(mkdir -p $(DESTINCDIR))
281 - @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR)/)
282 + @(mkdir -p $(DESTDIR)/$(libdir))
283 + @(mkdir -p $(DESTDIR)/$(includedir))
284 + @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/$(includedir)/)
285 --- SFML-1.6.orig/src/SFML/Network/Makefile
286 +++ SFML-1.6/src/SFML/Network/Makefile
287 @@ -8,7 +8,7 @@
288 else
289 LIB = libsfml-network.so
290 LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
291 - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
292 + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
293 endif
294
295 all: $(LIB)
296 @@ -31,4 +31,4 @@
297 @rm -rf $(LIBNAME)
298
299 install:
300 - @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
301 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
302 --- SFML-1.6.orig/src/SFML/System/Makefile
303 +++ SFML-1.6/src/SFML/System/Makefile
304 @@ -8,7 +8,7 @@
305 else
306 LIB = libsfml-system.so
307 LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
308 - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
309 + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
310 endif
311
312 all: $(LIB)
313 @@ -31,4 +31,4 @@
314 @rm -rf $(LIBNAME)
315
316 install:
317 - @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
318 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
319 --- SFML-1.6.orig/src/SFML/Window/Makefile
320 +++ SFML-1.6/src/SFML/Window/Makefile
321 @@ -9,7 +9,7 @@
322 else
323 LIB = libsfml-window.so
324 LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
325 - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
326 + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
327 endif
328
329 all: $(LIB)
330 @@ -32,4 +32,4 @@
331 @rm -rf $(LIBNAME)
332
333 install:
334 - @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
335 + @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))