[arch-commits] Commit in ffmpeg2theora/trunk (PKGBUILD scons-python3.patch)

[Antonio Rojas]

    Date: Friday, July 26, 2019 @ 18:17:35
  Author: arojas
Revision: 492955

Fix build with python3 scons

Added:
  ffmpeg2theora/trunk/scons-python3.patch
Modified:
  ffmpeg2theora/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   12 ++++---
 scons-python3.patch |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-26 18:12:22 UTC (rev 492954)
+++ PKGBUILD	2019-07-26 18:17:35 UTC (rev 492955)
@@ -11,11 +11,12 @@
 url="https://www.v2v.cc/~j/ffmpeg2theora/"
 license=('GPL')
 depends=('ffmpeg' 'libkate')
-makedepends=('python2-scons' 'git')
+makedepends=('scons' 'git')
 source=($pkgname-$pkgver::git+https://git.xiph.org/ffmpeg2theora.git#tag=${pkgver}
-        ffmpeg2theora-0.29-underlinking.patch)
+        ffmpeg2theora-0.29-underlinking.patch scons-python3.patch)
 sha256sums=('SKIP'
-            '3b937c7e3a5afe327ee75e246ef606a747b8fb5880b43a864b3b9db4a245ef7f')
+            '3b937c7e3a5afe327ee75e246ef606a747b8fb5880b43a864b3b9db4a245ef7f'
+            '1ebf868692ef2efdb4b30fbefba34cfcd2562dbce7b2acecef15d837fd7b1e6a')
 
 prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
@@ -22,16 +23,17 @@
 
   echo "#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000" >> src/ffmpeg2theora.h
   patch -p0 -i ../ffmpeg2theora-0.29-underlinking.patch
+  patch -p1 -i ../scons-python3.patch
 }
 
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
 
-  scons2
+  scons
 }
 
 package() {
   cd "${srcdir}"/$pkgname-$pkgver
 
-  scons2 install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man"
+  scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man"
 }

Added: scons-python3.patch
===================================================================
--- scons-python3.patch	                        (rev 0)
+++ scons-python3.patch	2019-07-26 18:17:35 UTC (rev 492955)
@@ -0,0 +1,77 @@
+--- ffmpeg2theora-0.30/SConstruct.orig	2019-07-26 18:13:38.624612595 +0000
++++ ffmpeg2theora-0.30/SConstruct	2019-07-26 18:15:11.695727967 +0000
+@@ -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()
+@@ -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=[