1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
--- SConstruct.orig 2016-01-10 04:35:56 UTC
+++ SConstruct
@@ -21,7 +21,7 @@ scons_version=(1,2,0)
try:
EnsureSConsVersion(*scons_version)
except TypeError:
- print 'SCons %d.%d.%d or greater is required, but you have an older version' % scons_version
+ print('SCons %d.%d.%d or greater is required, but you have an older version' % scons_version)
Exit(2)
opts = Variables()
@@ -38,7 +38,7 @@ opts.AddVariables(
BoolVariable('libkate', 'enable libkate support', 1),
BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
)
-env = Environment(options = opts)
+env = Environment(options = opts, ENV=os.environ, CC = Split(os.environ['CC']))
Help(opts.GenerateHelpText(env))
pkg_flags="--cflags --libs"
@@ -119,29 +119,29 @@ if env["build_ffmpeg"]:
if not env.GetOption('clean'):
pkgconfig_version='0.15.0'
if not conf.CheckPKGConfig(pkgconfig_version):
- print 'pkg-config >= %s not found.' % pkgconfig_version
+ print('pkg-config >= %s not found.' % pkgconfig_version )
Exit(1)
if not conf.CheckPKG("ogg >= 1.1"):
- print 'ogg >= 1.1 missing'
+ print('ogg >= 1.1 missing')
Exit(1)
if not conf.CheckPKG("vorbis"):
- print 'vorbis missing'
+ print('vorbis missing')
Exit(1)
if not conf.CheckPKG("vorbisenc"):
- print 'vorbisenc missing'
+ print('vorbisenc missing')
Exit(1)
if not conf.CheckPKG("theoraenc >= 1.1.0"):
- print 'theoraenc >= 1.1.0 missing'
+ print('theoraenc >= 1.1.0 missing')
Exit(1)
XIPH_LIBS="ogg >= 1.1 vorbis vorbisenc theoraenc >= 1.1.0"
if not conf.CheckPKG(XIPH_LIBS):
- print 'some xiph libs are missing, ffmpeg2theora depends on %s' % XIPH_LIBS
+ print('some xiph libs are missing, ffmpeg2theora depends on %s' % XIPH_LIBS)
Exit(1)
ParsePKGConfig(env, XIPH_LIBS)
@@ -152,7 +152,6 @@ if not env.GetOption('clean'):
"libavcodec >= 52.30.0",
"libpostproc",
"libswscale",
- "libswresample",
"libavutil",
]
if os.path.exists("./ffmpeg"):
@@ -177,13 +176,13 @@ if not env.GetOption('clean'):
FFMPEG_LIBS.append('libavresample')
if not conf.CheckPKG(' '.join(FFMPEG_LIBS)):
- print """
+ print("""
Could not find %s.
You can install it via
sudo apt-get install %s
or update PKG_CONFIG_PATH to point to ffmpeg's source folder
or run ./get_ffmpeg.sh (for more information see INSTALL)
- """ %(" ".join(FFMPEG_LIBS), " ".join(["%s-dev"%l.split()[0] for l in FFMPEG_LIBS]))
+ """ %(" ".join(FFMPEG_LIBS), " ".join(["%s-dev"%l.split()[0] for l in FFMPEG_LIBS])))
Exit(1)
for lib in FFMPEG_LIBS:
@@ -204,19 +203,18 @@ if not env.GetOption('clean'):
ParsePKGConfig(env, KATE_LIBS)
env.Append(CCFLAGS=['-DHAVE_KATE', '-DHAVE_OGGKATE'])
else:
- print """
+ print("""
Could not find libkate. Subtitles support will be disabled.
You can also run ./get_libkate.sh (for more information see INSTALL)
or update PKG_CONFIG_PATH to point to libkate's source folder
- """
+ """)
if conf.CheckCHeader('iconv.h'):
env.Append(CCFLAGS=[
'-DHAVE_ICONV'
])
- if conf.CheckLib('iconv'):
- env.Append(LIBS=['iconv'])
+ env.Append(LIBS=['m'])
if env['crossmingw']:
env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
env.Append(LIBS=['m'])
|
