Changeset View
Changeset View
Standalone View
Standalone View
head/multimedia/ffmpeg2theora/files/patch-SConstruct
| --- SConstruct.orig 2012-06-25 17:15:16 UTC | --- SConstruct.orig 2016-01-10 04:35:56 UTC | ||||
| +++ SConstruct | +++ SConstruct | ||||
| @@ -37,7 +37,7 @@ opts.AddVariables( | @@ -38,7 +38,7 @@ opts.AddVariables( | ||||
| BoolVariable('libkate', 'enable libkate support', 1), | BoolVariable('libkate', 'enable libkate support', 1), | ||||
| BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0) | BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0) | ||||
| ) | ) | ||||
| -env = Environment(options = opts) | -env = Environment(options = opts) | ||||
| +env = Environment(options = opts, ENV=os.environ, CC = Split(os.environ['CC'])) | +env = Environment(options = opts, ENV=os.environ, CC = Split(os.environ['CC'])) | ||||
| Help(opts.GenerateHelpText(env)) | Help(opts.GenerateHelpText(env)) | ||||
| pkg_flags="--cflags --libs" | pkg_flags="--cflags --libs" | ||||
| @@ -151,7 +151,6 @@ if not env.GetOption('clean'): | @@ -152,7 +152,6 @@ if not env.GetOption('clean'): | ||||
| "libavcodec >= 52.30.0", | "libavcodec >= 52.30.0", | ||||
| "libpostproc", | "libpostproc", | ||||
| "libswscale", | "libswscale", | ||||
| - "libswresample", | - "libswresample", | ||||
| "libavutil", | "libavutil", | ||||
| ] | ] | ||||
| if os.path.exists("./ffmpeg"): | if os.path.exists("./ffmpeg"): | ||||
| @@ -200,9 +199,8 @@ if not env.GetOption('clean'): | @@ -214,9 +213,8 @@ if not env.GetOption('clean'): | ||||
| env.Append(CCFLAGS=[ | env.Append(CCFLAGS=[ | ||||
| '-DHAVE_ICONV' | '-DHAVE_ICONV' | ||||
| ]) | ]) | ||||
| - if conf.CheckLib('iconv'): | - if conf.CheckLib('iconv'): | ||||
| - env.Append(LIBS=['iconv']) | - env.Append(LIBS=['iconv']) | ||||
| + env.Append(LIBS=['m']) | + env.Append(LIBS=['m']) | ||||
| if env['crossmingw']: | if env['crossmingw']: | ||||
| env.Append(CCFLAGS=['-Wl,-subsystem,windows']) | env.Append(CCFLAGS=['-Wl,-subsystem,windows']) | ||||
| env.Append(LIBS=['m']) | env.Append(LIBS=['m']) | ||||