[darkplaces] 10/12: Update DP_LINK_* options
Simon McVittie
smcv at debian.org
Thu Apr 2 09:48:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository darkplaces.
commit 777e9487e9be7544c2c12e077d49e8cc0c598c47
Author: Simon McVittie <smcv at debian.org>
Date: Thu Apr 2 10:33:43 2015 +0100
Update DP_LINK_* options
---
debian/patches/Add-DP_LINK_FREETYPE2-option.patch | 18 ++---
...-for-DP_LINK_PNG-shared-default-is-dlopen.patch | 33 +++++----
...-for-DP_LINK_THEORA-shared-default-is-dlo.patch | 36 ++++++----
...-support-for-DP_LINK_VORBIS-make-variable.patch | 19 +++--
.../patches/Add-support-for-disabling-libavw.patch | 6 +-
...-for-forcing-d0_blind_id-and-d0_rijndael-.patch | 2 +-
...pen-support-and-warn-if-it-gets-compiled-.patch | 22 +++++-
...-SSE-only-software-rasterizer-on-non-x86-.patch | 8 +--
...ction-of-darkplaces-makefile-to-not-think.patch | 2 +-
debian/patches/add-DP_LINK_CURL-option.patch | 83 +++++++++++++---------
debian/rules | 17 +++--
11 files changed, 145 insertions(+), 101 deletions(-)
diff --git a/debian/patches/Add-DP_LINK_FREETYPE2-option.patch b/debian/patches/Add-DP_LINK_FREETYPE2-option.patch
index 3857023..d09a62d 100644
--- a/debian/patches/Add-DP_LINK_FREETYPE2-option.patch
+++ b/debian/patches/Add-DP_LINK_FREETYPE2-option.patch
@@ -1,5 +1,5 @@
From: Simon McVittie <smcv at debian.org>
-Date: Mon, 16 Feb 2015 00:19:38 +0000
+Date: Thu, 2 Apr 2015 10:28:59 +0100
Subject: Add DP_LINK_FREETYPE2 option
In Debian we want library dependencies to work in the conventional way,
@@ -67,7 +67,7 @@ index bc9544f..5f58f63 100644
qFT_Done_FreeType(font_ft2lib);
font_ft2lib = NULL;
diff --git a/makefile b/makefile
-index 4f6015c..19e1990 100644
+index 5dd9ad4..6fb0ccc 100644
--- a/makefile
+++ b/makefile
@@ -116,6 +116,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
@@ -115,7 +115,7 @@ index 4f6015c..19e1990 100644
endif
+ifeq ($(DP_LINK_FREETYPE2), shared)
-+ CFLAGS_LIBFREETYPE2=-DLINK_TO_LIBFREETYPE2 `pkg-config --cflags freetype2`
++ CFLAGS_LIBFREETYPE2=-DLINK_TO_FREETYPE2 `pkg-config --cflags freetype2`
+ LIB_FREETYPE2=`pkg-config --libs freetype2`
+endif
+ifeq ($(DP_LINK_FREETYPE2), dlopen)
@@ -127,7 +127,7 @@ index 4f6015c..19e1990 100644
ifndef DP_SOUND_API
diff --git a/makefile.inc b/makefile.inc
-index e317dbe..e78861b 100644
+index f545264..b4612df 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -172,7 +172,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
@@ -139,12 +139,12 @@ index e317dbe..e78861b 100644
CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
CFLAGS_SERVER=
CFLAGS_DEBUG=-ggdb
-@@ -206,7 +206,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+@@ -205,7 +205,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+
OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
- LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
--LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA) $(LIB_PNG) $(LIB_CURL)
-+LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA) $(LIB_PNG) $(LIB_CURL) $(LIB_FREETYPE2)
+-LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LIB_PNG) $(LIB_CURL)
++LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LIB_PNG) $(LIB_CURL) $(LIB_FREETYPE2)
+ LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA)
LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
- LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
diff --git a/debian/patches/Add-support-for-DP_LINK_PNG-shared-default-is-dlopen.patch b/debian/patches/Add-support-for-DP_LINK_PNG-shared-default-is-dlopen.patch
index 08e8a46..a550831 100644
--- a/debian/patches/Add-support-for-DP_LINK_PNG-shared-default-is-dlopen.patch
+++ b/debian/patches/Add-support-for-DP_LINK_PNG-shared-default-is-dlopen.patch
@@ -1,5 +1,5 @@
From: Simon McVittie <smcv at debian.org>
-Date: Thu, 2 Apr 2015 09:25:38 +0100
+Date: Thu, 2 Apr 2015 10:31:53 +0100
Subject: Add support for DP_LINK_PNG=shared (default is dlopen)
Like the existing DP_LINK_TO_JPEG, this can be configured to
@@ -9,9 +9,9 @@ Origin: vendor, Debian
Forwarded: no
---
image_png.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- makefile | 16 ++++++++-
+ makefile | 15 ++++++++
makefile.inc | 4 +--
- 3 files changed, 124 insertions(+), 8 deletions(-)
+ 3 files changed, 124 insertions(+), 7 deletions(-)
diff --git a/image_png.c b/image_png.c
index 6f52914..6e52f49 100644
@@ -277,7 +277,7 @@ index 6f52914..6e52f49 100644
);
if(!png)
diff --git a/makefile b/makefile
-index 0312cc1..75a8fe8 100644
+index 6a00037..a46097f 100644
--- a/makefile
+++ b/makefile
@@ -114,6 +114,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
@@ -288,16 +288,15 @@ index 0312cc1..75a8fe8 100644
endif
# Mac OS X configuration
-@@ -151,7 +152,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
+@@ -151,6 +152,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
DP_LINK_THEORA?=dlopen
-- DP_LINK_THEORA?=dlopen
+ DP_LINK_PNG?=dlopen
# on OS X, we don't build the CL by default because it uses deprecated
# and not-implemented-in-64bit Carbon
-@@ -195,6 +196,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
+@@ -194,6 +196,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
DP_LINK_THEORA?=dlopen
@@ -305,7 +304,7 @@ index 0312cc1..75a8fe8 100644
endif
# BSD configuration
-@@ -232,6 +234,7 @@ endif
+@@ -231,6 +234,7 @@ endif
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
DP_LINK_THEORA?=dlopen
@@ -313,7 +312,7 @@ index 0312cc1..75a8fe8 100644
endif
# Win32 configuration
-@@ -293,6 +296,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
+@@ -292,6 +296,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
DP_LINK_THEORA?=dlopen
@@ -321,13 +320,13 @@ index 0312cc1..75a8fe8 100644
endif
# set these to "" if you want to use dynamic loading instead
-@@ -365,6 +369,16 @@ ifeq ($(DP_LINK_THEORA), dlopen)
+@@ -364,6 +369,16 @@ ifeq ($(DP_LINK_THEORA), dlopen)
LIB_THEORA=
endif
+# png
+ifeq ($(DP_LINK_PNG), shared)
-+ CFLAGS_LIBPNG=-DLINK_TO_LIBPNG `pkg-config --cflags libpng`
++ CFLAGS_LIBPNG=-DLINK_TO_PNG `pkg-config --cflags libpng`
+ LIB_PNG=`pkg-config --libs libpng`
+endif
+ifeq ($(DP_LINK_PNG), dlopen)
@@ -339,7 +338,7 @@ index 0312cc1..75a8fe8 100644
ifndef DP_SOUND_API
diff --git a/makefile.inc b/makefile.inc
-index 0e482ab..c191466 100644
+index 9d29592..cb40f5a 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -172,7 +172,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
@@ -351,12 +350,12 @@ index 0e482ab..c191466 100644
CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
CFLAGS_SERVER=
CFLAGS_DEBUG=-ggdb
-@@ -206,7 +206,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+@@ -205,7 +205,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+
OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
- LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
--LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA)
-+LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA) $(LIB_PNG)
+-LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
++LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LIB_PNG)
+ LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA)
LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
- LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
diff --git a/debian/patches/Add-support-for-DP_LINK_THEORA-shared-default-is-dlo.patch b/debian/patches/Add-support-for-DP_LINK_THEORA-shared-default-is-dlo.patch
index 7b75f61..c88d91b 100644
--- a/debian/patches/Add-support-for-DP_LINK_THEORA-shared-default-is-dlo.patch
+++ b/debian/patches/Add-support-for-DP_LINK_THEORA-shared-default-is-dlo.patch
@@ -1,5 +1,5 @@
From: Simon McVittie <smcv at debian.org>
-Date: Sun, 15 Feb 2015 23:55:12 +0000
+Date: Thu, 2 Apr 2015 10:01:39 +0100
Subject: Add support for DP_LINK_THEORA=shared (default is dlopen)
Like the existing DP_LINK_TO_JPEG, this can be configured to
@@ -9,9 +9,9 @@ Origin: vendor, Debian
Forwarded: no
---
cap_ogg.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- makefile | 16 ++++++++++++++++
- makefile.inc | 4 ++--
- 3 files changed, 76 insertions(+), 2 deletions(-)
+ makefile | 15 +++++++++++++++
+ makefile.inc | 6 +++---
+ 3 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/cap_ogg.c b/cap_ogg.c
index e9abc7a..7c1b2d2 100644
@@ -110,7 +110,7 @@ index e9abc7a..7c1b2d2 100644
// this struct should not be needed
diff --git a/makefile b/makefile
-index 2450c35..0312cc1 100644
+index 2450c35..6a00037 100644
--- a/makefile
+++ b/makefile
@@ -113,6 +113,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
@@ -121,16 +121,15 @@ index 2450c35..0312cc1 100644
endif
# Mac OS X configuration
-@@ -149,6 +150,8 @@ ifeq ($(DP_MAKE_TARGET), macosx)
+@@ -149,6 +150,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
DP_LINK_CRYPTO?=dlopen
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
+ DP_LINK_THEORA?=dlopen
-+ DP_LINK_THEORA?=dlopen
# on OS X, we don't build the CL by default because it uses deprecated
# and not-implemented-in-64bit Carbon
-@@ -191,6 +194,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
+@@ -191,6 +193,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
DP_LINK_CRYPTO?=dlopen
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
@@ -138,7 +137,7 @@ index 2450c35..0312cc1 100644
endif
# BSD configuration
-@@ -227,6 +231,7 @@ endif
+@@ -227,6 +230,7 @@ endif
DP_LINK_CRYPTO?=dlopen
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
@@ -146,7 +145,7 @@ index 2450c35..0312cc1 100644
endif
# Win32 configuration
-@@ -287,6 +292,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
+@@ -287,6 +291,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
DP_LINK_CRYPTO?=dlopen
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
DP_LINK_VORBIS?=dlopen
@@ -154,14 +153,14 @@ index 2450c35..0312cc1 100644
endif
# set these to "" if you want to use dynamic loading instead
-@@ -349,6 +355,16 @@ ifeq ($(DP_LINK_VORBIS), dlopen)
+@@ -349,6 +354,16 @@ ifeq ($(DP_LINK_VORBIS), dlopen)
LIB_VORBIS=
endif
+# theora
+ifeq ($(DP_LINK_THEORA), shared)
-+ CFLAGS_LIBTHEORA=-DLINK_TO_LIBTHEORA `pkg-config --cflags theora vorbis ogg`
-+ LIB_THEORA=`pkg-config --libs theora vorbis ogg`
++ CFLAGS_LIBTHEORA=-DLINK_TO_THEORA `pkg-config --cflags theora vorbis vorbisenc ogg`
++ LIB_THEORA=`pkg-config --libs theora vorbis vorbisenc ogg`
+endif
+ifeq ($(DP_LINK_THEORA), dlopen)
+ CFLAGS_LIBTHEORA=
@@ -172,7 +171,7 @@ index 2450c35..0312cc1 100644
ifndef DP_SOUND_API
diff --git a/makefile.inc b/makefile.inc
-index 0358831..0e482ab 100644
+index ba2ccc5..9d29592 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -172,7 +172,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
@@ -184,7 +183,7 @@ index 0358831..0e482ab 100644
CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
CFLAGS_SERVER=
CFLAGS_DEBUG=-ggdb
-@@ -206,7 +206,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+@@ -206,13 +206,13 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
@@ -193,3 +192,10 @@ index 0358831..0e482ab 100644
LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
+ CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD
+
+-LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) $(LIB_VORBIS)
++LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) $(LIB_VORBIS) $(LIB_THEORA)
+ EXE_UNIXCL=darkplaces-glx
+ EXE_UNIXSV=darkplaces-dedicated
+ EXE_UNIXSDL=darkplaces-sdl
diff --git a/debian/patches/Add-support-for-DP_LINK_VORBIS-make-variable.patch b/debian/patches/Add-support-for-DP_LINK_VORBIS-make-variable.patch
index a1a538c..0169aef 100644
--- a/debian/patches/Add-support-for-DP_LINK_VORBIS-make-variable.patch
+++ b/debian/patches/Add-support-for-DP_LINK_VORBIS-make-variable.patch
@@ -9,15 +9,17 @@ tracking correct versioned dependencies in this mode of linking and
avoiding incompatible versions, and package systems like apt mean that
it's trivial to install dependencies.
-The default is the current behaviour: dlopen libvorbisfile.
+This uses the existing support for linking to libvorbisfile in the normal
+way, which is used on Android and iOS. The default on other platforms
+is the current behaviour: dlopen libvorbisfile.
Origin: vendor, Debian
Forwarded: no
---
BSDmakefile | 10 ++++++++++
makefile | 15 +++++++++++++++
- makefile.inc | 4 ++--
- 3 files changed, 27 insertions(+), 2 deletions(-)
+ makefile.inc | 6 +++---
+ 3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/BSDmakefile b/BSDmakefile
index eb135ce..8ef6883 100644
@@ -109,7 +111,7 @@ index bbd0a76..2450c35 100644
ifndef DP_SOUND_API
diff --git a/makefile.inc b/makefile.inc
-index c7e98d2..0358831 100644
+index c7e98d2..ba2ccc5 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -172,7 +172,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
@@ -121,7 +123,7 @@ index c7e98d2..0358831 100644
CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
CFLAGS_SERVER=
CFLAGS_DEBUG=-ggdb
-@@ -206,7 +206,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+@@ -206,13 +206,13 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
@@ -130,3 +132,10 @@ index c7e98d2..0358831 100644
LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
+ CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD
+
+-LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS)
++LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) $(LIB_VORBIS)
+ EXE_UNIXCL=darkplaces-glx
+ EXE_UNIXSV=darkplaces-dedicated
+ EXE_UNIXSDL=darkplaces-sdl
diff --git a/debian/patches/Add-support-for-disabling-libavw.patch b/debian/patches/Add-support-for-disabling-libavw.patch
index 6a6c457..f950950 100644
--- a/debian/patches/Add-support-for-disabling-libavw.patch
+++ b/debian/patches/Add-support-for-disabling-libavw.patch
@@ -51,7 +51,7 @@ index 7924127..6ccdb54 100644
+#endif /* !DISABLE_AVW */
diff --git a/makefile b/makefile
-index e7623db..329d65a 100644
+index 70132d0..a5bc4b8 100644
--- a/makefile
+++ b/makefile
@@ -416,6 +416,10 @@ ifeq ($(DP_LINK_FREETYPE2), dlopen)
@@ -66,7 +66,7 @@ index e7623db..329d65a 100644
ifndef DP_SOUND_API
diff --git a/makefile.inc b/makefile.inc
-index e78861b..1834c12 100644
+index b4612df..0681197 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -172,7 +172,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
@@ -74,7 +74,7 @@ index e78861b..1834c12 100644
# Compilation
-CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_LIBVORBIS) $(CFLAGS_LIBTHEORA) $(CFLAGS_LIBPNG) $(CFLAGS_LIBCURL) $(CFLAGS_LIBFREETYPE2) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
-+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_LIBVORBIS) $(CFLAGS_LIBTHEORA) $(CFLAGS_LIBPNG) $(CFLAGS_LIBCURL) $(CFLAGS_LIBFREETYPE2) $(CFLAGS_AVW) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
++CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_LIBVORBIS) $(CFLAGS_LIBTHEORA) $(CFLAGS_LIBPNG) $(CFLAGS_LIBCURL) $(CFLAGS_LIBFREETYPE2) $(CFLAGS_LIBAVW) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
CFLAGS_SERVER=
CFLAGS_DEBUG=-ggdb
diff --git a/debian/patches/Add-support-for-forcing-d0_blind_id-and-d0_rijndael-.patch b/debian/patches/Add-support-for-forcing-d0_blind_id-and-d0_rijndael-.patch
index 0e684ae..d739502 100644
--- a/debian/patches/Add-support-for-forcing-d0_blind_id-and-d0_rijndael-.patch
+++ b/debian/patches/Add-support-for-forcing-d0_blind_id-and-d0_rijndael-.patch
@@ -98,7 +98,7 @@ index 6abaaa2..ca0fa38 100644
#endif
diff --git a/makefile b/makefile
-index 19e1990..e7623db 100644
+index 6fb0ccc..70132d0 100644
--- a/makefile
+++ b/makefile
@@ -350,6 +350,10 @@ ifeq ($(DP_LINK_CRYPTO), dlopen)
diff --git a/debian/patches/Disable-dlopen-support-and-warn-if-it-gets-compiled-.patch b/debian/patches/Disable-dlopen-support-and-warn-if-it-gets-compiled-.patch
index 0711114..5615587 100644
--- a/debian/patches/Disable-dlopen-support-and-warn-if-it-gets-compiled-.patch
+++ b/debian/patches/Disable-dlopen-support-and-warn-if-it-gets-compiled-.patch
@@ -6,8 +6,8 @@ Origin: vendor, Debian
Forwarded: no, Debian-specific
---
sys.h | 2 +-
- sys_shared.c | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
+ sys_shared.c | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sys.h b/sys.h
index 9dfdf62..17ec9a9 100644
@@ -23,7 +23,7 @@ index 9dfdf62..17ec9a9 100644
void* Sys_GetProcAddress (dllhandle_t handle, const char* name);
diff --git a/sys_shared.c b/sys_shared.c
-index 03c0598..297f470 100644
+index 03c0598..6e3eec4 100644
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -7,7 +7,9 @@
@@ -37,3 +37,19 @@ index 03c0598..297f470 100644
#ifdef WIN32
# include <windows.h>
+@@ -84,6 +86,7 @@ DLL MANAGEMENT
+ ===============================================================================
+ */
+
++#ifdef SUPPORTDLL
+ static qboolean Sys_LoadLibraryFunctions(dllhandle_t dllhandle, const dllfunction_t *fcts, qboolean complain, qboolean has_next)
+ {
+ const dllfunction_t *func;
+@@ -108,6 +111,7 @@ static qboolean Sys_LoadLibraryFunctions(dllhandle_t dllhandle, const dllfunctio
+ }
+ return false;
+ }
++#endif
+
+ qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllfunction_t *fcts)
+ {
diff --git a/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch b/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch
index 9016d70..66e70cb 100644
--- a/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch
+++ b/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch
@@ -653,7 +653,7 @@ index e56c5da..f71a2c6 100644
}
diff --git a/makefile b/makefile
-index f494891..85aacc2 100644
+index 1639f65..a5b17ca 100644
--- a/makefile
+++ b/makefile
@@ -51,6 +51,18 @@ else
@@ -676,7 +676,7 @@ index f494891..85aacc2 100644
ifeq ($(DP_MACHINE),x86_64)
UNIX_X11LIBPATH:=/usr/X11R6/lib64
diff --git a/makefile.inc b/makefile.inc
-index 1834c12..db0de06 100644
+index 0681197..d83f345 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -99,7 +99,6 @@ OBJ_COMMON= \
@@ -720,8 +720,8 @@ index 1834c12..db0de06 100644
-OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
+OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) $(OBJ_CPU)
- LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
- LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA) $(LIB_PNG) $(LIB_CURL) $(LIB_FREETYPE2)
+ LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LIB_PNG) $(LIB_CURL) $(LIB_FREETYPE2)
+ LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA)
@@ -243,7 +245,7 @@ LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit -framework Carbon $
LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m
diff --git a/debian/patches/Fix-OS-detection-of-darkplaces-makefile-to-not-think.patch b/debian/patches/Fix-OS-detection-of-darkplaces-makefile-to-not-think.patch
index 12bb7ba..75b28af 100644
--- a/debian/patches/Fix-OS-detection-of-darkplaces-makefile-to-not-think.patch
+++ b/debian/patches/Fix-OS-detection-of-darkplaces-makefile-to-not-think.patch
@@ -13,7 +13,7 @@ Forwarded: no
1 file changed, 5 insertions(+)
diff --git a/makefile b/makefile
-index 329d65a..f494891 100644
+index a5bc4b8..1639f65 100644
--- a/makefile
+++ b/makefile
@@ -9,6 +9,10 @@ else
diff --git a/debian/patches/add-DP_LINK_CURL-option.patch b/debian/patches/add-DP_LINK_CURL-option.patch
index 4da2e6a..f6ba173 100644
--- a/debian/patches/add-DP_LINK_CURL-option.patch
+++ b/debian/patches/add-DP_LINK_CURL-option.patch
@@ -1,5 +1,5 @@
From: Simon McVittie <smcv at debian.org>
-Date: Fri, 20 Jan 2012 09:22:20 +0000
+Date: Thu, 2 Apr 2015 10:28:35 +0100
Subject: add DP_LINK_CURL option
In Debian we want library dependencies to work in the conventional way,
@@ -9,13 +9,13 @@ dependencies.
Origin: vendor, Debian
Forwarded: no
---
- libcurl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- makefile | 15 ++++++++++++
- makefile.inc | 4 ++--
- 3 files changed, 93 insertions(+), 2 deletions(-)
+ libcurl.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ makefile | 15 +++++++++++
+ makefile.inc | 4 +--
+ 3 files changed, 99 insertions(+), 3 deletions(-)
diff --git a/libcurl.c b/libcurl.c
-index 2f001d5..6fc15f8 100644
+index 2f001d5..81a8b0a 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -16,6 +16,31 @@ static cvar_t cl_curl_enabled = {CVAR_SAVE, "cl_curl_enabled","1", "whether clie
@@ -50,15 +50,15 @@ index 2f001d5..6fc15f8 100644
/*
=================================================================
-@@ -194,6 +219,8 @@ static dllhandle_t curl_dll = NULL;
- #define LOADTYPE_CACHEPIC 2
- #define LOADTYPE_SKINFRAME 3
+@@ -189,6 +214,8 @@ static dllfunction_t curlfuncs[] =
+ static dllhandle_t curl_dll = NULL;
+ // will be checked at many places to find out if qcurl calls are allowed
+#endif
+
- void *curl_mutex = NULL;
-
- typedef struct downloadinfo_s
+ #define LOADTYPE_NONE 0
+ #define LOADTYPE_PAK 1
+ #define LOADTYPE_CACHEPIC 2
@@ -247,8 +274,11 @@ Setting the command to NULL clears it.
*/
static void Curl_CommandWhenDone(const char *cmd)
@@ -179,19 +179,34 @@ index 2f001d5..6fc15f8 100644
for(di = downloads; di; di = di->next)
if(!strcasecmp(di->filename, filename))
return di;
-@@ -881,7 +936,11 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
+@@ -852,8 +907,10 @@ static downloadinfo *Curl_Find(const char *filename)
+ void Curl_Cancel_ToMemory(curl_callback_t callback, void *cbdata)
+ {
+ downloadinfo *di;
++#ifndef LINK_TO_CURL
+ if(!curl_dll)
+ return;
++#endif
+ for(di = downloads; di; )
+ {
+ if(di->callback == callback && di->callback_data == cbdata)
+@@ -881,7 +938,14 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
if(loadtype != LOADTYPE_NONE)
Host_Error("Curl_Begin: loadtype and buffer are both set");
-+#ifdef LINK_TO_CURL
- if(!curl_dll || !cl_curl_enabled.integer)
-+#else
-+ if(!cl_curl_enabled.integer)
+- if(!curl_dll || !cl_curl_enabled.integer)
++#ifndef LINK_TO_CURL
++ if(!curl_dll)
++ {
++ return false;
++ }
+#endif
++
++ if(!cl_curl_enabled.integer)
{
return false;
}
-@@ -1135,8 +1194,10 @@ void Curl_Run(void)
+@@ -1135,8 +1199,10 @@ void Curl_Run(void)
if(!cl_curl_enabled.integer)
return;
@@ -202,7 +217,7 @@ index 2f001d5..6fc15f8 100644
if (curl_mutex) Thread_LockMutex(curl_mutex);
-@@ -1250,8 +1311,10 @@ Stops ALL downloads.
+@@ -1250,8 +1316,10 @@ Stops ALL downloads.
*/
void Curl_CancelAll(void)
{
@@ -213,7 +228,7 @@ index 2f001d5..6fc15f8 100644
if (curl_mutex) Thread_LockMutex(curl_mutex);
-@@ -1273,8 +1336,10 @@ returns true iff there is a download running.
+@@ -1273,8 +1341,10 @@ returns true iff there is a download running.
*/
qboolean Curl_Running(void)
{
@@ -224,7 +239,7 @@ index 2f001d5..6fc15f8 100644
return downloads != NULL;
}
-@@ -1289,8 +1354,10 @@ for the given download.
+@@ -1289,8 +1359,10 @@ for the given download.
*/
static double Curl_GetDownloadAmount(downloadinfo *di)
{
@@ -235,7 +250,7 @@ index 2f001d5..6fc15f8 100644
if(di->curle)
{
double length;
-@@ -1313,8 +1380,10 @@ returns the speed of the given download in bytes per second
+@@ -1313,8 +1385,10 @@ returns the speed of the given download in bytes per second
*/
static double Curl_GetDownloadSpeed(downloadinfo *di)
{
@@ -246,7 +261,7 @@ index 2f001d5..6fc15f8 100644
if(di->curle)
{
double speed;
-@@ -1337,8 +1406,11 @@ static void Curl_Info_f(void)
+@@ -1337,8 +1411,11 @@ static void Curl_Info_f(void)
{
downloadinfo *di;
char urlbuf[1024];
@@ -258,7 +273,7 @@ index 2f001d5..6fc15f8 100644
if(Curl_Running())
{
if (curl_mutex) Thread_LockMutex(curl_mutex);
-@@ -1398,11 +1470,13 @@ static void Curl_Curl_f(void)
+@@ -1398,11 +1475,13 @@ static void Curl_Curl_f(void)
const char *url;
const char *name = 0;
@@ -272,7 +287,7 @@ index 2f001d5..6fc15f8 100644
if(!cl_curl_enabled.integer)
{
-@@ -1573,6 +1647,7 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
+@@ -1573,6 +1652,7 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
downloadinfo *di;
Curl_downloadinfo_t *downinfo;
@@ -280,7 +295,7 @@ index 2f001d5..6fc15f8 100644
if(!curl_dll)
{
*nDownloads = 0;
-@@ -1580,6 +1655,7 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
+@@ -1580,6 +1660,7 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
*additional_info = NULL;
return NULL;
}
@@ -289,7 +304,7 @@ index 2f001d5..6fc15f8 100644
if (curl_mutex) Thread_LockMutex(curl_mutex);
diff --git a/makefile b/makefile
-index 75a8fe8..4f6015c 100644
+index a46097f..5dd9ad4 100644
--- a/makefile
+++ b/makefile
@@ -115,6 +115,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
@@ -338,7 +353,7 @@ index 75a8fe8..4f6015c 100644
+# curl
+ifeq ($(DP_LINK_CURL), shared)
-+ CFLAGS_LIBCURL=-DLINK_TO_LIBCURL `pkg-config --cflags libcurl`
++ CFLAGS_LIBCURL=-DLINK_TO_CURL `pkg-config --cflags libcurl`
+ LIB_CURL=`pkg-config --libs libcurl`
+endif
+ifeq ($(DP_LINK_CURL), dlopen)
@@ -350,7 +365,7 @@ index 75a8fe8..4f6015c 100644
ifndef DP_SOUND_API
diff --git a/makefile.inc b/makefile.inc
-index c191466..e317dbe 100644
+index cb40f5a..f545264 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -172,7 +172,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
@@ -362,12 +377,12 @@ index c191466..e317dbe 100644
CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
CFLAGS_SERVER=
CFLAGS_DEBUG=-ggdb
-@@ -206,7 +206,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+@@ -205,7 +205,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
+
OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
- LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
--LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA) $(LIB_PNG)
-+LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA) $(LIB_PNG) $(LIB_CURL)
+-LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LIB_PNG)
++LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LIB_PNG) $(LIB_CURL)
+ LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) $(LIB_VORBIS) $(LIB_THEORA)
LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
- LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
diff --git a/debian/rules b/debian/rules
index fd79365..c4862a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,19 +42,18 @@ override_dh_auto_build:
CFLAGS_DEBUG="$(CPPFLAGS) $(CFLAGS)" \
LDFLAGS_RELEASE="$(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" \
LDFLAGS_DEBUG="$(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" \
- LINK_TO_CURL=1 \
- LINK_TO_FREETYPE2=1 \
+ DP_LINK_CURL=shared \
+ DP_LINK_FREETYPE2=shared \
DP_LINK_JPEG=shared \
- LINK_TO_LIBVORBIS=1 \
- LINK_TO_MODPLUG=1 \
+ DP_LINK_VORBIS=shared \
DP_LINK_ODE=shared \
- LINK_TO_PNG=1 \
- LINK_TO_THEORA=1 \
+ DP_LINK_PNG=shared\
+ DP_LINK_THEORA=shared \
DP_LINK_ZLIB=shared \
DISABLE_OFFSCREEN_GECKO=1 \
- DP_LINK_CRYPTO= \
- DP_LINK_CRYPTO_RIJNDAEL= \
- DISABLE_AVW=1 \
+ DP_LINK_CRYPTO=never \
+ DP_LINK_CRYPTO_RIJNDAEL=never \
+ DP_LINK_AVW=never \
STRIP=": do not strip" \
$(TARGETS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/darkplaces.git
More information about the Pkg-games-commits
mailing list