summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/LDFLAGS.patch18
-rw-r--r--debian/patches/debian.patch44
-rw-r--r--debian/patches/homepath.patch34
-rw-r--r--debian/patches/series4
-rw-r--r--debian/patches/spelling.patch30
5 files changed, 130 insertions, 0 deletions
diff --git a/debian/patches/LDFLAGS.patch b/debian/patches/LDFLAGS.patch
new file mode 100644
index 0000000..0de9c2a
--- /dev/null
+++ b/debian/patches/LDFLAGS.patch
@@ -0,0 +1,18 @@
+Last-Update: 2012-12-31
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Description: use LDFLAGS from system environment
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -295,9 +295,9 @@
+ env['CXX'] = os.environ['CXX']
+ if os.environ.has_key('CXXFLAGS'):
+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+ if os.environ.has_key('LDFLAGS'):
+- env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++ env['__RPATH'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+
+ # windows or *nix?
+ if sys.platform == 'win32':
+ print "compiling on Windows"
diff --git a/debian/patches/debian.patch b/debian/patches/debian.patch
new file mode 100644
index 0000000..5b550ea
--- /dev/null
+++ b/debian/patches/debian.patch
@@ -0,0 +1,44 @@
+Last-Update: 2012-12-31
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Description: set prefix and path to game data file
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -14,10 +14,10 @@
+ D2XMICRO = 3
+ VERSION_STRING = ' v' + str(D2XMAJOR) + '.' + str(D2XMINOR) + '.' + str(D2XMICRO)
+
+ # installation path
+-PREFIX = str(ARGUMENTS.get('prefix', '/usr/local'))
+-BIN_SUBDIR = '/bin'
++PREFIX = str(ARGUMENTS.get('prefix', '/usr'))
++BIN_SUBDIR = '/games'
+ DATA_SUBDIR = '/share/games/d2x-rebirth'
+ BIN_DIR = PREFIX + BIN_SUBDIR
+ DATA_DIR = PREFIX + DATA_SUBDIR
+
+@@ -451,9 +451,9 @@
+ Type 'scons -c' to clean up.
+
+ Extra options (add them to command line, like 'scons extraoption=value'):
+
+- 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/local/share/games/d2x-rebirth]
++ 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/share/games/d2x-rebirth]
+ 'opengl=[0/1]' build with OpenGL support [default: 1]
+ 'opengles=[0/1]' build with OpenGL ES support [default: 0]
+ 'sdlmixer=[0/1]' build with SDL_Mixer support for sound and music (includes external music support) [default: 1]
+ 'asm=[0/1]' build with ASSEMBLER code (only with opengl=0, requires NASM and x86) [default: 0]
+--- a/INSTALL.txt
++++ b/INSTALL.txt
+@@ -101,9 +101,9 @@
+ =========================
+
+ *NIX
+ ----
+- The Sharepath (/usr/local/share/games/d1x-rebirth/ by default - if not reconfigured via SCons) or
++ The Sharepath (/usr/share/games/d2x-rebirth/ by default - if not reconfigured via SCons) or
+ ~/.d1x-rebirth or
+ another directory specified by -hogdir via d1x.ini
+
+ MacOS
diff --git a/debian/patches/homepath.patch b/debian/patches/homepath.patch
new file mode 100644
index 0000000..c7fd65b
--- /dev/null
+++ b/debian/patches/homepath.patch
@@ -0,0 +1,34 @@
+Last-Update: 2013-05-25
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: no
+Description: fix path to game data files and .ini file name
+
+--- a/INSTALL.txt
++++ b/INSTALL.txt
+@@ -101,21 +101,21 @@
+ =========================
+
+ *NIX
+ ----
+- The Sharepath (/usr/share/games/d2x-rebirth/ by default - if not reconfigured via SCons) or
+- ~/.d1x-rebirth or
+- another directory specified by -hogdir via d1x.ini
++ The Sharepath (/usr/share/games/d2x-rebirth/ by default - if not reconfigured via SCons) or
++ ~/.d2x-rebirth or
++ another directory specified by -hogdir via d2x.ini
+
+ MacOS
+ -----
+ Same directory as where the binary is located or
+- another directory specified by -hogdir via d1x.ini
++ another directory specified by -hogdir via d2x.ini
+
+ Win32
+ -----
+ Same directory as where the binary is located
+- another directory specified by -hogdir via d1x.ini
++ another directory specified by -hogdir via d2x.ini
+
+
+ Optional files:
+ ===============
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..34fbbe4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+debian.patch
+homepath.patch
+LDFLAGS.patch
+spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..38afe63
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,30 @@
+Last-Update: 2012-12-31
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: no
+Description: minor spelling corrections
+
+--- a/main/inferno.c
++++ b/main/inferno.c
+@@ -117,9 +117,9 @@
+ void print_commandline_help()
+ {
+ printf( "\n System Options:\n\n");
+ printf( " -nonicefps Don't free CPU-cycles\n");
+- printf( " -maxfps <n> Set maximum framerate to <n>\n\t\t\t\t(default: %i, availble: 1-%i)\n", MAXIMUM_FPS, MAXIMUM_FPS);
++ printf( " -maxfps <n> Set maximum framerate to <n>\n\t\t\t\t(default: %i, available: 1-%i)\n", MAXIMUM_FPS, MAXIMUM_FPS);
+ printf( " -hogdir <s> set shared data directory to <s>\n");
+ printf( " -nohogdir don't try to use shared data directory\n");
+ printf( " -use_players_dir put player files and saved games in Players subdirectory\n");
+ printf( " -lowmem Lowers animation detail for better performance with\n\t\t\t\tlow memory\n");
+--- a/d2x.ini
++++ b/d2x.ini
+@@ -1,8 +1,8 @@
+ System Options:
+
+ ;-nonicefps Don't free CPU-cycles
+-;-maxfps <n> Set maximum framerate to <n> (default: 1000, availble: 1-1000)
++;-maxfps <n> Set maximum framerate to <n> (default: 1000, available: 1-1000)
+ ;-hogdir <s> set shared data directory to <s>
+ ;-nohogdir don't try to use shared data directory
+ ;-use_players_dir put player files and saved games in Players subdirectory
+ ;-lowmem Lowers animation detail for better performance with low memory
bgstack15