Fri Dec 27 23:54:04 UTC 2013

2 files changed, 16 insertions, 17 deletions

diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index 2faa2369a..b2307f90c 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 191888 2013-08-01 06:53:22Z bpiotrowski $
+# $Id: PKGBUILD 199867 2013-11-17 12:54:00Z bpiotrowski $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
              'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
-options=('!makeflags')
+options=('!makeflags' '!emptydirs')
 source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
 sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
 
 build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
+  cd ${pkgbase}_${pkgver}
   mkdir build
   cd build
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \
@@ -26,7 +26,6 @@ build() {
 
 # plugin build expects libraries to be already installed; we fake a prefix
 # in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
   cd lib
   find ../avidemux -name '*.so*' | xargs ln -sft .
   cd ../../plugins
@@ -55,12 +54,13 @@ package_avidemux-cli() {
   conflicts=('avidemux')
   replaces=('avidemux')
 
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
+  cd ${pkgbase}_${pkgver}/build
   make DESTDIR="${pkgdir}" install
 
   cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
   make DESTDIR="${pkgdir}" install
   rm -r "${pkgdir}"/usr/share/avidemux
+  rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll}
   rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
   rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
   rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
@@ -79,7 +79,7 @@ package_avidemux-gtk() {
   depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
   install=avidemux.install
 
-  cd "${srcdir}/${pkgbase}_${pkgver}"
+  cd ${pkgbase}_${pkgver}
   install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
 
   install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
@@ -95,11 +95,11 @@ package_avidemux-gtk() {
 }
 
 package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI"
   depends=("avidemux-cli=${pkgver}" 'qt4')
   install=avidemux.install
 
-  cd "${srcdir}/${pkgbase}_${pkgver}"
+  cd ${pkgbase}_${pkgver}
   install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
   install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
   install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
@@ -113,6 +113,6 @@ package_avidemux-qt() {
   install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
 
   install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+  sed -i 's/Name=avidemux2/Name=avidemux (Qt)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
   sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
 }
diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP
index 87010d49c..ae2cd51ef 100644
--- a/extra/avidemux/PKGBUILD.WIP
+++ b/extra/avidemux/PKGBUILD.WIP
@@ -3,7 +3,7 @@
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.6.4
+pkgver=2.6.6
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,11 +14,12 @@ makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'libvdpau' 'libdca' 'fribidi' 'glu')
 options=('!makeflags' '!emptydirs')
 source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3')
-#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
-#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
+sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743')
+#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz)
+#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c')
 
 prepare() {
+#  mv 2.6_snapshot ${pkgbase}_${pkgver}
   cd ${pkgbase}_${pkgver}
   sed -i 's|avidemux2|avidemux3|' avidemux2.desktop
   sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash
@@ -26,8 +27,6 @@ prepare() {
 }
 
 build() {
-#mv snapshot_8273 ${pkgbase}_${pkgver}
-
   cd ${pkgbase}_${pkgver}
   bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins
 }
@@ -72,7 +71,7 @@ package_avidemux-gtk() {
 }
 
 package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI"
   depends=("avidemux-cli=${pkgver}" 'qt4' 'x264' 'glu')
   install=avidemux.install