Fix build with scons 3.0.0 or newer

2 files changed, 83 insertions, 7 deletions

diff --git a/multimedia/ffmpeg2theora/distinfo b/multimedia/ffmpeg2theora/distinfo
index c6b016100f3..cdb88d88526 100644
--- a/multimedia/ffmpeg2theora/distinfo
+++ b/multimedia/ffmpeg2theora/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/06/04 12:41:08 tron Exp $
+$NetBSD: distinfo,v 1.8 2017/10/22 12:59:33 tron Exp $
 
 SHA1 (ffmpeg2theora-0.30.tar.bz2) = fc7ca91eb9e5e1b920273c0b2a73ae737fa5cd29
 RMD160 (ffmpeg2theora-0.30.tar.bz2) = 4f2464d43a14270ed7350e9deafa3ec9608a73fc
 SHA512 (ffmpeg2theora-0.30.tar.bz2) = 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
 Size (ffmpeg2theora-0.30.tar.bz2) = 91269 bytes
-SHA1 (patch-SConstruct) = 37ccee5d57377a4ce6b420d436afa18bb83b703b
+SHA1 (patch-SConstruct) = 3bec58615c8e855b127748bf54a523f215b41303
diff --git a/multimedia/ffmpeg2theora/patches/patch-SConstruct b/multimedia/ffmpeg2theora/patches/patch-SConstruct
index a65512b3cd5..dc2c3ad553e 100644
--- a/multimedia/ffmpeg2theora/patches/patch-SConstruct
+++ b/multimedia/ffmpeg2theora/patches/patch-SConstruct
@@ -1,10 +1,20 @@
-$NetBSD: patch-SConstruct,v 1.2 2016/01/31 02:44:23 mef Exp $
+$NetBSD: patch-SConstruct,v 1.3 2017/10/22 12:59:33 tron Exp $
 
-Preserve environment.
+- Preserve environment
+- Fix build with scons 3.0.0 or newer
 
---- SConstruct.orig	2014-12-11 21:32:11.000000000 +0000
-+++ SConstruct
-@@ -37,7 +37,7 @@ opts.AddVariables(
+--- SConstruct.orig	2016-01-10 04:35:56.000000000 +0000
++++ SConstruct	2017-10-22 13:56:55.000000000 +0100
+@@ -21,7 +21,7 @@
+ 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 @@
    BoolVariable('libkate', 'enable libkate support', 1),
    BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
  )
@@ -13,3 +23,69 @@ Preserve environment.
  Help(opts.GenerateHelpText(env))
  
  pkg_flags="--cflags --libs"
+@@ -119,29 +119,29 @@
+ 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 @@
+     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 @@
+       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=[