[arch-commits] Commit in ffmpeg2theora/repos/community-x86_64 (5 files)

Antonio Rojas arojas at archlinux.org
Sat May 30 19:45:33 UTC 2020


    Date: Saturday, May 30, 2020 @ 19:45:31
  Author: arojas
Revision: 637500

archrelease: copy trunk to community-x86_64

Added:
  ffmpeg2theora/repos/community-x86_64/PKGBUILD
    (from rev 637499, ffmpeg2theora/trunk/PKGBUILD)
  ffmpeg2theora/repos/community-x86_64/ffmpeg2theora-0.29-underlinking.patch
    (from rev 637499, ffmpeg2theora/trunk/ffmpeg2theora-0.29-underlinking.patch)
  ffmpeg2theora/repos/community-x86_64/scons-python3.patch
    (from rev 637499, ffmpeg2theora/trunk/scons-python3.patch)
Deleted:
  ffmpeg2theora/repos/community-x86_64/PKGBUILD
  ffmpeg2theora/repos/community-x86_64/ffmpeg2theora-0.29-underlinking.patch

---------------------------------------+
 PKGBUILD                              |   77 ++++++++++++++++----------------
 ffmpeg2theora-0.29-underlinking.patch |   42 ++++++++---------
 scons-python3.patch                   |   77 ++++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 19:44:59 UTC (rev 637499)
+++ PKGBUILD	2020-05-30 19:45:31 UTC (rev 637500)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-
-pkgname=ffmpeg2theora
-pkgver=0.30
-pkgrel=4
-pkgdesc="Simple converter to create Ogg Theora files"
-arch=('x86_64')
-url="http://www.v2v.cc/~j/ffmpeg2theora/"
-license=('GPL')
-depends=('ffmpeg' 'libkate')
-makedepends=('scons' 'git')
-source=($pkgname-$pkgver::git+https://git.xiph.org/ffmpeg2theora.git#tag=${pkgver}
-        ffmpeg2theora-0.29-underlinking.patch)
-sha256sums=('SKIP'
-            '3b937c7e3a5afe327ee75e246ef606a747b8fb5880b43a864b3b9db4a245ef7f')
-
-prepare() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  echo "#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000" >> src/ffmpeg2theora.h
-  patch -p0 -i ../ffmpeg2theora-0.29-underlinking.patch
-}
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  scons
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man"
-}

Copied: ffmpeg2theora/repos/community-x86_64/PKGBUILD (from rev 637499, ffmpeg2theora/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-30 19:45:31 UTC (rev 637500)
@@ -0,0 +1,39 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+pkgname=ffmpeg2theora
+pkgver=0.30
+pkgrel=6
+pkgdesc="Simple converter to create Ogg Theora files"
+arch=('x86_64')
+url="https://www.v2v.cc/~j/ffmpeg2theora/"
+license=('GPL')
+depends=('ffmpeg' 'libkate')
+makedepends=('scons' 'git')
+source=(http://v2v.cc/~j/ffmpeg2theora/downloads/$pkgname-$pkgver.tar.bz2
+        ffmpeg2theora-0.29-underlinking.patch scons-python3.patch)
+sha256sums=('4f6464b444acab5d778e0a3359d836e0867a3dcec4ad8f1cdcf87cb711ccc6df'
+            '3b937c7e3a5afe327ee75e246ef606a747b8fb5880b43a864b3b9db4a245ef7f'
+            '1ebf868692ef2efdb4b30fbefba34cfcd2562dbce7b2acecef15d837fd7b1e6a')
+
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  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
+
+  scons
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man"
+}

Deleted: ffmpeg2theora-0.29-underlinking.patch
===================================================================
--- ffmpeg2theora-0.29-underlinking.patch	2020-05-30 19:44:59 UTC (rev 637499)
+++ ffmpeg2theora-0.29-underlinking.patch	2020-05-30 19:45:31 UTC (rev 637500)
@@ -1,21 +0,0 @@
-For example, pow() from mathlib is used directly in src/ffmpeg2theora.c:
-
-<snip>
-v = pow(v, g) * 255.0;    // mplayer's vf_eq2.c multiplies with 256 here, strange...
-</snip>
-
-For build failure and log, see Gentoo bug #504698
-
---- SConstruct
-+++ SConstruct
-@@ -206,9 +206,8 @@
-   if env['crossmingw']:
-       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
-       env.Append(LIBS=['m'])
--  elif env['static']:
--      env.Append(LIBS=['m', 'dl'])
- 
-+  env.Append(LIBS=['m', 'dl'])
- 
- env = conf.Finish()
- 

Copied: ffmpeg2theora/repos/community-x86_64/ffmpeg2theora-0.29-underlinking.patch (from rev 637499, ffmpeg2theora/trunk/ffmpeg2theora-0.29-underlinking.patch)
===================================================================
--- ffmpeg2theora-0.29-underlinking.patch	                        (rev 0)
+++ ffmpeg2theora-0.29-underlinking.patch	2020-05-30 19:45:31 UTC (rev 637500)
@@ -0,0 +1,21 @@
+For example, pow() from mathlib is used directly in src/ffmpeg2theora.c:
+
+<snip>
+v = pow(v, g) * 255.0;    // mplayer's vf_eq2.c multiplies with 256 here, strange...
+</snip>
+
+For build failure and log, see Gentoo bug #504698
+
+--- SConstruct
++++ SConstruct
+@@ -206,9 +206,8 @@
+   if env['crossmingw']:
+       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
+       env.Append(LIBS=['m'])
+-  elif env['static']:
+-      env.Append(LIBS=['m', 'dl'])
+ 
++  env.Append(LIBS=['m', 'dl'])
+ 
+ env = conf.Finish()
+ 

Copied: ffmpeg2theora/repos/community-x86_64/scons-python3.patch (from rev 637499, ffmpeg2theora/trunk/scons-python3.patch)
===================================================================
--- scons-python3.patch	                        (rev 0)
+++ scons-python3.patch	2020-05-30 19:45:31 UTC (rev 637500)
@@ -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=[


More information about the arch-commits mailing list