[arch-commits] Commit in avidemux/trunk (4 files)
Eric Bélanger
eric at archlinux.org
Sun Jan 11 22:55:03 UTC 2009
Date: Sunday, January 11, 2009 @ 17:55:03
Author: eric
Revision: 24003
upgpkg: avidemux 2.4.3-2
Rebuilt against x264 20090108, Added QT4 GUI, Added libxslt makedepends, Added man page, Added ChangeLog
Added:
avidemux/trunk/ChangeLog
avidemux/trunk/avidemux-2.4-i18n.patch
avidemux/trunk/avidemux-2.4.3-x264.patch
Modified:
avidemux/trunk/PKGBUILD
---------------------------+
ChangeLog | 7 +++++++
PKGBUILD | 37 ++++++++++++++++++++++++-------------
avidemux-2.4-i18n.patch | 33 +++++++++++++++++++++++++++++++++
avidemux-2.4.3-x264.patch | 40 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 104 insertions(+), 13 deletions(-)
Added: ChangeLog
===================================================================
--- ChangeLog (rev 0)
+++ ChangeLog 2009-01-11 22:55:03 UTC (rev 24003)
@@ -0,0 +1,7 @@
+2009-01-10 Eric Belanger <eric at archlinux.org>
+
+ * Rebuilt against x264 20090108
+ * Added QT4 GUI
+ * Added libxslt makedepends
+ * Added man page
+ * Added ChangeLog
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-01-11 22:53:09 UTC (rev 24002)
+++ PKGBUILD 2009-01-11 22:55:03 UTC (rev 24003)
@@ -1,28 +1,39 @@
# $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
pkgname=avidemux
pkgver=2.4.3
-pkgrel=1
+pkgrel=2
pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
-depends=('libxv' 'libvorbis' 'libxml2' 'gtk2>=2.10' 'alsa-lib' 'lame' 'xvidcore' 'faad2>=2.6.1' 'faac' 'sdl' 'x264>=20080625')
-makedepends=('cmake')
+depends=('libxv' 'libvorbis' 'libxml2' 'alsa-lib' 'lame' 'xvidcore' 'faad2>=2.6.1' 'faac' 'sdl' 'x264>=20090108')
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt')
+optdepends=('gtk2: for using the GTK GUI' 'qt: for using the QT4 GUI')
options=('!makeflags')
-source=("http://download.berlios.de/avidemux/${pkgname}_$pkgver.tar.gz" "avidemux.desktop")
-md5sums=('ff8e6ac186321e7e8bec9f8177df3724' 'a9cf864c209782307afda5bc6a33a0cd')
+source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz avidemux.desktop \
+ avidemux-2.4-i18n.patch avidemux-2.4.3-x264.patch)
+md5sums=('ff8e6ac186321e7e8bec9f8177df3724' 'a9cf864c209782307afda5bc6a33a0cd'\
+ 'c76ab4a1434689b5be2084c4af66298c' '632d9935e4102454f4f61c86e572e62d')
+sha1sums=('d3a4dc2c07884916c45f750229d02fbdeb3cedde'
+ 'e575817d59cd992c2b056c1ff978c23f7fa0e50b'
+ '32557519caeed3b236f48b40d5ee8953b2d03197'
+ '06fb7f651ff8b3c866785c8a9e65ced1ec395d03')
build() {
- cd $startdir/src/${pkgname}_$pkgver
+ cd ${srcdir}/${pkgname}_${pkgver}
+ patch -p1 < ../avidemux-2.4-i18n.patch || return 1
+ patch -p1 < ../avidemux-2.4.3-x264.patch || return 1
+
mkdir build
cd build
- cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .. || return 1
+ cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D NO_GTK=0 -D NO_QT4=0 .. || return 1
make || return 1
- make DESTDIR=$startdir/pkg install || return 1
+ make DESTDIR=${pkgdir} install || return 1
- # freedesktop thingies
- install -Dm644 ../avidemux_icon.png ${startdir}/pkg/usr/share/pixmaps/avidemux.png
- install -Dm644 $startdir/src/$pkgname.desktop $startdir/pkg/usr/share/applications/avidemux.desktop
+ install -D -m644 ../avidemux_icon.png ${pkgdir}/usr/share/pixmaps/avidemux.png
+ install -D -m644 ${srcdir}/avidemux.desktop ${pkgdir}/usr/share/applications/avidemux.desktop
+ install -D -m644 ../man/avidemux.1 ${pkgdir}/usr/share/man/man1/avidemux.1
}
Added: avidemux-2.4-i18n.patch
===================================================================
--- avidemux-2.4-i18n.patch (rev 0)
+++ avidemux-2.4-i18n.patch 2009-01-11 22:55:03 UTC (rev 24003)
@@ -0,0 +1,33 @@
+diff -ur avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
+--- avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300
++++ avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200
+@@ -53,7 +53,7 @@
+ {
+ printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
+
+- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
++ QString appdir = "/usr/share/avidemux/i18n/";
+
+ loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
+ loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());
+diff -ur avidemux_2.4.orig/cmake/Ts.cmake avidemux_2.4/cmake/Ts.cmake
+--- avidemux_2.4.orig/cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300
++++ avidemux_2.4/cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200
+@@ -63,7 +63,7 @@
+
+ SET(qm_files ${qm_files} ${_outXml} ${_out})
+
+- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
++ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+ ENDFOREACH(ts_input ${ts_files})
+
+ SET(${_sources} ${${_sources}} ${qm_files})
+@@ -94,7 +94,7 @@
+
+ SET(qm_files ${qm_files} ${_out})
+
+- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
++ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+ ENDFOREACH(ts_input ${ts_files})
+
+ SET(${_sources} ${${_sources}} ${qm_files})
Added: avidemux-2.4.3-x264.patch
===================================================================
--- avidemux-2.4.3-x264.patch (rev 0)
+++ avidemux-2.4.3-x264.patch 2009-01-11 22:55:03 UTC (rev 24003)
@@ -0,0 +1,40 @@
+diff -ur avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp
+--- avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09 01:45:06.048940024 -0700
++++ avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09 01:49:07.606940126 -0700
+@@ -109,8 +109,14 @@
+ MKPARAM(i_bframe,MaxBFrame);
+ MKPARAM(i_bframe_bias,Bias);
+ MKPARAM( b_bframe_pyramid,BasReference );
++#if X264_BUILD < 65
+ MKPARAM(analyse. b_bidir_me,BidirME );
++#endif
++#if X264_BUILD >= 63
++ MKPARAM( i_bframe_adaptive, Adaptative);
++#else
+ MKPARAM( b_bframe_adaptive, Adaptative);
++#endif
+ MKPARAM( analyse.b_weighted_bipred, Weighted);
+ MKPARAM( b_cabac , CABAC);
+ MKPARAM( analyse.i_trellis, Trellis);
+@@ -118,12 +124,16 @@
+ #define MIN_RDO 6
+ if(zparam->PartitionDecision+1>=MIN_RDO)
+ {
+- int rank,parity;
+- rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
+- parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
++#if X264_BUILD >= 65
++ param.analyse.i_subpel_refine = zparam->PartitionDecision + 1;
++#else
++ int rank,parity;
++ rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
++ parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
+
+- param.analyse.i_subpel_refine=rank;
+- param.analyse.b_bframe_rdo=parity;
++ param.analyse.i_subpel_refine=rank;
++ param.analyse.b_bframe_rdo=parity;
++#endif
+ }
+ MKPARAM(analyse.b_chroma_me,ChromaME);
+ MKPARAM(b_deblocking_filter,DeblockingFilter);
More information about the arch-commits
mailing list