[deng] 03/09: refresh patches for 1.14.5
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon May 25 21:29:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit eebf00523d7ff2644346a7d2fa409491ebb97544
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon May 25 21:15:28 2015 +0000
refresh patches for 1.14.5
---
debian/patches/fonts.path | 11 ++++++
debian/patches/freedoom.patch | 20 ++++++-----
debian/patches/install_dirs.patch | 32 ------------------
debian/patches/noexample.patch | 13 ++++++++
debian/patches/nofsaa.patch | 13 ++++++++
debian/patches/paths.patch | 31 +++++++++++++++++
debian/patches/rpath.patch | 13 ++++++++
debian/patches/series | 9 +++--
debian/patches/spelling_errors.patch | 65 ------------------------------------
9 files changed, 99 insertions(+), 108 deletions(-)
diff --git a/debian/patches/fonts.path b/debian/patches/fonts.path
new file mode 100644
index 0000000..bee61bd
--- /dev/null
+++ b/debian/patches/fonts.path
@@ -0,0 +1,11 @@
+--- a/doomsday/client/client.pro
++++ b/doomsday/client/client.pro
+@@ -905,7 +905,7 @@ macx {
+ target.path = $$DENG_BIN_DIR
+ data.path = $$DENG_DATA_DIR
+ startupgfx.path = $$DENG_DATA_DIR/graphics
+- startupfonts.path = $$DENG_DATA_DIR/fonts
++ startupfonts.path = $$DENG_DATA_DIR
+ mod.path = $$DENG_BASE_DIR/modules
+
+ win32 {
diff --git a/debian/patches/freedoom.patch b/debian/patches/freedoom.patch
index 80ac0a2..6dc7f7a 100644
--- a/debian/patches/freedoom.patch
+++ b/debian/patches/freedoom.patch
@@ -1,8 +1,10 @@
+description: add support for loading freedoom wads
+
--- a/doomsday/plugins/doom/src/d_api.c
+++ b/doomsday/plugins/doom/src/d_api.c
-@@ -66,6 +66,15 @@ int G_RegisterGames(int hookType, int pa
- {
- #define STARTUPPK3 PLUGIN_NAMETEXT2 ".pk3"
+@@ -69,6 +69,15 @@ int G_RegisterGames(int hookType, int pa
+ #define LEGACYSAVEGAMENAMEEXP "^(?:DoomSav)[0-9]{1,1}(?:.dsg)"
+ #define LEGACYSAVEGAMESUBFOLDER "savegame"
+ GameDef const freedoom2Def = {
+ "freedoom2", "doom", "Freedoom: Phase 2", "Contributors to the Freedoom project"
@@ -14,9 +16,9 @@
+ "freedm", "doom", "FreeDM", "Contributors to the Freedoom project"
+ };
GameDef const hacxDef = {
- "hacx", "hacx", "HACX - Twitch 'n Kill", "Banjo Software"
- };
-@@ -93,6 +102,24 @@ int G_RegisterGames(int hookType, int pa
+ "hacx", "hacx",
+ "HACX - Twitch 'n Kill", "Banjo Software",
+@@ -112,6 +121,24 @@ int G_RegisterGames(int hookType, int pa
DENG_UNUSED(hookType); DENG_UNUSED(param); DENG_UNUSED(data);
@@ -41,7 +43,7 @@
/* HacX */
gameIds[doom2_hacx] = DD_DefineGame(&hacxDef);
DD_AddGameResource(GID(doom2_hacx), RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0);
-@@ -159,6 +186,9 @@ void DP_Load(void)
+@@ -178,6 +205,9 @@ void DP_Load(void)
gameIds[doom2_tnt] = DD_GameIdForKey("doom2-tnt");
gameIds[doom2_plut] = DD_GameIdForKey("doom2-plut");
gameIds[doom2_hacx] = DD_GameIdForKey("hacx");
@@ -53,7 +55,7 @@
}
--- a/doomsday/plugins/doom/include/doomdef.h
+++ b/doomsday/plugins/doom/include/doomdef.h
-@@ -73,6 +73,9 @@ typedef enum {
+@@ -74,6 +74,9 @@ typedef enum {
doom2_plut,
doom2_tnt,
doom2_hacx,
@@ -63,7 +65,7 @@
NUM_GAME_MODES
} gamemode_t;
-@@ -85,9 +88,12 @@ typedef enum {
+@@ -86,9 +89,12 @@ typedef enum {
#define GM_DOOM2_PLUT 0x20
#define GM_DOOM2_TNT 0x40
#define GM_DOOM2_HACX 0x80
diff --git a/debian/patches/install_dirs.patch b/debian/patches/install_dirs.patch
deleted file mode 100644
index 1d62cf7..0000000
--- a/debian/patches/install_dirs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/doomsday/config_unix.pri
-+++ b/doomsday/config_unix.pri
-@@ -26,7 +26,9 @@ isEmpty(PREFIX) {
- }
-
- # Binary location.
--DENG_BIN_DIR = $$PREFIX/bin
-+isEmpty(DENG_BIN_DIR) {
-+ DENG_BIN_DIR = $$PREFIX/bin
-+}
-
- # Library location.
- isEmpty(DENG_LIB_DIR) {
-@@ -43,13 +45,15 @@ isEmpty(DENG_LIB_DIR) {
- }
-
- # Target location for plugin libraries.
--DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/doomsday
-+isEmpty(DENG_PLUGIN_LIB_DIR) {
-+ DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/doomsday
-+}
-
- # When installing libraries to a non-standard location, instruct
- # the linker where to find them.
--!contains(DENG_LIB_DIR, ^/usr/.*) {
-+#!contains(DENG_LIB_DIR, ^/usr/.*) {
- QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
--}
-+#}
-
- DENG_BASE_DIR = $$PREFIX/share/doomsday
- DENG_DATA_DIR = $$DENG_BASE_DIR/data
diff --git a/debian/patches/noexample.patch b/debian/patches/noexample.patch
new file mode 100644
index 0000000..80bbe9c
--- /dev/null
+++ b/debian/patches/noexample.patch
@@ -0,0 +1,13 @@
+description: don't build unused example plugin
+
+--- a/doomsday/plugins/plugins.pro
++++ b/doomsday/plugins/plugins.pro
+@@ -4,7 +4,7 @@
+ include(../config.pri)
+
+ TEMPLATE = subdirs
+-SUBDIRS = dehread savegameconverter wadmapconverter example
++SUBDIRS = dehread savegameconverter wadmapconverter
+
+ # Games.
+ SUBDIRS += doom heretic hexen
diff --git a/debian/patches/nofsaa.patch b/debian/patches/nofsaa.patch
new file mode 100644
index 0000000..c1e9cbc
--- /dev/null
+++ b/debian/patches/nofsaa.patch
@@ -0,0 +1,13 @@
+description: turn fsaa off by default (because it doesn't work in 1.14)
+
+--- a/doomsday/libgui/modules/gui.de
++++ b/doomsday/libgui/modules/gui.de
+@@ -32,7 +32,7 @@ def setDefaults(d)
+
+ # Window manager defaults.
+ record d.window
+- d.window.fsaa = True # Remove this (should be window-specific).
++ d.window.fsaa = False # Remove this (should be window-specific).
+
+ # Configure the main window.
+ record d.window.main
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
new file mode 100644
index 0000000..8a09941
--- /dev/null
+++ b/debian/patches/paths.patch
@@ -0,0 +1,31 @@
+description: use FHS installation paths for games
+
+--- a/doomsday/config_unix.pri
++++ b/doomsday/config_unix.pri
+@@ -26,22 +26,19 @@ isEmpty(PREFIX) {
+ }
+
+ # Binary location.
+-DENG_BIN_DIR = $$PREFIX/bin
++DENG_BIN_DIR = $$PREFIX/games
+
+ # Library location.
+-isEmpty(DENG_LIB_DIR) {
+- deng_sdk: DENG_LIB_DIR = $$findLibDir($$DENG_SDK_DIR)
+- else: DENG_LIB_DIR = $$findLibDir($$PREFIX)
+-}
++DENG_LIB_DIR = $$PREFIX/lib/games
+
+ # Target location for plugin libraries.
+-DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/doomsday
++DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/plugins
+
+ # When installing libraries to a non-standard location, instruct
+ # the linker where to find them.
+ !contains(DENG_LIB_DIR, ^/usr/.*): QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
+
+-DENG_BASE_DIR = $$PREFIX/share/doomsday
++DENG_BASE_DIR = $$PREFIX/share/games/doomsday
+ DENG_DATA_DIR = $$DENG_BASE_DIR/data
+
+ DEFINES += DENG_BASE_DIR=\"\\\"$${DENG_BASE_DIR}/\\\"\"
diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch
new file mode 100644
index 0000000..af98619
--- /dev/null
+++ b/debian/patches/rpath.patch
@@ -0,0 +1,13 @@
+description: use rpath to set library search path
+
+--- a/doomsday/config_unix.pri
++++ b/doomsday/config_unix.pri
+@@ -36,7 +36,7 @@ DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/plu
+
+ # When installing libraries to a non-standard location, instruct
+ # the linker where to find them.
+-!contains(DENG_LIB_DIR, ^/usr/.*): QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
++QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
+
+ DENG_BASE_DIR = $$PREFIX/share/games/doomsday
+ DENG_DATA_DIR = $$DENG_BASE_DIR/data
diff --git a/debian/patches/series b/debian/patches/series
index 27b463f..093ec81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,8 @@
+paths.patch
+rpath.patch
+
freedoom.patch
-install_dirs.patch
-spelling_errors.patch
+
+noexample.patch
+nofsaa.patch
+fonts.path
diff --git a/debian/patches/spelling_errors.patch b/debian/patches/spelling_errors.patch
deleted file mode 100644
index 5f0004e..0000000
--- a/debian/patches/spelling_errors.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/doomsday/client/src/con_main.cpp
-+++ b/doomsday/client/src/con_main.cpp
-@@ -2095,7 +2095,7 @@ void Con_AbnormalShutdown(char const *me
-
- /// @todo Get the actual output filename (might be a custom one).
- Sys_MessageBoxWithDetailsFromFile(MBT_ERROR, DOOMSDAY_NICENAME, message,
-- "See Details for complete messsage log contents.",
-+ "See Details for complete message log contents.",
- LegacyCore_LogFile());
- }
-
---- a/doomsday/plugins/wadmapconverter/src/id1map.cpp
-+++ b/doomsday/plugins/wadmapconverter/src/id1map.cpp
-@@ -304,13 +304,13 @@ void Id1Map::load(MapLumpInfos& lumpInfo
-
- void Id1Map::transferVertexes(void)
- {
-- LOG_TRACE("Transfering vertexes...");
-+ LOG_TRACE("Transferring vertexes...");
- MPE_VertexCreatev(numVertexes, vertexes, NULL);
- }
-
- void Id1Map::transferSectors(void)
- {
-- LOG_TRACE("Transfering sectors...");
-+ LOG_TRACE("Transferring sectors...");
-
- DENG2_FOR_EACH(Sectors, i, sectors)
- {
-@@ -338,7 +338,7 @@ void Id1Map::transferSectors(void)
-
- void Id1Map::transferLinesAndSides(void)
- {
-- LOG_TRACE("Transfering lines and sides...");
-+ LOG_TRACE("Transferring lines and sides...");
- DENG2_FOR_EACH(Lines, i, lines)
- {
- uint frontIdx = 0;
-@@ -406,7 +406,7 @@ void Id1Map::transferSurfaceTints(void)
- {
- if(surfaceTints.empty()) return;
-
-- LOG_TRACE("Transfering surface tints...");
-+ LOG_TRACE("Transferring surface tints...");
- DENG2_FOR_EACH(SurfaceTints, i, surfaceTints)
- {
- uint idx = i - surfaceTints.begin();
-@@ -424,7 +424,7 @@ void Id1Map::transferPolyobjs(void)
- {
- if(polyobjs.empty()) return;
-
-- LOG_TRACE("Transfering polyobjs...");
-+ LOG_TRACE("Transferring polyobjs...");
- DENG2_FOR_EACH(Polyobjs, i, polyobjs)
- {
- MPE_PolyobjCreate((i)->lineIndices, (i)->lineCount, (i)->tag, (i)->seqType,
-@@ -436,7 +436,7 @@ void Id1Map::transferThings(void)
- {
- if(things.empty()) return;
-
-- LOG_TRACE("Transfering things...");
-+ LOG_TRACE("Transferring things...");
- DENG2_FOR_EACH(Things, i, things)
- {
- uint idx = i - things.begin();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list