fceux: patch for python3-scons
This commit is contained in:
parent
135b3437f9
commit
3042033eb8
2 changed files with 112 additions and 1 deletions
111
srcpkgs/fceux/patches/scons-python-3.patch
Normal file
111
srcpkgs/fceux/patches/scons-python-3.patch
Normal file
|
@ -0,0 +1,111 @@
|
|||
backported from 878245fe Altered SCons build scripts to work with Python 3.
|
||||
diff --git SConstruct SConstruct
|
||||
--- SConstruct
|
||||
+++ SConstruct
|
||||
@@ -47,30 +47,30 @@ if platform.system == "ppc":
|
||||
# Default compiler flags:
|
||||
env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
|
||||
|
||||
-if os.environ.has_key('PLATFORM'):
|
||||
+if 'PLATFORM' in os.environ:
|
||||
env.Replace(PLATFORM = os.environ['PLATFORM'])
|
||||
-if os.environ.has_key('CC'):
|
||||
+if 'CC' in os.environ:
|
||||
env.Replace(CC = os.environ['CC'])
|
||||
-if os.environ.has_key('CXX'):
|
||||
+if 'CXX' in os.environ:
|
||||
env.Replace(CXX = os.environ['CXX'])
|
||||
-if os.environ.has_key('WINDRES'):
|
||||
+if 'WINDRES' in os.environ:
|
||||
env.Replace(WINDRES = os.environ['WINDRES'])
|
||||
-if os.environ.has_key('CFLAGS'):
|
||||
+if 'CFLAGS' in os.environ:
|
||||
env.Append(CCFLAGS = os.environ['CFLAGS'].split())
|
||||
-if os.environ.has_key('CXXFLAGS'):
|
||||
+if 'CXXFLAGS' in os.environ:
|
||||
env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split())
|
||||
-if os.environ.has_key('CPPFLAGS'):
|
||||
+if 'CPPFLAGS' in os.environ:
|
||||
env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split())
|
||||
-if os.environ.has_key('LDFLAGS'):
|
||||
+if 'LDFLAGS' in os.environ:
|
||||
env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
|
||||
-if os.environ.has_key('PKG_CONFIG_PATH'):
|
||||
+if 'PKG_CONFIG_PATH' in os.environ:
|
||||
env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
|
||||
-if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
|
||||
+if 'PKG_CONFIG_PATH' not in os.environ and env['PLATFORM'] == 'darwin':
|
||||
env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig"
|
||||
-if os.environ.has_key('PKG_CONFIG_LIBDIR'):
|
||||
+if 'PKG_CONFIG_LIBDIR' in os.environ:
|
||||
env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR']
|
||||
|
||||
-print "platform: ", env['PLATFORM']
|
||||
+print("platform: ", env['PLATFORM'])
|
||||
|
||||
# compile with clang
|
||||
if env['CLANG']:
|
||||
@@ -104,18 +104,18 @@ else:
|
||||
assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
|
||||
if env['SDL2']:
|
||||
if not conf.CheckLib('SDL2'):
|
||||
- print 'Did not find libSDL2 or SDL2.lib, exiting!'
|
||||
+ print('Did not find libSDL2 or SDL2.lib, exiting!')
|
||||
Exit(1)
|
||||
env.Append(CPPDEFINES=["_SDL2"])
|
||||
env.ParseConfig('pkg-config sdl2 --cflags --libs')
|
||||
else:
|
||||
if not conf.CheckLib('SDL'):
|
||||
- print 'Did not find libSDL or SDL.lib, exiting!'
|
||||
+ print('Did not find libSDL or SDL.lib, exiting!')
|
||||
Exit(1)
|
||||
env.ParseConfig('sdl-config --cflags --libs')
|
||||
if env['GTK']:
|
||||
if not conf.CheckLib('gtk-x11-2.0'):
|
||||
- print 'Could not find libgtk-2.0, exiting!'
|
||||
+ print('Could not find libgtk-2.0, exiting!')
|
||||
Exit(1)
|
||||
# Add compiler and linker flags from pkg-config
|
||||
config_string = 'pkg-config --cflags --libs gtk+-2.0'
|
||||
@@ -154,7 +154,7 @@ else:
|
||||
env.Append(CCFLAGS = ["-I/usr/include/lua"])
|
||||
lua_available = True
|
||||
if lua_available == False:
|
||||
- print 'Could not find liblua, exiting!'
|
||||
+ print ('Could not find liblua, exiting!')
|
||||
Exit(1)
|
||||
else:
|
||||
env.Append(CCFLAGS = ["-Isrc/lua/src"])
|
||||
@@ -168,7 +168,7 @@ else:
|
||||
gd = conf.CheckLib('gd', autoadd=1)
|
||||
if gd == 0:
|
||||
env['LOGO'] = 0
|
||||
- print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.'
|
||||
+ print('Did not find libgd, you won\'t be able to create a logo screen for your avis.')
|
||||
|
||||
if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1):
|
||||
conf.env.Append(CCFLAGS = "-DOPENGL")
|
||||
@@ -182,8 +182,8 @@ if sys.byteorder == 'little' or env['PLATFORM'] == 'win32':
|
||||
if env['FRAMESKIP']:
|
||||
env.Append(CPPDEFINES = ['FRAMESKIP'])
|
||||
|
||||
-print "base CPPDEFINES:",env['CPPDEFINES']
|
||||
-print "base CCFLAGS:",env['CCFLAGS']
|
||||
+print("base CPPDEFINES:",env['CPPDEFINES'])
|
||||
+print("base CCFLAGS:",env['CCFLAGS'])
|
||||
|
||||
if env['DEBUG']:
|
||||
env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
|
||||
diff --git src/SConscript src/SConscript
|
||||
index 4713e15..2001146 100644
|
||||
--- src/SConscript
|
||||
+++ src/SConscript
|
||||
@@ -33,7 +33,7 @@ else:
|
||||
platform_files = SConscript('drivers/sdl/SConscript')
|
||||
file_list.append(platform_files)
|
||||
|
||||
-print env['LINKFLAGS']
|
||||
+print(env['LINKFLAGS'])
|
||||
|
||||
if env['PLATFORM'] == 'win32':
|
||||
fceux = env.Program('fceux.exe', file_list)
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'fceux'
|
||||
pkgname=fceux
|
||||
version=2.2.3
|
||||
revision=2
|
||||
revision=3
|
||||
build_style=scons
|
||||
make_build_args="SYSTEM_LUA=1"
|
||||
hostmakedepends="pkg-config"
|
||||
|
|
Loading…
Reference in a new issue