avidemux-2.5.6-11.parabola1: rebuild against libvpx 1.4.0 and update PKGBUILD.WIP

2 files changed, 21 insertions, 25 deletions

diff --git a/libre/avidemux/PKGBUILD b/libre/avidemux/PKGBUILD
index fe1a65988..b5de7c520 100644
--- a/libre/avidemux/PKGBUILD
+++ b/libre/avidemux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 233096 2015-03-09 01:43:05Z eric $
+# $Id: PKGBUILD 237817 2015-04-21 00:26:23Z foutrelis $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=10.parabola1
+pkgrel=11.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
diff --git a/libre/avidemux/PKGBUILD.WIP b/libre/avidemux/PKGBUILD.WIP
index 84e3a7a40..9044c7a06 100644
--- a/libre/avidemux/PKGBUILD.WIP
+++ b/libre/avidemux/PKGBUILD.WIP
@@ -2,9 +2,8 @@
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgbase=avidemux
-pkgbase=avidemux-libre
-pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
+pkgbase=avidemux
+pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.6.8
 pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,19 +20,19 @@ sha1sums=('50f3dfe270e6272fce46d725b198b9d0dd95664b')
 #sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c')
 
 prepare() {
-#  mv 2.6_snapshot ${_pkgbase}_${pkgver}
-  cd ${_pkgbase}_${pkgver}
+#  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
   sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp
 }
 
 build() {
-  cd ${_pkgbase}_${pkgver}
+  cd ${pkgbase}_${pkgver}
   bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins
 }
 
-package_avidemux-libre-cli() {
+package_avidemux-cli() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support"
   depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
   optdepends=('lame: for the corresponding audio encoder plugin'
@@ -47,11 +46,10 @@ package_avidemux-libre-cli() {
               'qt4: for the QtScript scripting support'
               'libdca: for the corresponding audio decoder plugin'
               'fribidi: for the corresponding video filter plugin')
-  provides=('avidemux' 'avidemux-cli')
-  conflicts=('avidemux' 'avidemux-cli')
-  replaces=('avidemux' "avidemux-cli=$pkgver")
+  replaces=('avidemux-libre-cli' 'avidemux-cli-parabola')
+  conflicts=('avidemux-libre-cli' 'avidemux-cli-parabola')
 
-  cd ${_pkgbase}_${pkgver}
+  cd ${pkgbase}_${pkgver}
   (cd buildCli; make DESTDIR="${pkgdir}" install)
   (cd buildCore; make DESTDIR="${pkgdir}" install)
   (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install)
@@ -61,15 +59,14 @@ package_avidemux-libre-cli() {
   install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
 }
 
-package_avidemux-libre-gtk() {
+package_avidemux-gtk() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils')
-  replaces=('avidemux-gtk')
-  conflicts=('avidemux-gtk')
-  provides=("avidemux-gtk=$pkgver")
+  depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils')
+  replaces=('avidemux-libre-gtk' 'avidemux-gtk-parabola')
+  conflicts=('avidemux-libre-gtk' 'avidemux-gtk-parabola')
   install=avidemux.install
 
-  cd ${_pkgbase}_${pkgver}
+  cd ${pkgbase}_${pkgver}
   (cd buildGtk; make DESTDIR="${pkgdir}" install)
   (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install)
   install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
@@ -77,15 +74,14 @@ package_avidemux-libre-gtk() {
   rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
 }
 
-package_avidemux-libre-qt() {
+package_avidemux-qt() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu')
-  replaces=('avidemux-qt')
-  conflicts=('avidemux-qt')
-  provides=("avidemux-qt=$pkgver")
+  depends=("avidemux-cli=${pkgver}" 'qt4' 'x264' 'glu')
+  replaces=('avidemux-libre-qt' 'avidemux-qt-parabola')
+  conflicts=('avidemux-libre-qt' 'avidemux-qt-parabola')
   install=avidemux.install
 
-  cd ${_pkgbase}_${pkgver}
+  cd ${pkgbase}_${pkgver}
   (cd buildQt4; make DESTDIR="${pkgdir}" install)
   (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install)