Control: tags 947558 + patch Control: tags 947558 + pending Dear maintainer,
I've prepared an NMU for d1x-rebirth (versioned as 0.58.1-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards, Stephen
diff -Nru d1x-rebirth-0.58.1/debian/changelog d1x-rebirth-0.58.1/debian/changelog
--- d1x-rebirth-0.58.1/debian/changelog 2013-08-03 22:24:22.000000000 +0200
+++ d1x-rebirth-0.58.1/debian/changelog 2020-02-01 16:24:25.000000000 +0100
@@ -1,3 +1,10 @@
+d1x-rebirth (0.58.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Allow building with Python 3. Closes: #947558.
+
+ -- Stephen Kitt <sk...@debian.org> Sat, 01 Feb 2020 16:24:25 +0100
+
d1x-rebirth (0.58.1-1) unstable; urgency=low
* New upstream release [July 2013].
diff -Nru d1x-rebirth-0.58.1/debian/patches/python3.patch d1x-rebirth-0.58.1/debian/patches/python3.patch
--- d1x-rebirth-0.58.1/debian/patches/python3.patch 1970-01-01 01:00:00.000000000 +0100
+++ d1x-rebirth-0.58.1/debian/patches/python3.patch 2020-02-01 16:22:58.000000000 +0100
@@ -0,0 +1,200 @@
+Description: Allow building with Python 3
+Author: Stephen Kitt <sk...@debian.org>
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -12,19 +12,8 @@
+ def get(self,name,value):
+ return self.ARGUMENTS.get('%s_%s' % (self.prefix, name), self.ARGUMENTS.get(name,value))
+
+-# endianess-checker
+-def checkEndian():
+- import struct
+- array = struct.pack('cccc', '\x01', '\x02', '\x03', '\x04')
+- i = struct.unpack('i', array)
+- if i == struct.unpack('<i', array):
+- return "little"
+- elif i == struct.unpack('>i', array):
+- return "big"
+- return "unknown"
+-
+ class DXXCommon:
+- __endian = checkEndian()
++ __endian = sys.byteorder
+ class UserSettings:
+ def __init__(self,ARGUMENTS):
+ # Paths for the Videocore libs/includes on the Raspberry Pi
+@@ -55,7 +44,7 @@
+ builddir_suffix = ARGUMENTS.get('builddir_suffix', None)
+ default_builddir = builddir_prefix or ''
+ if builddir_prefix is not None or builddir_suffix is not None:
+- if os.environ.has_key('CC'):
++ if 'CC' in os.environ:
+ default_builddir += '%s-' % os.path.basename(os.environ['CC'])
+ for a in (
+ ('debug', 'dbg'),
+@@ -91,7 +80,7 @@
+ osdef = '__APPLE__'
+ def __init__(self,user_settings):
+ user_settings.asm = 0
+- self.lflags = os.environ["LDFLAGS"] if os.environ.has_key('LDFLAGS') else ''
++ self.lflags = os.environ["LDFLAGS"] if 'LDFLAGS' in os.environ else ''
+ def adjust_environment(self,program,env):
+ VERSION = str(program.VERSION_MAJOR) + '.' + str(program.VERSION_MINOR)
+ if (program.VERSION_MICRO):
+@@ -129,7 +118,7 @@
+ flags = self.__pkg_config_sdl[cmd]
+ except KeyError as e:
+ if (program.user_settings.verbosebuild != 0):
+- print "%s: reading SDL settings from `%s`" % (program.PROGRAM_NAME, cmd)
++ print("%s: reading SDL settings from `%s`" % (program.PROGRAM_NAME, cmd))
+ self.__pkg_config_sdl[cmd] = env.backtick(cmd)
+ flags = self.__pkg_config_sdl[cmd]
+ env.MergeFlags(flags)
+@@ -154,31 +143,31 @@
+ self.env.Append(CPPDEFINES = ['NETWORK'])
+ # Get traditional compiler environment variables
+ for cc in ['CC', 'CXX']:
+- if os.environ.has_key(cc):
++ if cc in os.environ:
+ self.env[cc] = os.environ[cc]
+ for flags in ['CFLAGS', 'CXXFLAGS']:
+- if os.environ.has_key(flags):
++ if flags in os.environ:
+ self.env[flags] += SCons.Util.CLVar(os.environ[flags])
+
+ def check_endian(self):
+ # set endianess
+ if (self.__endian == "big"):
+- print "%s: BigEndian machine detected" % self.PROGRAM_NAME
++ print("%s: BigEndian machine detected" % self.PROGRAM_NAME)
+ self.asm = 0
+ self.env.Append(CPPDEFINES = ['WORDS_BIGENDIAN'])
+ elif (self.__endian == "little"):
+- print "%s: LittleEndian machine detected" % self.PROGRAM_NAME
++ print("%s: LittleEndian machine detected" % self.PROGRAM_NAME)
+
+ def check_platform(self):
+ # windows or *nix?
+ if sys.platform == 'win32':
+- print "%s: compiling on Windows" % self.PROGRAM_NAME
++ print("%s: compiling on Windows" % self.PROGRAM_NAME)
+ platform = self.Win32PlatformSettings
+ elif sys.platform == 'darwin':
+- print "%s: compiling on Mac OS X" % self.PROGRAM_NAME
++ print("%s: compiling on Mac OS X" % self.PROGRAM_NAME)
+ platform = self.DarwinPlatformSettings
+ else:
+- print "%s: compiling on *NIX" % self.PROGRAM_NAME
++ print("%s: compiling on *NIX" % self.PROGRAM_NAME)
+ platform = self.LinuxPlatformSettings
+ self.platform_settings = platform(self.user_settings)
+ # Acquire environment object...
+@@ -192,15 +181,15 @@
+ # opengl or software renderer?
+ if (self.user_settings.opengl == 1) or (self.user_settings.opengles == 1):
+ if (self.user_settings.opengles == 1):
+- print "%s: building with OpenGL ES" % self.PROGRAM_NAME
++ print("%s: building with OpenGL ES" % self.PROGRAM_NAME)
+ env.Append(CPPDEFINES = ['OGLES'])
+ else:
+- print "%s: building with OpenGL" % self.PROGRAM_NAME
++ print("%s: building with OpenGL" % self.PROGRAM_NAME)
+ env.Append(CPPDEFINES = ['OGL'])
+
+ # assembler code?
+ if (self.user_settings.asm == 1) and (self.user_settings.opengl == 0):
+- print "%s: including: ASSEMBLER" % self.PROGRAM_NAME
++ print("%s: including: ASSEMBLER" % self.PROGRAM_NAME)
+ env.Replace(AS = 'nasm')
+ env.Append(ASCOM = ' -f ' + str(self.platform_settings.osasmdef) + ' -d' + str(self.platform_settings.osdef) + ' -Itexmap/ ')
+ self.common_sources += asm_sources
+@@ -209,12 +198,12 @@
+
+ # SDL_mixer support?
+ if (self.user_settings.sdlmixer == 1):
+- print "%s: including SDL_mixer" % self.PROGRAM_NAME
++ print("%s: including SDL_mixer" % self.PROGRAM_NAME)
+ env.Append(CPPDEFINES = ['USE_SDLMIXER'])
+
+ # debug?
+ if (self.user_settings.debug == 1):
+- print "%s: including: DEBUG" % self.PROGRAM_NAME
++ print("%s: including: DEBUG" % self.PROGRAM_NAME)
+ env.Append(CPPFLAGS = ['-g'])
+ else:
+ env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
+@@ -242,7 +231,7 @@
+
+ # Raspberry Pi?
+ if (self.user_settings.raspberrypi == 1):
+- print "using Raspberry Pi vendor libs in %s" % self.user_settings.rpi_vc_path
++ print("using Raspberry Pi vendor libs in %s" % self.user_settings.rpi_vc_path)
+ env.Append(CPPDEFINES = ['RPI', 'WORDS_NEED_ALIGNMENT'])
+ env.Append(CPPPATH = [
+ self.user_settings.rpi_vc_path+'/include',
+@@ -293,7 +282,7 @@
+ def __init__(self,user_settings):
+ DXXCommon.LinuxPlatformSettings.__init__(self,user_settings)
+ user_settings.sharepath += '/'
+- self.lflags = os.environ["LDFLAGS"] if os.environ.has_key('LDFLAGS') else ''
++ self.lflags = os.environ["LDFLAGS"] if 'LDFLAGS' in os.environ else ''
+ def adjust_environment(self,program,env):
+ DXXCommon.LinuxPlatformSettings.adjust_environment(self, program, env)
+ self.libs = env['LIBS']
+@@ -315,7 +304,7 @@
+ self.env.Append(CPPDEFINES = [('DXX_VERSION_MAJORi', str(self.VERSION_MAJOR)), ('DXX_VERSION_MINORi', str(self.VERSION_MINOR)), ('DXX_VERSION_MICROi', str(self.VERSION_MICRO))])
+
+ def banner(self):
+- print '\n===== ' + self.PROGRAM_NAME + self.VERSION_STRING + ' =====\n'
++ print('\n===== ' + self.PROGRAM_NAME + self.VERSION_STRING + ' =====\n')
+
+ def process_user_settings(self):
+ DXXCommon.process_user_settings(self)
+@@ -328,7 +317,7 @@
+ else:
+ env.Append(FRAMEWORKS = ['OpenGL'])
+ else:
+- print "%s: building with Software Renderer" % self.PROGRAM_NAME
++ print("%s: building with Software Renderer" % self.PROGRAM_NAME)
+ self.common_sources += self.arch_sdl_sources
+
+ # SDL_mixer support?
+@@ -576,10 +565,10 @@
+ ]
+ DXXProgram.__init__(self)
+
+- sources_use_udp = [os.path.join(srcdir, 'main/net_udp.c')]
++ sources_use_udp = [os.path.join('', 'main/net_udp.c')]
+
+ # SDL_mixer sound implementation
+- arch_sdlmixer = [os.path.join(srcdir, f) for f in [
++ arch_sdlmixer = [os.path.join('', f) for f in [
+ 'arch/sdl/digi_mixer.c',
+ 'arch/sdl/digi_mixer_music.c',
+ 'arch/sdl/jukebox.c'
+@@ -587,21 +576,21 @@
+ ]
+
+ # for opengl
+- arch_ogl_sources = [os.path.join(srcdir, f) for f in [
++ arch_ogl_sources = [os.path.join('', f) for f in [
+ 'arch/ogl/gr.c',
+ 'arch/ogl/ogl.c',
+ ]
+ ]
+
+ # for non-ogl
+- arch_sdl_sources = [os.path.join(srcdir, f) for f in [
++ arch_sdl_sources = [os.path.join('', f) for f in [
+ 'arch/sdl/gr.c',
+ 'texmap/tmapflat.c'
+ ]
+ ]
+
+ # assembler related
+- asm_sources = [os.path.join(srcdir, f) for f in [
++ asm_sources = [os.path.join('', f) for f in [
+ 'texmap/tmap_ll.asm',
+ 'texmap/tmap_flt.asm',
+ 'texmap/tmapfade.asm',
diff -Nru d1x-rebirth-0.58.1/debian/patches/series d1x-rebirth-0.58.1/debian/patches/series
--- d1x-rebirth-0.58.1/debian/patches/series 2013-08-03 22:22:00.000000000 +0200
+++ d1x-rebirth-0.58.1/debian/patches/series 2020-02-01 15:03:06.000000000 +0100
@@ -1,2 +1,3 @@
debian.patch
spelling.patch
+python3.patch
signature.asc
Description: PGP signature
