summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-11-17 15:03:40 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-11-17 15:03:40 -0200
commitafac8533e6de129c82301760d697d452e0ee9352 (patch)
treef9ba97421928cebeaa7397ae88144545fb07a531
parent70f6eaf2ac8cfd2a3aeb280dcd0143d146ba9118 (diff)
downloadabslibre-afac8533e6de129c82301760d697d452e0ee9352.tar.gz
abslibre-afac8533e6de129c82301760d697d452e0ee9352.tar.bz2
abslibre-afac8533e6de129c82301760d697d452e0ee9352.zip
avidemux-libre-2.5.6-8: updating revisions with some changes
* Fix qt reference: QT -> Qt (close FS#36716 => https://bugs.archlinux.org/task/36716) * Clean up PKGBUILD * Update PKGBUILD.WIP * Rebuild against x264 20131030
-rw-r--r--libre/avidemux-libre/PKGBUILD20
-rw-r--r--libre/avidemux-libre/PKGBUILD.WIP6
2 files changed, 13 insertions, 13 deletions
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
index cbfdf1135..81585ce70 100644
--- a/libre/avidemux-libre/PKGBUILD
+++ b/libre/avidemux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $
+# $Id: PKGBUILD 198769 2013-11-03 19:15:23Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,19 +6,19 @@ _pkgbase=avidemux
pkgbase=avidemux-libre
pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-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' '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 \
@@ -28,7 +28,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
@@ -56,12 +55,13 @@ package_avidemux-libre-cli() {
conflicts=('avidemux' 'avidemux-cli')
replaces=('avidemux' "avidemux-cli=$pkgver")
- 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
@@ -83,7 +83,7 @@ package_avidemux-libre-gtk() {
provides=("avidemux-gtk=$pkgver")
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}
@@ -99,14 +99,14 @@ package_avidemux-libre-gtk() {
}
package_avidemux-libre-qt() {
- pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support"
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
depends=("avidemux-libre-cli=${pkgver}" 'qt4')
replaces=('avidemux-qt')
conflicts=('avidemux-qt')
provides=("avidemux-qt=$pkgver")
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
@@ -120,6 +120,6 @@ package_avidemux-libre-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/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
index a6dea6acb..5496ecffb 100644
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -5,7 +5,7 @@
_pkgbase=avidemux
pkgbase=avidemux-libre
pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
-pkgver=2.6.4
+pkgver=2.6.6
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -16,7 +16,7 @@ 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')
+sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743')
#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz)
#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c')
@@ -78,7 +78,7 @@ package_avidemux-libre-gtk() {
}
package_avidemux-libre-qt() {
- pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support"
+ 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')