summaryrefslogtreecommitdiff
path: root/debian/patches/debian.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/debian.patch')
-rw-r--r--debian/patches/debian.patch51
1 files changed, 16 insertions, 35 deletions
diff --git a/debian/patches/debian.patch b/debian/patches/debian.patch
index 8438722..96f05a7 100644
--- a/debian/patches/debian.patch
+++ b/debian/patches/debian.patch
@@ -5,40 +5,21 @@ Description: set prefix and path to game data file
--- a/SConstruct
+++ b/SConstruct
-@@ -261,10 +261,10 @@
- class UserSettings(DXXCommon.UserSettings):
- def __init__(self,ARGUMENTS,target):
- DXXCommon.UserSettings.__init__(self, ARGUMENTS.ARGUMENTS)
+@@ -3521,7 +3521,7 @@ class DXXCommon(LazyObjectConstructor):
+ RPI_DEFAULT_VC_PATH='/opt/vc'
+ default_OGLES_LIB = 'GLES_CM'
+ default_EGL_LIB = 'EGL'
+- _default_prefix = '/usr/local'
++ _default_prefix = '/usr'
+ __stdout_is_not_a_tty = None
+ __has_git_dir = None
+ def default_poison(self):
+@@ -5039,7 +5039,7 @@ class DXXProgram(DXXCommon):
+ @property
+ def BIN_DIR(self):
# installation path
-- PREFIX = str(ARGUMENTS.get('prefix', '/usr/local'))
-- self.BIN_DIR = PREFIX + '/bin'
-+ PREFIX = str(ARGUMENTS.get('prefix', '/usr'))
-+ self.BIN_DIR = PREFIX + '/games'
- self.DATA_DIR = PREFIX + '/share/games/' + target
- # command-line parms
- self.sharepath = str(ARGUMENTS.get('sharepath', self.DATA_DIR))
+- return f'{self.prefix}/bin'
++ return f'{self.prefix}/games'
# Settings to apply to mingw32 builds
-@@ -635,9 +635,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]
- 'opengles_lib=[NAME]' specify the name of the OpenGL ES library to link against
- 'sdlmixer=[0/1]' build with SDL_Mixer support for sound and music (includes external music support) [default: 1]
---- 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
+ class Win32PlatformSettings(DXXCommon.Win32PlatformSettings):
+ def adjust_environment(self,program,env):
bgstack15