Import upstream version 030809dfsg+git20181028.1.9e2c047
Debian Janitor
2 years ago
0 | libsdl-sge (030809dfsg-9) unstable; urgency=medium | |
1 | ||
2 | [ Helmut Grohne ] | |
3 | * Fix FTCBFS: (Closes: #912141) | |
4 | + Let dh_auto_build pass cross tools to make. | |
5 | + cross.patch: Make pkg-config substitutable. | |
6 | + cross.patch: Fix makefile dependencies to avoid excessive | |
7 | rebuilds during make install. | |
8 | ||
9 | [ Manuel A. Fernandez Montecelo ] | |
10 | * Apply and upload fix from Helmut Grohne | |
11 | ||
12 | -- Manuel A. Fernandez Montecelo <mafm@debian.org> Sun, 28 Oct 2018 23:20:06 +0100 | |
13 | ||
14 | libsdl-sge (030809dfsg-8) unstable; urgency=medium | |
15 | ||
16 | * Bump Policy Standars-Version to 4.2.1 (no changes needed) | |
17 | * d/control: | |
18 | - Drop unnecessary "Testsuite: autopkgtest" | |
19 | - Update Vcs-* URLs | |
20 | * Switch to debhelper compat level v11 | |
21 | * Set "Rules-Requires-Root: no" in d/control | |
22 | * d/copyright: use https in format URL | |
23 | * d/watch: Switch to version=4 | |
24 | * d/patches: | |
25 | - add fix-ftbfs-892448.patch: use pkg-config instead of freetype-config, | |
26 | deprecated and about to be removed (Closes: #892448) | |
27 | * Add Build-Depends on pkg-config | |
28 | ||
29 | -- Manuel A. Fernandez Montecelo <mafm@debian.org> Fri, 19 Oct 2018 22:26:15 +0200 | |
30 | ||
31 | libsdl-sge (030809dfsg-7) unstable; urgency=medium | |
32 | ||
33 | * Fix autopkgtest by adding "Restrictions: allow-stderr" | |
34 | * d/control: Update Vcs-* URLs | |
35 | * Bump Policy Standars-Version to 3.9.8 (no changes needed) | |
36 | * Switch to debhelper compat level v10 | |
37 | - Upgrade dependency on debhelper versions | |
38 | - Remove "--parallel" in d/rules | |
39 | ||
40 | -- Manuel A. Fernandez Montecelo <mafm@debian.org> Mon, 19 Jun 2017 23:44:59 +0200 | |
41 | ||
42 | libsdl-sge (030809dfsg-6) unstable; urgency=medium | |
43 | ||
44 | * Upload to rebuild against GCC-5 >= 5.2 in all arches for the | |
45 | GCC-5/C++11 ABI change transition (that version was not the default on | |
46 | all arches at the time) | |
47 | * Update URL in Vcs-Browser | |
48 | * Add tests for autopkgtest | |
49 | ||
50 | -- Manuel A. Fernandez Montecelo <mafm@debian.org> Mon, 24 Aug 2015 16:32:35 +0100 | |
51 | ||
52 | libsdl-sge (030809dfsg-5) unstable; urgency=medium | |
53 | ||
54 | * Bump Policy Standars-Version to 3.9.6 (no changes needed) | |
55 | * Rebuild against GCC-5 (Closes: #791165) | |
56 | * Enable parallel compilation with dh | |
57 | * Fix mispelling in d/copyright (detected by lintian) | |
58 | ||
59 | -- Manuel A. Fernandez Montecelo <mafm@debian.org> Sat, 01 Aug 2015 10:41:47 +0100 | |
60 | ||
61 | libsdl-sge (030809dfsg-4) unstable; urgency=low | |
62 | ||
63 | * debian/rules: | |
64 | - Override dh_compress to not compress files under examples/ (they are tiny | |
65 | and cause issues with Multi-arch) (Closes: #720028) | |
66 | - Enable more parts of build hardening by passing default LDFLAGS as well as | |
67 | CFLAGS (the basic build system did not account for this). Also had to | |
68 | modify patch 001_makefile_fixes.diff in the process. | |
69 | * debian/control: | |
70 | - Bump Policy Standars-Version to 3.9.4 (no changes needed) | |
71 | - Change maintainer address to @debian.org | |
72 | - Remove obsolete "DM-Upload-Allowed: yes" | |
73 | - Remove now unneeded Build-Depends on "dpkg-dev (>= 1.16.1~)" | |
74 | ||
75 | -- Manuel A. Fernandez Montecelo <mafm@debian.org> Sat, 17 Aug 2013 23:43:32 +0100 | |
76 | ||
77 | libsdl-sge (030809dfsg-3) unstable; urgency=low | |
78 | ||
79 | * Complete overhaul of the package: | |
80 | - debian/source/format to '3.0 (quilt)' | |
81 | - Extensive modifications for debhelper compat v9, including Multi-Arch, | |
82 | build-hardening and all goodies | |
83 | - Bump Policy Standars-Version to 3.9.3 | |
84 | - debian/copyright rewritten with appropriate standard format | |
85 | - Revisit all patches | |
86 | - Remove all previous maintainers, inactive/unresponsive for years | |
87 | - Add lintian override for SONAME/package name mismatch | |
88 | - watch: updated to take dfsg suffix into account | |
89 | ||
90 | -- Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> Sun, 13 May 2012 14:34:48 +0200 | |
91 | ||
92 | libsdl-sge (030809dfsg-2) unstable; urgency=low | |
93 | ||
94 | * debian/patches/100_font.diff: | |
95 | + use ttf-dejavu-core instead of ttf-bitstream-vera. | |
96 | * debian/control: | |
97 | + Suggest ttf-dejavu-core instead of ttf-bitstream-vera (Closes: #461268). | |
98 | + bumped Standards-Version to 3.7.3 (no changes). | |
99 | * debian/copyright: | |
100 | + Recode into UTF-8. | |
101 | * debian/rules: | |
102 | + don't ignore make clean error. | |
103 | ||
104 | -- Aurelien Jarno <aurel32@debian.org> Thu, 24 Jan 2008 00:15:46 +0100 | |
105 | ||
106 | libsdl-sge (030809dfsg-1) unstable; urgency=high | |
107 | ||
108 | * Remove non-free font from the original tarball (Closes: #393747). | |
109 | ||
110 | * debian/control: | |
111 | + Suggest ttf-bitstream-vera as a replacement for the font. | |
112 | * debian/patches/100_font.diff: | |
113 | + New patch to use ttf-bitstream-vera instead of the old non-free font. | |
114 | ||
115 | -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Mon, 23 Oct 2006 16:33:23 +0200 | |
116 | ||
117 | libsdl-sge (030809-3) unstable; urgency=low | |
118 | ||
119 | * 006_freetype2_fixes.diff: | |
120 | + Fix from freetype2 upstream that removes usage of internal structures | |
121 | (Closes: #370685). | |
122 | ||
123 | -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Tue, 13 Jun 2006 22:51:55 +0200 | |
124 | ||
125 | libsdl-sge (030809-2) unstable; urgency=low | |
126 | ||
127 | [ Aurelien Jarno ] | |
128 | ||
129 | * debian/patches/015_overflow.diff: fix and overflow in sge_collision.cpp. | |
130 | * debian/control: bumped Standards-Version to 3.7.2 (no changes). | |
131 | ||
132 | -- Aurelien Jarno <aurel32@debian.org> Sat, 13 May 2006 23:01:51 +0200 | |
133 | ||
134 | libsdl-sge (030809-1) unstable; urgency=low | |
135 | ||
136 | [ Sam Hocevar ] | |
137 | ||
138 | * Included changes from an NMU prepared by Nathanael Nerode. Thanks. | |
139 | * Moved development to the pkg-sdl Alioth project. | |
140 | ||
141 | * debian/rules: | |
142 | + Use quilt for patch management. | |
143 | + This version adds new symbols to the lib. Use dh_makeshlibs -V '...'. | |
144 | + Do not compress examples. | |
145 | * debian/control: | |
146 | + Build-depend on quilt. | |
147 | + Set the SDL team as the maintainer and added its members to the | |
148 | uploaders field. | |
149 | + Build-depend on debhelper (>= 4.0). | |
150 | * debian/compat: | |
151 | + Set compatibility level to 4. | |
152 | * debian/copyright: | |
153 | + Updated the FSF address. | |
154 | ||
155 | * debian/patches/001_makefile_fixes.diff: | |
156 | * debian/patches/005_freetype_support.diff: | |
157 | + Moved old diff to the quilt patch system. | |
158 | ||
159 | * debian/patches/004_legacy_functions.diff: | |
160 | + Added empty legacy functions to maintain backwards binary compatibility | |
161 | with C programs. These functions were not supposed to be used. | |
162 | ||
163 | * debian/patches/010_examples.diff: | |
164 | + Fixed the examples makefile so that they can also be compiled outside | |
165 | the SGE build tree (Closes: #318973). | |
166 | ||
167 | [ Nathanael Nerode ] | |
168 | ||
169 | * New upstream release (Closes: #336497). The new upstream doesn't change | |
170 | very much, but it does integrate a lot of the Debian diffs, and it is | |
171 | over two years old already. | |
172 | * We export the C++ interface for the first time, since it is no longer | |
173 | incompatible with exporting the C interface. Because we *previously* | |
174 | exported only the C interface, we don't need to change library names etc. | |
175 | * Rebuild with new toolchain (Closes: #332833) | |
176 | * Added watch file. | |
177 | * Standards-Version 3.6.2.0 (no changes necessary). | |
178 | ||
179 | -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Fri, 3 Mar 2006 17:41:16 +0100 | |
180 | ||
181 | libsdl-sge (020904-5) unstable; urgency=low | |
182 | ||
183 | * Makefile: | |
184 | + #define _SGE_C in sge_config.h if C_ONLY is defined (Closes: #230954). | |
185 | * debian/control: | |
186 | + libsdl-sge-dev now only depends on libsdl-sge (>= 020904-4). | |
187 | + Set the source section to "devel". | |
188 | ||
189 | -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Mon, 16 Feb 2004 10:33:16 +0100 | |
190 | ||
191 | libsdl-sge (020904-4) unstable; urgency=low | |
192 | ||
193 | * sge_tt_text.cpp: | |
194 | + Use freetype macros to include freetype headers (Closes: #230591). | |
195 | * debian/control: | |
196 | + Set libfreetype6-dev build dependency to (>= 2.0.1.20010317-1). | |
197 | ||
198 | -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sun, 1 Feb 2004 15:13:37 +0100 | |
199 | ||
200 | libsdl-sge (020904-3) unstable; urgency=low | |
201 | ||
202 | * New maintainer (Closes: #215097). | |
203 | * debian/rules: | |
204 | + Use debian/compat instead of DH_COMPAT. | |
205 | + Install examples and documentation with the -dev package. | |
206 | + Don't build the static library with -fPIC. | |
207 | + Fixed DEB_BUILD_OPTIONS handling. | |
208 | * debian/control: | |
209 | + Enhanced long descriptions. | |
210 | ||
211 | -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sun, 1 Jun 2003 13:46:28 +0200 | |
212 | ||
213 | libsdl-sge (020904-2) unstable; urgency=low | |
214 | ||
215 | * Acknowledging NMU, thanks to Sam. | |
216 | This closes #190293, #190294, #190290 | |
217 | * Set policy to 3.6.1.0 | |
218 | ||
219 | -- Julien Danjou <acid@debian.org> Wed, 20 Aug 2003 13:15:36 +0200 | |
220 | ||
221 | libsdl-sge (020904-1.1) unstable; urgency=low | |
222 | ||
223 | * NMU. | |
224 | * Set the library's soname to libSGE.so.0 (Closes: #190293). Upstream | |
225 | agreed to do a release with this soname. | |
226 | * Rebuilt with gcc-3.x (Closes: #190290). | |
227 | * Moved the .so symlink to the -dev package (Closes: #190294). | |
228 | * Various minor packaging changes: | |
229 | + Set policy to 3.5.10. | |
230 | + Replaced "Author(s):" with "Author:" in the copyright file. | |
231 | + Set the -dev package's section to libdevel. | |
232 | + Made /usr/share/doc/libsdl-sge-dev a symlink to libsdl-sge. | |
233 | + Updated the package descriptions. | |
234 | * Added libsdl1.2-dev, libsdl-image1.2-dev, libfreetype6-dev to the -dev | |
235 | package's dependencies. | |
236 | ||
237 | -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sun, 1 Jun 2003 13:46:28 +0200 | |
238 | ||
239 | libsdl-sge (020904-1) unstable; urgency=low | |
240 | ||
241 | * New upstream version (Closes: #162805) | |
242 | ||
243 | -- Julien Danjou <acid@debian.org> Sat, 19 Oct 2002 17:43:59 +0200 | |
244 | ||
245 | libsdl-sge (020104-3) unstable; urgency=low | |
246 | ||
247 | * Add -fPIC for compilation on hppa/ia64 | |
248 | ||
249 | -- Julien Danjou <acid@debian.org> Mon, 2 Sep 2002 19:30:50 +0200 | |
250 | ||
251 | libsdl-sge (020104-2) unstable; urgency=low | |
252 | ||
253 | * Makefile: no -fpic | |
254 | * Typo in description | |
255 | * Now include static lib | |
256 | ||
257 | -- Julien Danjou <acid@debian.org> Wed, 28 Aug 2002 14:40:31 +0200 | |
258 | ||
259 | libsdl-sge (020104-1) unstable; urgency=low | |
260 | ||
261 | * Initial Release. (Closes: #157400) | |
262 | ||
263 | -- Julien Danjou <acid@debian.org> Tue, 20 Aug 2002 21:08:44 +0200 |
0 | 11 |
0 | Source: libsdl-sge | |
1 | Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers@lists.alioth.debian.org> | |
2 | Uploaders: Manuel A. Fernandez Montecelo <mafm@debian.org> | |
3 | Section: libs | |
4 | Priority: optional | |
5 | Rules-Requires-Root: no | |
6 | Build-Depends: debhelper (>= 11~), | |
7 | libfreetype6-dev (>= 2.4.2), | |
8 | libsdl1.2-dev (>= 1.2.14~), | |
9 | libsdl-image1.2-dev (>= 1.2.12~), | |
10 | pkg-config, | |
11 | Standards-Version: 4.2.1 | |
12 | Vcs-Browser: https://salsa.debian.org/sdl-team/libsdl-sge | |
13 | Vcs-Git: https://salsa.debian.org/sdl-team/libsdl-sge.git | |
14 | Homepage: http://www.digitalfanatics.org/cal/sge/ | |
15 | ||
16 | Package: libsdl-sge | |
17 | Architecture: any | |
18 | Multi-Arch: same | |
19 | Depends: ${shlibs:Depends}, | |
20 | ${misc:Depends} | |
21 | Pre-Depends: ${misc:Pre-Depends} | |
22 | Description: extension of graphic functions for SDL multimedia libraries | |
23 | SGE is a layer over the SDL multimedia library which provides common graphics | |
24 | operations such as clipping, block copies, drawing of lines, circles and | |
25 | primitives, rotation and scaling of surfaces, pixel operations, palette | |
26 | functions and many more. | |
27 | . | |
28 | This package contains the runtime library. | |
29 | ||
30 | Package: libsdl-sge-dev | |
31 | Architecture: any | |
32 | Multi-Arch: same | |
33 | Section: libdevel | |
34 | Depends: ${misc:Depends}, | |
35 | libsdl-sge (= ${binary:Version}), | |
36 | libsdl1.2-dev (>= 1.2.14~) | |
37 | Suggests: ttf-dejavu-core | |
38 | Description: extension of graphic functions for the SDL multimedia, development files | |
39 | SGE is a layer over the SDL multimedia library which provides common graphics | |
40 | operations such as clipping, block copies, drawing of lines, circles and | |
41 | primitives, rotation and scaling of surfaces, pixel operations, palette | |
42 | functions and many more. | |
43 | . | |
44 | This package contains the header files and static library needed to | |
45 | compile applications that use libsdl-sge. |
0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
1 | Upstream-Name: SGE - SDL Graphics Extension | |
2 | Upstream-Contact: Anders Lindström <cal@swipnet.se> | |
3 | Source: http://www.digitalfanatics.org/cal/sge/ | |
4 | ||
5 | Files: * | |
6 | Copyright: 1999-2003, Anders Lindström <cal@swipnet.se> | |
7 | License: LGPL-2.1+ | |
8 | ||
9 | Files: sge_blib.* | |
10 | Copyright: 2000-2003, Anders Lindström <cal@swipnet.se> & Johan E. Thelin | |
11 | License: LGPL-2.1+ | |
12 | ||
13 | Files: debian/* | |
14 | Copyright: 2012, Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | |
15 | License: LGPL-2.1+ | |
16 | ||
17 | License: LGPL-2.1+ | |
18 | This program is free software; you can redistribute it and/or modify it under | |
19 | the terms of the GNU Lesser General Public License as published by the Free | |
20 | Software Foundation; either version 2.1 of the License, or (at your option) any | |
21 | later version. | |
22 | . | |
23 | On Debian systems, the complete text of version 2.1 of the GNU Lesser General | |
24 | Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. |
0 | usr/lib/*/libSGE.so | |
1 | usr/include | |
2 | examples/* usr/share/doc/libsdl-sge-dev/examples | |
3 | docs/*.html usr/share/doc/libsdl-sge-dev/html |
0 | usr/lib/*/libSGE*.so.*⏎ |
0 | libsdl-sge: package-name-doesnt-match-sonames libSGE0 |
0 | --- a/Makefile | |
1 | +++ b/Makefile | |
2 | @@ -4,6 +4,7 @@ | |
3 | ||
4 | CFLAGS += $(SGE_CFLAGS) -fPIC $(FT_CFLAGS) | |
5 | LIBS =$(SGE_LIBS) | |
6 | +LDFLAGS += $(CUSTOM_LDFLAGS) | |
7 | ||
8 | SGE_VER = 030809 | |
9 | API_VER = 0 | |
10 | @@ -11,13 +12,13 @@ | |
11 | OBJECTS=sge_surface.o sge_primitives.o sge_tt_text.o sge_bm_text.o sge_misc.o sge_textpp.o sge_blib.o sge_rotation.o sge_collision.o sge_shape.o | |
12 | ||
13 | all: config $(OBJECTS) | |
14 | - @ar rsc libSGE.a $(OBJECTS) | |
15 | + ar rsc libSGE.a $(OBJECTS) | |
16 | ||
17 | $(OBJECTS): %.o:%.cpp %.h #Each object depends on thier .cpp and .h file | |
18 | $(CXX) $(CFLAGS) -c $< | |
19 | ||
20 | shared: all | |
21 | - $(CXX) $(CFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS) | |
22 | + $(CXX) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS) | |
23 | ||
24 | shared-strip: shared | |
25 | @strip libSGE.so | |
26 | @@ -31,7 +32,7 @@ | |
27 | @strip SGE.dll | |
28 | ||
29 | clean: | |
30 | - @rm -f *.o *.so *.a *.dll *.def | |
31 | + rm -f *.o *.so *.so.* *.a *.dll *.def | |
32 | ||
33 | config: | |
34 | @echo "/* SGE Config header (generated automatically) */" >sge_config.h | |
35 | --- a/Makefile.conf | |
36 | +++ b/Makefile.conf | |
37 | @@ -4,7 +4,7 @@ | |
38 | # (See README for more info) | |
39 | C_COMP = y | |
40 | #USE_FT = n | |
41 | -#USE_IMG = n | |
42 | +USE_IMG = y | |
43 | #QUIET = y | |
44 | ||
45 | ||
46 | @@ -25,7 +25,7 @@ | |
47 | PREFIX_H =$(shell sdl-config --prefix)/include/SDL | |
48 | ||
49 | # Flags passed to the compiler | |
50 | -CFLAGS =-Wall -O3 -ffast-math | |
51 | +CFLAGS =-Wall -ffast-math $(CUSTOM_CFLAGS) | |
52 | SGE_CFLAGS =$(shell sdl-config --cflags) | |
53 | # Uncomment to make some more optimizations | |
54 | #CFLAGS =-Wall -O9 -ffast-math -march=i686 |
0 | --- a/sge_tt_text.cpp | |
1 | +++ b/sge_tt_text.cpp | |
2 | @@ -1454,3 +1454,16 @@ | |
3 | } | |
4 | ||
5 | #endif /* _SGE_NOTTF */ | |
6 | + | |
7 | +/**********************************************************************************/ | |
8 | +/** Legacy functions for backwards compatibility **/ | |
9 | +/**********************************************************************************/ | |
10 | + | |
11 | +void insert_char(Uint16 *string, Uint16 ch, int pos, int max) { ; } | |
12 | +void delete_char(Uint16 *string, int pos, int max) { ; } | |
13 | + | |
14 | +SDL_Rect fast_update(SDL_Surface *Surface,SDL_Surface *buffer,SDL_Rect ret, int type,sge_TTFont *font,Uint16 *string, Sint16 x,Sint16 y, Uint32 fcol, Uint32 bcol,int Alpha) { return ret; } | |
15 | +SDL_Rect nice_update(SDL_Surface *Surface,SDL_Surface *buffer,SDL_Rect ret, int type,sge_TTFont *font,Uint16 *string, Sint16 x,Sint16 y, Uint32 fcol, Uint32 bcol, int Alpha) { return ret; } | |
16 | + | |
17 | +int keyrepeat(SDL_Event *event, int wait) { return 0; } | |
18 | + | |
19 | --- a/sge_tt_text.h | |
20 | +++ b/sge_tt_text.h | |
21 | @@ -93,9 +93,16 @@ | |
22 | ||
23 | DECLSPEC SDL_Surface *sge_TTF_Render(sge_TTFont *font,const Uint16 *text, SDL_Color fg, SDL_Color bg, int alpha_level); | |
24 | DECLSPEC SDL_Surface *sge_TTF_RenderUNICODE(sge_TTFont *font,const Uint16 *text, SDL_Color fg, SDL_Color bg); | |
25 | +/* Legacy functions */ | |
26 | +DECLSPEC SDL_Rect fast_update(SDL_Surface *Surface,SDL_Surface *buffer,SDL_Rect ret, int type,sge_TTFont *font,Uint16 *string, Sint16 x,Sint16 y, Uint32 fcol, Uint32 bcol,int Alpha); | |
27 | +DECLSPEC SDL_Rect nice_update(SDL_Surface *Surface,SDL_Surface *buffer,SDL_Rect ret, int type,sge_TTFont *font,Uint16 *string, Sint16 x,Sint16 y, Uint32 fcol, Uint32 bcol, int Alpha); | |
28 | #endif /* _SGE_NOTTF */ | |
29 | ||
30 | DECLSPEC Uint16 *sge_Latin1_Uni(const char *text); | |
31 | +/* Legacy functions */ | |
32 | +DECLSPEC int keyrepeat(SDL_Event *event, int wait); | |
33 | +DECLSPEC void insert_char(Uint16 *string, Uint16 ch, int pos, int max); | |
34 | +DECLSPEC void delete_char(Uint16 *string, int pos, int max); | |
35 | #ifdef _SGE_C | |
36 | } | |
37 | #endif |
0 | --- a/sge_tt_text.cpp | |
1 | +++ b/sge_tt_text.cpp | |
2 | @@ -36,10 +36,11 @@ | |
3 | #include "sge_textpp.h" | |
4 | ||
5 | #ifndef _SGE_NOTTF | |
6 | -#include <freetype/freetype.h> | |
7 | -#include <freetype/ftoutln.h> | |
8 | -#include <freetype/ttnameid.h> | |
9 | -#include <freetype/internal/ftobjs.h> | |
10 | +#include <ft2build.h> | |
11 | +#include FT_FREETYPE_H | |
12 | +#include FT_OUTLINE_H | |
13 | +#include FT_TRUETYPE_IDS_H | |
14 | +#include FT_INTERNAL_OBJECTS_H | |
15 | ||
16 | /* The structure used to hold glyph information (cached) */ | |
17 | struct glyph { |
0 | --- a/sge_tt_text.cpp | |
1 | +++ b/sge_tt_text.cpp | |
2 | @@ -40,7 +40,6 @@ | |
3 | #include FT_FREETYPE_H | |
4 | #include FT_OUTLINE_H | |
5 | #include FT_TRUETYPE_IDS_H | |
6 | -#include FT_INTERNAL_OBJECTS_H | |
7 | ||
8 | /* The structure used to hold glyph information (cached) */ | |
9 | struct glyph { | |
10 | @@ -295,7 +294,7 @@ | |
11 | } | |
12 | memset(stream, 0, sizeof(*stream)); | |
13 | ||
14 | - stream->memory = _sge_library->memory; | |
15 | + stream->memory = NULL; | |
16 | stream->read = RWread; | |
17 | stream->descriptor.pointer = src; | |
18 | stream->pos = (unsigned long)position; |
0 | --- a/examples/Makefile | |
1 | +++ b/examples/Makefile | |
2 | @@ -1,24 +1,10 @@ | |
3 | # Makefile for the SGE library examples | |
4 | ||
5 | -include ../Makefile.conf | |
6 | - | |
7 | -CFLAGS += $(SGE_CFLAGS) -I./../ | |
8 | -LIBS =-L./../ -lSGE $(SGE_LIBS) | |
9 | - | |
10 | -TARGETS = fire bitmapfont collision blib rotate speedtest sprite sprite2 poly | |
11 | -C_TARGETS = | |
12 | - | |
13 | -ifneq ($(USE_FT),n) | |
14 | - TARGETS += basics blitting input alpha inputdeluxe | |
15 | - ifeq ($(C_COMP),y) | |
16 | - C_TARGETS = basics_c | |
17 | - endif | |
18 | -endif | |
19 | - | |
20 | -ifeq ($(USE_IMG),y) | |
21 | - TARGETS += sfont | |
22 | -endif | |
23 | +CFLAGS = `sdl-config --cflags` | |
24 | +LIBS = `sdl-config --libs` -lSGE | |
25 | ||
26 | +TARGETS = fire bitmapfont collision blib rotate speedtest sprite sprite2 poly basics blitting input alpha inputdeluxe sfont | |
27 | +C_TARGETS = basics_c | |
28 | ||
29 | OBJECTS = $(addsuffix .o, $(TARGETS)) | |
30 | C_OBJECTS = $(addsuffix .o, $(C_TARGETS)) |
0 | --- a/sge_collision.cpp | |
1 | +++ b/sge_collision.cpp | |
2 | @@ -336,7 +336,7 @@ | |
3 | void sge_unset_cdata(sge_cdata *cd, Sint16 x, Sint16 y, Sint16 w, Sint16 h) | |
4 | { | |
5 | Uint8 *map=cd->map; | |
6 | - Sint16 offs,len; | |
7 | + Sint32 offs,len; | |
8 | int i,n=0; | |
9 | ||
10 | offs=y*cd->w + x; | |
11 | @@ -365,7 +365,7 @@ | |
12 | void sge_set_cdata(sge_cdata *cd, Sint16 x, Sint16 y, Sint16 w, Sint16 h) | |
13 | { | |
14 | Uint8 *map=cd->map; | |
15 | - Sint16 offs,len; | |
16 | + Sint32 offs,len; | |
17 | int i,n=0; | |
18 | ||
19 | offs=y*cd->w + x; |
0 | --- a/examples/alpha.cpp | |
1 | +++ b/examples/alpha.cpp | |
2 | @@ -32,7 +32,7 @@ | |
3 | /* Open TT font file */ | |
4 | if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
5 | sge_TTFont *font; | |
6 | - font=sge_TTF_OpenFont("font.ttf", 55); | |
7 | + font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 55); | |
8 | if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
9 | ||
10 | /* Ugly font rendering */ | |
11 | --- a/examples/basics.cpp | |
12 | +++ b/examples/basics.cpp | |
13 | @@ -40,7 +40,7 @@ | |
14 | /* Open TT font file */ | |
15 | if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
16 | sge_TTFont *font; | |
17 | - font=sge_TTF_OpenFont("font.ttf", 50); | |
18 | + font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 50); | |
19 | if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
20 | ||
21 | /* Draws TT text on screen */ | |
22 | --- a/examples/basics_c.c | |
23 | +++ b/examples/basics_c.c | |
24 | @@ -42,7 +42,7 @@ | |
25 | ||
26 | /* Draws TT text on screen */ | |
27 | if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
28 | - font=sge_TTF_OpenFont("font.ttf", 50); | |
29 | + font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 50); | |
30 | if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
31 | ||
32 | /* Draws TT text on screen */ | |
33 | --- a/examples/blitting.cpp | |
34 | +++ b/examples/blitting.cpp | |
35 | @@ -28,7 +28,7 @@ | |
36 | /* Open TT font file */ | |
37 | if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);} | |
38 | sge_TTFont *font; | |
39 | - font=sge_TTF_OpenFont("font.ttf", 50); | |
40 | + font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 50); | |
41 | if(font==NULL){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);} | |
42 | ||
43 | /* Make a nice background */ | |
44 | --- a/examples/input.cpp | |
45 | +++ b/examples/input.cpp | |
46 | @@ -29,7 +29,7 @@ | |
47 | /* Init TTF */ | |
48 | if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);} | |
49 | sge_TTFont *font; | |
50 | - font=sge_TTF_OpenFont("font.ttf", 25); | |
51 | + font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 25); | |
52 | if(font==NULL){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);} | |
53 | ||
54 | //sge_TTF_SetFontStyle(font, SGE_TTF_ITALIC); | |
55 | --- a/examples/inputdeluxe.cpp | |
56 | +++ b/examples/inputdeluxe.cpp | |
57 | @@ -42,7 +42,7 @@ | |
58 | //Open a TT font | |
59 | if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
60 | sge_TTFont *font; | |
61 | - font=sge_TTF_OpenFont("font.ttf", 25); | |
62 | + font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 25); | |
63 | if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);} | |
64 | ||
65 | text.set_ttFont(font,0,255,0); //Use our font |
0 | --- libsdl-sge-030809dfsg.orig/Makefile.conf | |
1 | +++ libsdl-sge-030809dfsg/Makefile.conf | |
2 | @@ -11,6 +11,7 @@ | |
3 | # Compilers (C and C++) | |
4 | CC=gcc | |
5 | CXX=g++ | |
6 | +PKG_CONFIG?=pkg-config | |
7 | ||
8 | # Make sure sdl-config is available | |
9 | HAVE_SDL =$(shell if (sdl-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) | |
10 | @@ -36,15 +37,15 @@ | |
11 | ||
12 | ||
13 | # Is freetype-config available? | |
14 | -HAVE_FT =$(shell if (pkg-config --modversion freetype2) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) | |
15 | +HAVE_FT =$(shell if ($(PKG_CONFIG) --modversion freetype2) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) | |
16 | ifeq ($(HAVE_FT),n) | |
17 | USE_FT = n | |
18 | endif | |
19 | ||
20 | ifneq ($(USE_FT),n) | |
21 | USE_FT = y | |
22 | - SGE_LIBS +=$(shell pkg-config freetype2 --libs) | |
23 | - FT_CFLAGS =$(shell pkg-config freetype2 --cflags) | |
24 | + SGE_LIBS +=$(shell $(PKG_CONFIG) freetype2 --libs) | |
25 | + FT_CFLAGS =$(shell $(PKG_CONFIG) freetype2 --cflags) | |
26 | endif | |
27 | ||
28 | ||
29 | --- libsdl-sge-030809dfsg.orig/Makefile | |
30 | +++ libsdl-sge-030809dfsg/Makefile | |
31 | @@ -11,20 +11,21 @@ | |
32 | ||
33 | OBJECTS=sge_surface.o sge_primitives.o sge_tt_text.o sge_bm_text.o sge_misc.o sge_textpp.o sge_blib.o sge_rotation.o sge_collision.o sge_shape.o | |
34 | ||
35 | -all: config $(OBJECTS) | |
36 | +all: sge_config.h $(OBJECTS) | |
37 | ar rsc libSGE.a $(OBJECTS) | |
38 | ||
39 | $(OBJECTS): %.o:%.cpp %.h #Each object depends on thier .cpp and .h file | |
40 | $(CXX) $(CFLAGS) -c $< | |
41 | ||
42 | -shared: all | |
43 | +shared: libSGE.so | |
44 | +libSGE.so: sge_config.h $(OBJECTS) | |
45 | $(CXX) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS) | |
46 | ||
47 | shared-strip: shared | |
48 | @strip libSGE.so | |
49 | ||
50 | # Building a dll... I have no idea how to do this, but it should be something like below. | |
51 | -dll: config $(OBJECTS) | |
52 | +dll: sge_config.h $(OBJECTS) | |
53 | dlltool --output-def SGE.def $(OBJECTS) | |
54 | dllwrap --driver-name $(CXX) -o SGE.dll --def SGE.def --output-lib libSGE.a --dllname SGE.dll $(OBJECTS) $(LIBS) | |
55 | ||
56 | @@ -34,7 +35,8 @@ | |
57 | clean: | |
58 | rm -f *.o *.so *.so.* *.a *.dll *.def | |
59 | ||
60 | -config: | |
61 | +config:sge_config.h | |
62 | +sge_config.h: | |
63 | @echo "/* SGE Config header (generated automatically) */" >sge_config.h | |
64 | @echo "#define SGE_VER $(SGE_VER)" >>sge_config.h | |
65 | ifeq ($(C_COMP),y) |
0 | --- a/Makefile.conf | |
1 | +++ b/Makefile.conf | |
2 | @@ -36,15 +36,15 @@ | |
3 | ||
4 | ||
5 | # Is freetype-config available? | |
6 | -HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) | |
7 | +HAVE_FT =$(shell if (pkg-config --modversion freetype2) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) | |
8 | ifeq ($(HAVE_FT),n) | |
9 | USE_FT = n | |
10 | endif | |
11 | ||
12 | ifneq ($(USE_FT),n) | |
13 | USE_FT = y | |
14 | - SGE_LIBS +=$(shell freetype-config --libs) | |
15 | - FT_CFLAGS =$(shell freetype-config --cflags) | |
16 | + SGE_LIBS +=$(shell pkg-config freetype2 --libs) | |
17 | + FT_CFLAGS =$(shell pkg-config freetype2 --cflags) | |
18 | endif | |
19 | ||
20 |
0 | fix-ftbfs-892448.patch | |
1 | 001_makefile_fixes.diff | |
2 | 004_legacy_functions.diff | |
3 | 005_freetype_support.diff | |
4 | 006_freetype2_fixes.diff | |
5 | 010_examples.diff | |
6 | 015_overflow.diff | |
7 | 100_font.diff | |
8 | cross.patch |
0 | #!/usr/bin/make -f | |
1 | ||
2 | #export DH_VERBOSE=1 | |
3 | ||
4 | DEB_CFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS) | |
5 | DEB_CFLAGS_MAINT_APPEND += $(shell dpkg-buildflags --get CFLAGS) | |
6 | DEB_CFLAGS_MAINT_APPEND += -pipe -Wall | |
7 | export DEB_CFLAGS_MAINT_APPEND | |
8 | export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-undefined -Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS) | |
9 | ||
10 | DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) | |
11 | LIB_MULTIARCH_DIR = /usr/lib/$(DEB_HOST_MULTIARCH) | |
12 | ||
13 | ALL_CUSTOM_CFLAGS := $(DEB_CFLAGS_MAINT) $(DEB_CFLAGS_MAINT_APPEND) | |
14 | ALL_CUSTOM_LDFLAGS := $(DEB_LDFLAGS_MAINT) $(DEB_LDFLAGS_MAINT_APPEND) | |
15 | ||
16 | ||
17 | %: | |
18 | dh $@ | |
19 | ||
20 | override_dh_auto_build: | |
21 | # Build the static library and make a backup | |
22 | rm -f libSGE.a | |
23 | dh_auto_build -- all CUSTOM_CFLAGS="$(ALL_CUSTOM_CFLAGS)" CUSTOM_LDFLAGS="$(ALL_CUSTOM_LDFLAGS)" | |
24 | rm -f libSGE.bak | |
25 | mv libSGE.a libSGE.bak | |
26 | ||
27 | # Build the shared library and restore the static backup | |
28 | $(MAKE) clean | |
29 | dh_auto_build -- shared CUSTOM_CFLAGS="$(ALL_CUSTOM_CFLAGS)" CUSTOM_LDFLAGS="$(ALL_CUSTOM_LDFLAGS)" | |
30 | rm -f libSGE.a | |
31 | mv libSGE.bak libSGE.a | |
32 | ||
33 | override_dh_auto_install: | |
34 | echo $(CURDIR) | |
35 | $(MAKE) install PREFIX=$(CURDIR)/debian/tmp/usr PREFIX_H=$(CURDIR)/debian/tmp/usr/include/SDL | |
36 | ||
37 | # multi-arch support | |
38 | mkdir -p $(CURDIR)/debian/tmp/$(LIB_MULTIARCH_DIR) | |
39 | mv ./debian/tmp/usr/lib/libSGE*.a $(CURDIR)/debian/tmp/$(LIB_MULTIARCH_DIR) | |
40 | mv ./debian/tmp/usr/lib/libSGE*.so* $(CURDIR)/debian/tmp/$(LIB_MULTIARCH_DIR) | |
41 | ||
42 | override_dh_compress: | |
43 | dh_compress -Xexamples/ | |
44 | ||
45 | override_dh_makeshlibs: | |
46 | dh_makeshlibs -V 'libsdl-sge (>= 030809-1)' |
0 | 3.0 (quilt) |
0 | #!/bin/sh | |
1 | ||
2 | # Author: Manuel A. Fernandez Montecelo <mafm@debian.org> | |
3 | # | |
4 | # autopkgtest check: Build example programs against the library, to perform a | |
5 | # basic smoke test | |
6 | ||
7 | ||
8 | set -e | |
9 | ||
10 | WORKDIR=$(mktemp -d) | |
11 | trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM | |
12 | cd $WORKDIR | |
13 | ||
14 | EXAMPLESDIR=/usr/share/doc/libsdl-sge-dev/examples | |
15 | ||
16 | # compile | |
17 | cp -v $EXAMPLESDIR/* . | |
18 | make clean | |
19 | make | |
20 | echo "build: OK" | |
21 | ||
22 | # check/execute | |
23 | for executable in `echo *.cpp | sed 's|\.cpp||g'` | |
24 | do | |
25 | [ -x $BINFILE ] | |
26 | # interactive, cannot invoke and close from command line | |
27 | #./$BINFILE | |
28 | done | |
29 | echo "run: OK" |