[arch-commits] Commit in avidemux/trunk (PKGBUILD x264.patch)

[Ionut Biru]

    Date: Sunday, January 16, 2011 @ 10:25:29
  Author: ibiru
Revision: 106303

upgpkg: avidemux 2.5.4-2
x264 rebuild

Added:
  avidemux/trunk/x264.patch
Modified:
  avidemux/trunk/PKGBUILD

------------+
 PKGBUILD   |   11 +++++++----
 x264.patch |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-16 14:51:49 UTC (rev 106302)
+++ PKGBUILD	2011-01-16 15:25:29 UTC (rev 106303)
@@ -4,20 +4,23 @@
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
              'opencore-amr' 'yasm' 'mesa' 'libvpx')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz 2.5.4_audioDevice.patch)
-md5sums=('b849460f6480df92bfd72d1a3dc288d4' 'ef375051a12c911c6bd8a7bf85b76330')
-sha1sums=('83d6f6d87442ce4fc4e4806735ec27ef5e90364c' '95aa151acffd5b5c7b34a16e7727a4ba635c59c5')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz 2.5.4_audioDevice.patch
+        x264.patch)
+md5sums=('b849460f6480df92bfd72d1a3dc288d4'
+         'ef375051a12c911c6bd8a7bf85b76330'
+         '0d01294b8171a856f718ab8131bea074')
 
 build() {
   cd "${srcdir}/${pkgbase}_${pkgver}"
   patch -p0 < ../2.5.4_audioDevice.patch
+  patch -Np1 -i "${srcdir}/x264.patch"
   mkdir build
   cd build
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..

Added: x264.patch
===================================================================
--- x264.patch	                        (rev 0)
+++ x264.patch	2011-01-16 15:25:29 UTC (rev 106303)
@@ -0,0 +1,21 @@
+diff -Nur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2010-10-10 06:45:42.000000000 -0700
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-01-16 07:16:48.283341102 -0800
+@@ -1386,7 +1386,7 @@
+ 		case X264_WEIGHTP_NONE:
+ 			strcpy((char*)xmlBuffer, "none");
+ 			break;
+-		case X264_WEIGHTP_BLIND:
++		case X264_WEIGHTP_SIMPLE:
+ 			strcpy((char*)xmlBuffer, "blind");
+ 			break;
+ 		case X264_WEIGHTP_SMART:
+@@ -1896,7 +1896,7 @@
+ 				int weightedPredPFrames = X264_WEIGHTP_NONE;
+ 
+ 				if (strcmp(content, "blind") == 0)
+-					weightedPredPFrames = X264_WEIGHTP_BLIND;
++					weightedPredPFrames = X264_WEIGHTP_SIMPLE;
+ 				else if (strcmp(content, "smart") == 0)
+ 					weightedPredPFrames = X264_WEIGHTP_SMART;
+