[arch-commits] Commit in ffmpeg2theora/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Tuesday, March 25, 2014 @ 13:02:33
  Author: bpiotrowski
Revision: 108249

upgpkg: ffmpeg2theora 0.29-5

rebuild against libx264 20140311

Added:
  ffmpeg2theora/trunk/ffmpeg2theora-0.29-underlinking.patch
Modified:
  ffmpeg2theora/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |    9 ++++++---
 ffmpeg2theora-0.29-underlinking.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-25 11:56:41 UTC (rev 108248)
+++ PKGBUILD	2014-03-25 12:02:33 UTC (rev 108249)
@@ -5,7 +5,7 @@
 # Contributor: Alexander Rødseth <rodseth at gmail.com>
 pkgname=ffmpeg2theora
 pkgver=0.29
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple converter to create Ogg Theora files"
 arch=('x86_64' 'i686')
 url="http://www.v2v.cc/~j/ffmpeg2theora/"
@@ -12,12 +12,15 @@
 license=('GPL')
 depends=('ffmpeg')
 makedepends=('scons') # 'libkate')
-source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2")
-sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d')
+source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2"
+        "ffmpeg2theora-0.29-underlinking.patch")
+sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d'
+            '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() {

Added: ffmpeg2theora-0.29-underlinking.patch
===================================================================
--- ffmpeg2theora-0.29-underlinking.patch	                        (rev 0)
+++ ffmpeg2theora-0.29-underlinking.patch	2014-03-25 12:02:33 UTC (rev 108249)
@@ -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()
+