Package: darkplaces / 0~20130304+svn11952-2

Metadata

Package Version Patches format
darkplaces 0~20130304+svn11952-2 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
0001 Split Unix CFLAGS libs to one per line.patch | (download)

makefile.inc | 62 55 + 7 - 0 !
1 file changed, 55 insertions(+), 7 deletions(-)

 split (unix) cflags, libs to one per line

This just makes it easier to change them in later patches.

0002 Add support for make LINK_TO_LIBJPEG 1.patch | (download)

makefile | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 add support for "make link_to_libjpeg=1"

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0003 Add support for make LINK_TO_ZLIB 1.patch | (download)

makefile | 5 5 + 0 - 0 !
makefile.inc | 2 2 + 0 - 0 !
2 files changed, 7 insertions(+)

 add support for "make link_to_zlib=1"

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0004 Add support for LINK_TO_LIBVORBIS using pkg config.patch | (download)

makefile | 5 5 + 0 - 0 !
makefile.inc | 3 3 + 0 - 0 !
2 files changed, 8 insertions(+)

 add support for link_to_libvorbis (using pkg-config)

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0005 Add LINK_TO_MODPLUG option.patch | (download)

makefile | 5 5 + 0 - 0 !
makefile.inc | 4 2 + 2 - 0 !
snd_modplug.c | 6 3 + 3 - 0 !
3 files changed, 10 insertions(+), 5 deletions(-)

 add link_to_modplug option

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0006 add LINK_TO_ODE to link against system libode.patch | (download)

makefile | 5 5 + 0 - 0 !
makefile.inc | 4 2 + 2 - 0 !
world.c | 15 14 + 1 - 0 !
world.h | 9 0 + 9 - 0 !
4 files changed, 21 insertions(+), 12 deletions(-)

 add link_to_ode to link against system libode

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0007 add LINK_TO_THEORA.patch | (download)

cap_ogg.c | 58 58 + 0 - 0 !
makefile | 5 5 + 0 - 0 !
makefile.inc | 2 2 + 0 - 0 !
3 files changed, 65 insertions(+)

 add link_to_theora

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0008 Add LINK_TO_PNG.patch | (download)

image_png.c | 65 55 + 10 - 0 !
makefile | 5 5 + 0 - 0 !
makefile.inc | 2 2 + 0 - 0 !
3 files changed, 62 insertions(+), 10 deletions(-)

 add link_to_png

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0009 add LINK_TO_CURL.patch | (download)

libcurl.c | 74 74 + 0 - 0 !
makefile | 5 5 + 0 - 0 !
makefile.inc | 2 2 + 0 - 0 !
3 files changed, 81 insertions(+)

 add link_to_curl

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0010 Add LINK_TO_FREETYPE2.patch | (download)

ft2.c | 42 40 + 2 - 0 !
makefile | 5 5 + 0 - 0 !
makefile.inc | 2 2 + 0 - 0 !
3 files changed, 47 insertions(+), 2 deletions(-)

 add link_to_freetype2

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

0011 Add support for linking to system d0_blind_id and d0.patch | (download)

crypto.c | 4 2 + 2 - 0 !
makefile | 10 10 + 0 - 0 !
makefile.inc | 10 5 + 5 - 0 !
3 files changed, 17 insertions(+), 7 deletions(-)

 add support for linking to system d0_blind_id and d0_rijndael

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

(These libraries aren't currently in Debian, but if they were, we'd want
to link them like this.)

0012 Add support for forcing d0_blind_id and d0_rijndael .patch | (download)

crypto.c | 18 18 + 0 - 0 !
makefile | 10 10 + 0 - 0 !
2 files changed, 28 insertions(+)

 add support for forcing d0_blind_id and d0_rijndael to never be
 dlopen'd

Until these libraries exist as Debian packages, we'd prefer a local copy
(which might not be compatible) to never be loaded accidentally.

0013 Fix OS detection of darkplaces makefile to not think.patch | (download)

makefile | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 fix os detection of darkplaces' makefile to not think it's on bsd on
 GNU/kFreeBSD

[The DarkPlaces build system mostly cares about userland, not the kernel,
and GNU/kFreeBSD is equivalent to GNU/Linux in that respect. -smcv]

0014 image_png.h change name of multiple inclusion guard .patch | (download)

image_png.h | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 image_png.h: change name of multiple-inclusion guard to not
 interfere with <png.h>

0015 Be more type safe when calling setjmp call the same .patch | (download)

image_png.c | 48 23 + 25 - 0 !
1 file changed, 23 insertions(+), 25 deletions(-)

 be more type-safe when calling setjmp();
 call the same one that libpng would

Depending whether _BSD_SOURCE is preferred, glibc will provide one of two
implementations of setjmp()/longjmp() (it either does or doesn't save the
0016 Be a bit more type safe about using libpng.patch | (download)

image_png.c | 40 24 + 16 - 0 !
1 file changed, 24 insertions(+), 16 deletions(-)

 be a bit more type-safe about using libpng

The simplified libpng declarations in DarkPlaces just use "void **" for
various pointer-to-pointer arguments. However, this conflicts with the system
libpng headers (if used), which expect something like "png_struct **" (which
is not considered to be a compatible type by ISO C), causing compiler
warnings. This patch reduces the simplification a bit by distinguishing
between the various pointers-to-struct enough that system libpng headers
do not provoke warnings.

Similarly, assigning a function pointer provokes warnings if the arguments'
types are not exactly as expected. Avoiding those warnings potentially makes
genuine bugs easier to spot, so it seems worth being a bit more precise.

0017 Fix various typos dont don t doesnt doesn t arguemen.patch | (download)

clvm_cmds.c | 2 1 + 1 - 0 !
cmd.c | 2 1 + 1 - 0 !
dpdefs/csprogsdefs.qc | 4 2 + 2 - 0 !
gl_draw.c | 2 1 + 1 - 0 !
gl_rmain.c | 2 1 + 1 - 0 !
gl_textures.c | 2 1 + 1 - 0 !
menu.c | 2 1 + 1 - 0 !
netconn.c | 4 2 + 2 - 0 !
progsvm.h | 2 1 + 1 - 0 !
prvm_cmds.c | 8 4 + 4 - 0 !
prvm_edict.c | 6 3 + 3 - 0 !
r_sprites.c | 2 1 + 1 - 0 !
sbar.c | 2 1 + 1 - 0 !
svvm_cmds.c | 2 1 + 1 - 0 !
sys.h | 2 1 + 1 - 0 !
todo | 4 2 + 2 - 0 !
vid_sdl.c | 2 1 + 1 - 0 !
vid_wgl.c | 2 1 + 1 - 0 !
world.c | 4 2 + 2 - 0 !
19 files changed, 28 insertions(+), 28 deletions(-)

 fix various typos: dont -> don't, doesnt -> doesn't,
 arguements -> arguments

Picked up by Debian's Lintian package-checking tool.

0018 Don t build SSE only software rasterizer on non x86 .patch | (download)

dpsoftrast.h | 4 4 + 0 - 0 !
gl_backend.c | 56 56 + 0 - 0 !
gl_rmain.c | 19 19 + 0 - 0 !
gl_textures.c | 18 18 + 0 - 0 !
makefile | 12 12 + 0 - 0 !
makefile.inc | 16 9 + 7 - 0 !
quakedef.h | 5 5 + 0 - 0 !
vid_glx.c | 8 7 + 1 - 0 !
vid_sdl.c | 6 5 + 1 - 0 !
vid_shared.c | 4 3 + 1 - 0 !
vid_wgl.c | 6 5 + 1 - 0 !
11 files changed, 143 insertions(+), 11 deletions(-)

 don't build sse-only software rasterizer on non-x86 cpus

Compilers for non-x86 platforms don't understand -msse or -msse2, and
these files aren't usable on non-x86 anyway.

0019 If linking libpng conventionally use the png_jmpbuf .patch | (download)

image_png.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 if linking libpng conventionally, use the png_jmpbuf macro

This is necessary to compile against libpng 1.5.x.

0020 If linking libpng normally use its header to get the.patch | (download)

image_png.c | 24 20 + 4 - 0 !
1 file changed, 20 insertions(+), 4 deletions(-)

 if linking libpng normally,
 use its header to get the png_uint_32 type

0021 If linking libpng in the normal way use its actual v.patch | (download)

image_png.c | 15 14 + 1 - 0 !
1 file changed, 14 insertions(+), 1 deletion(-)

 if linking libpng in the normal way, use its actual version number

Also avoid redefining more stuff that's normally in the libpng headers.

0022 Add support for disabling libavw.patch | (download)

cl_video_libavw.c | 20 20 + 0 - 0 !
makefile | 4 4 + 0 - 0 !
makefile.inc | 1 1 + 0 - 0 !
3 files changed, 25 insertions(+)

 add support for disabling libavw

As with all the other dlopen()'d libraries, if we're going to use them,
we should link them properly so dpkg-shlibdeps can pick up the
right versioned dependencies. Xonotic 0.7.0 doesn't seem to ship
this one so we can probably just omit it.

0023 Disable dlopen support and warn if it gets compiled .patch | (download)

sys.h | 2 1 + 1 - 0 !
sys_shared.c | 4 3 + 1 - 0 !
2 files changed, 4 insertions(+), 2 deletions(-)

 disable dlopen support, and warn if it gets compiled in

0024 Disable gpu skinning for skeletal models.patch | (download)

gl_rmain.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 disable gpu skinning for skeletal models

This feature is buggy and sometimes causes models to completely
lack animation and can cause very high frame rates.  Xonotic
developers are aware of this and disabling this feature is the
temporary work around. See http://dev.xonotic.org/issues/1459