head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.22 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.20 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.18 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.16 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.14 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.12 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.10 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.8 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.6 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.4 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.2 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.3.0.46 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.44 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.42 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.40 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.38 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.36 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.34 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.32 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.30 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.28 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.26 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.24 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.22 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.18 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.20 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.16 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.14 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.12 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.10 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.8 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.6 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.4 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.2 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.2.0.16 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.12 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.10 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.8 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.6 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.4 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.2 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.1.0.10 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.8 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.6 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.4 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.2 pkgsrc-2014Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2023.07.24.15.18.38; author wiz; state Exp; branches; next 1.3; commitid dX2OhzXUa0JXh4yE; 1.3 date 2017.10.22.12.59.33; author tron; state Exp; branches; next 1.2; commitid qiVmdWkJ2xin33cA; 1.2 date 2016.01.31.02.44.23; author mef; state Exp; branches; next 1.1; commitid q5AnwpuZPL0BT1Ty; 1.1 date 2014.12.11.22.13.58; author joerg; state Exp; branches; next ; commitid RMM4I1e8wjD8KF1y; desc @@ 1.4 log @ffmpeg2theora: switch to scons4 Bump PKGREVISION just to be on the safe side. @ text @$NetBSD: patch-SConstruct,v 1.3 2017/10/22 12:59:33 tron Exp $ - Preserve environment - Fix build with scons 3.0.0 or newer --- SConstruct.orig 2016-01-10 04:35:56.000000000 +0000 +++ 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) 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) @@@@ -177,13 +177,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,11 +204,11 @@@@ 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=[ @@@@ -222,6 +222,8 @@@@ if not env.GetOption('clean'): env.Append(LIBS=['m']) elif env['static']: env.Append(LIBS=['m', 'dl']) + else: + env.Append(LIBS=['m']) env = conf.Finish() @ 1.3 log @Fix build with scons 3.0.0 or newer @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.2 2016/01/31 02:44:23 mef Exp $ d7 2 a8 2 +++ SConstruct 2017-10-22 13:56:55.000000000 +0100 @@@@ -21,7 +21,7 @@@@ d17 1 a17 1 @@@@ -38,7 +38,7 @@@@ d26 1 a26 1 @@@@ -119,29 +119,29 @@@@ d62 1 a62 1 @@@@ -177,13 +177,13 @@@@ d78 1 a78 1 @@@@ -204,11 +204,11 @@@@ d92 9 @ 1.2 log @(pkgsrc) - Add comment on patch by picking up from cvs log (upstream) - Update to 0.30 -------------- 0.30 2014-12-12 - various bugfixes - update to compile with ffmpeg 2.9 @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.1 2014/12/11 22:13:58 joerg Exp $ d3 2 a4 1 Preserve environment. d6 12 a17 3 --- SConstruct.orig 2014-12-11 21:32:11.000000000 +0000 +++ SConstruct @@@@ -37,7 +37,7 @@@@ opts.AddVariables( d26 66 @ 1.1 log @Preserve environment. @ text @d1 3 a3 1 $NetBSD$ @