[arch-commits] Commit in avidemux/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Wednesday, August 5, 2009 @ 13:12:14
  Author: eric
Revision: 49270

upgpkg: avidemux 2.5.0-2
    Switched to a svn snapshot (close FS#15751), Added library symlinks

Modified:
  avidemux/trunk/ChangeLog
  avidemux/trunk/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   41 ++++++++++++++++-------------------------
 2 files changed, 22 insertions(+), 25 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-08-05 13:25:13 UTC (rev 49269)
+++ ChangeLog	2009-08-05 17:12:14 UTC (rev 49270)
@@ -1,3 +1,9 @@
+2009-08-05  Eric Belanger  <eric at archlinux.org>
+
+	* avidemux 2.5.0-2
+	* Switched to a svn snapshot (close FS#15751)
+	* Added library symlinks
+
 2009-07-17  Eric Belanger  <eric at archlinux.org>
 
 	* avidemux 2.5.0-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-05 13:25:13 UTC (rev 49269)
+++ PKGBUILD	2009-08-05 17:12:14 UTC (rev 49270)
@@ -4,14 +4,14 @@
 
 pkgname=avidemux
 pkgver=2.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
-depends=( 'libxv' 'libxml2' 'sdl')
+depends=('libxv' 'libxml2' 'sdl')
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack-audio-connection-kit' 'libdca' 'esound' \
-             'libvorbis' 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate')
+             'libvorbis' 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' 'subversion')
 optdepends=('gtk2: for using the GTK GUI' \
             'qt: for using the QT4 GUI' \
             'lame, faac: for the corresponding audio encoder plugin' \
@@ -19,31 +19,19 @@
             'esound, jack-audio-connection-kit: for the corresponding audio device plugin' \
             'x264, xvidcore: for the corresponding video encoder plugin')
 options=('!makeflags')
-source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz \
-        avidemux.desktop avidemux-2.5.0-gcc-4.4.patch avidemux-plugins-2.5.0-gcc-4.4.patch \
-        avidemux-2.5-i18n.patch avidemux-2.5.0-format-strings.patch \
-        avidemux_2.5.0-underlinking.patch avidemux_2.5.0-wrong-include.patch)
-md5sums=('69624352ac4e4cbb507e02b2bace5f56' 'a9cf864c209782307afda5bc6a33a0cd'\
-         'ba2a8dccd6f9feaa0edf70dd341cea5b' 'cfda32c031dedc9c1ea1ec1e5d61a7f6'\
-         '0adb7cee81e06bfc454baf1d8fbcdd64' 'd78352e32ba2544a51f34ba9858de28e'\
-         '65d9ac8381b5db24a64edf23ea843c49' '37feb1fcdc3323e8b3734c209e9c0fa3')
-sha1sums=('9697f1a54006e362a361aa609d3bdc1065676fb2'
-          'e575817d59cd992c2b056c1ff978c23f7fa0e50b'
-          '98919d1779ede3d739cd7fc7292d42d1a89f5a7e'
-          'c1ff1e952d2078df5f7097fb6db14df5dfa3d814'
-          'd510ca55cd1b9c162b4c3bcd224a80b6a18421ef'
-          '963919986fc778972432db9460dbffca0368d739'
-          'e7358a93f643403ef95b6072c9311d59a0c40a7d'
-          '233a5c63d81aa86d85e9aafc926a729d3216478b')
+source=(ftp://ftp.archlinux.org/other/avidemux/avidemux_2.5_svn5205.tbz \
+        avidemux-2.5-i18n.patch)
+md5sums=('f0d89accf46e599e0b329322f3add740' '0adb7cee81e06bfc454baf1d8fbcdd64')
+sha1sums=('5179f095e74ee3329bb867bdd4e8663fc4488c06' 'd510ca55cd1b9c162b4c3bcd224a80b6a18421ef')
 
 build() {
   cd "${srcdir}/${pkgname}_${pkgver}"
-  patch -p1 < ../avidemux-2.5.0-gcc-4.4.patch || return 1
+#  patch -p1 < ../avidemux-2.5.0-gcc-4.4.patch || return 1
   patch -p1 < ../avidemux-2.5-i18n.patch || return 1
-  patch -p1 < ../avidemux-2.5.0-format-strings.patch || return 1
-  patch -p1 < ../avidemux_2.5.0-underlinking.patch || return 1
-  patch -p1 < ../avidemux_2.5.0-wrong-include.patch || return 1
-  patch -p1 < ../avidemux-plugins-2.5.0-gcc-4.4.patch || return 1
+###  patch -p1 < ../avidemux-2.5.0-format-strings.patch || return 1
+###  patch -p1 < ../avidemux_2.5.0-underlinking.patch || return 1
+###  patch -p1 < ../avidemux_2.5.0-wrong-include.patch || return 1
+#  patch -p1 < ../avidemux-plugins-2.5.0-gcc-4.4.patch || return 1
 
   mkdir build
   cd build
@@ -65,7 +53,10 @@
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 
+  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
+  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
+
   install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" || return 1
-  install -D -m644 "${srcdir}/avidemux.desktop" "${pkgdir}/usr/share/applications/avidemux.desktop" || return 1
+  install -D -m644 ../../avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux.desktop" || return 1
   install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" || return 1
 }