Date: Tuesday, January 3, 2012 @ 04:32:57 Author: eric Revision: 145857
upgpkg: avidemux 2.5.6-1 Upstream update, Add libva support, Remove old patch Modified: avidemux/trunk/PKGBUILD Deleted: avidemux/trunk/avidemux-2.5.4-x264-build115.patch ------------------------------------+ PKGBUILD | 18 +++++--------- avidemux-2.5.4-x264-build115.patch | 45 ----------------------------------- 2 files changed, 7 insertions(+), 56 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-03 08:22:31 UTC (rev 145856) +++ PKGBUILD 2012-01-03 09:32:57 UTC (rev 145857) @@ -3,24 +3,20 @@ pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.5.5 -pkgrel=6 +pkgver=2.5.6 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ - 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz - avidemux-2.5.4-x264-build115.patch) -md5sums=('33bbe210c6826cea1987ed18a41d57a7' - '24a18b53a58b678b9e87d30566985751') + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') +options=('!makeflags') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') build() { cd "${srcdir}/${pkgbase}_${pkgver}" - - patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.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 .. @@ -43,7 +39,7 @@ package_avidemux-cli() { pkgdesc="A graphical tool to edit video (filter/re-encode/split)" - depends=('libxml2' 'sdl' 'fontconfig' 'libvpx') + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') optdepends=('lame: for the corresponding audio encoder plugin' 'faac: for the corresponding audio encoder plugin' 'faad2: for the corresponding audio decoder plugin' Deleted: avidemux-2.5.4-x264-build115.patch =================================================================== --- avidemux-2.5.4-x264-build115.patch 2012-01-03 08:22:31 UTC (rev 145856) +++ avidemux-2.5.4-x264-build115.patch 2012-01-03 09:32:57 UTC (rev 145857) @@ -1,45 +0,0 @@ -diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 -@@ -488,8 +488,10 @@ - printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8); - printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter); - printf("[x264] b_cabac = %d\n", x264Param->b_cabac); --#if X264_BUILD > 101 -+#if X264_BUILD > 101 && X264_BUILD < 115 - printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop); -+#elif X264_BUILD > 114 -+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop); - #endif - printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced); - #if X264_BUILD > 88 -diff -ru 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 2011-04-28 22:35:36.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 -@@ -417,7 +417,7 @@ - _param.b_cabac = cabac; - } - --#if X264_BUILD > 101 -+#if X264_BUILD > 101 && X264_BUILD < 115 - unsigned int x264Options::getOpenGopMode(void) - { - return _param.i_open_gop; -@@ -428,6 +428,17 @@ - if (openGopMode < 3) - _param.i_open_gop = openGopMode; - } -+#elif X264_BUILD > 114 -+unsigned int x264Options::getOpenGopMode(void) -+{ -+ return _param.b_open_gop; -+} -+ -+void x264Options::setOpenGopMode(unsigned int openGopMode) -+{ -+ if (openGopMode < 3) -+ _param.b_open_gop = openGopMode; -+} - #endif - - unsigned int x264Options::getInterlaced(void)