[arch-commits] Commit in recorditnow/trunk (PKGBUILD ffmpeg.patch)

[Bartłomiej Piotrowski]

    Date: Saturday, September 14, 2013 @ 09:28:46
  Author: bpiotrowski
Revision: 97146

upgpkg: recorditnow 0.8.1-7

- fix ffmpeg backend (FS#36855)

Added:
  recorditnow/trunk/ffmpeg.patch
Modified:
  recorditnow/trunk/PKGBUILD

--------------+
 PKGBUILD     |   16 +++++++++++-----
 ffmpeg.patch |   16 ++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-14 07:15:14 UTC (rev 97145)
+++ PKGBUILD	2013-09-14 07:28:46 UTC (rev 97146)
@@ -7,7 +7,7 @@
 
 pkgname=recorditnow
 pkgver=0.8.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A plugin based desktop recorder for KDE SC 4"
 arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php/RecordItNow?content=114610"
@@ -17,16 +17,22 @@
 optdepends=('mencoder: for mencoder encoder plugin'
             'recordmydesktop')
 provides=('joschy')
-conflicts=('joschy-git')
 install=recorditnow.install
 source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2"
-        "cmake.patch")
+        "cmake.patch"
+        "ffmpeg.patch")
 md5sums=('6619b4048545adbab1d13a790189e80f'
-         '74ea0ababc2291e2a62e5d045c62616a')
+         '74ea0ababc2291e2a62e5d045c62616a'
+         '867f30a0cba692c7dad56195fd64b092')
 
+prepare() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -p0 -i "${srcdir}/cmake.patch"
+  patch -p0 -i "${srcdir}/ffmpeg.patch"
+}
+
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-  patch -i "${srcdir}/cmake.patch" -p0
 
   mkdir -p build
   cd build

Added: ffmpeg.patch
===================================================================
--- ffmpeg.patch	                        (rev 0)
+++ ffmpeg.patch	2013-09-14 07:28:46 UTC (rev 97146)
@@ -0,0 +1,16 @@
+--- src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp.orig	2010-03-04 17:39:20.000000000 +0100
++++ src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp	2013-09-10 18:17:26.193834681 +0200
+@@ -120,11 +120,10 @@
+             videoQuality = 2;
+         }
+ 
+-        args << "-f" << "x11grab" << "-qscale" << QString::number(videoQuality) << "-r" << QString::number(d.fps);
++        args << "-f" << "x11grab" << "-r" << QString::number(d.fps);
+         args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height());
+         args << "-i" << DisplayString(QX11Info::display())+QString("+%1,%2").arg(geometry.x()).arg(geometry.y());
+-        args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height());
+-        args << m_tmpFile;
++        args << "-qscale" << QString::number(videoQuality) << m_tmpFile;
+         //ffmpeg -f x11grab -qscale 2 -r 20 -s 1440x900 -i :0.0 -s 1440x900 x11grab.avi
+     } else {
+