mirror of
https://git.freebsd.org/ports.git
synced 2025-06-10 23:30:29 -04:00
7abf753080
- Update to 0.30 - Remove patch-ffmpeg2 (not needed now that 0.30 uses new FFmpeg API) - Tidy up remaining patches (pet portlint) Changes this release: https://git.xiph.org/?p=ffmpeg2theora.git;a=blob;f=ChangeLog;h=7b2c20e19e4ca6d042d8f2bb3d4491e513d422fa;hb=ff86d204adf335b6314ef568b08d4af8799f108d This new version also allows ffmpeg2theora to build successfully once multimedia/ffmpeg is updated to 3.0.x. Note that multimedia/ffmpeg is currently still on the 2.8.x branch, however this update is backwards compatible with ffmpeg 2.8.x. PR: 209375 Approved by: wg (maintainer timeout), mat (mentor) Differential Revision: https://reviews.freebsd.org/D6784
30 lines
941 B
Text
30 lines
941 B
Text
--- SConstruct.orig 2016-01-10 04:35:56 UTC
|
|
+++ SConstruct
|
|
@@ -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"
|
|
@@ -152,7 +152,6 @@ if not env.GetOption('clean'):
|
|
"libavcodec >= 52.30.0",
|
|
"libpostproc",
|
|
"libswscale",
|
|
- "libswresample",
|
|
"libavutil",
|
|
]
|
|
if os.path.exists("./ffmpeg"):
|
|
@@ -214,9 +213,8 @@ if not env.GetOption('clean'):
|
|
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'])
|