[arch-commits] Commit in avidemux/repos (testing-i686 testing-i686/PKGBUILD)

[Eric Belanger]

    Date: Monday, July 28, 2008 @ 20:32:58
  Author: eric
Revision: 7244

Merged revisions 5690-7243 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/avidemux/trunk

........
  r7242 | eric | 2008-07-28 19:55:42 -0400 (Mon, 28 Jul 2008) | 2 lines
  
  upgpkg: avidemux 2.4.3-1
      upstream update, switched to cmake build system, fixed license, cleaned up PKGBUILD
........

Modified:
  avidemux/repos/testing-i686/	(properties)
  avidemux/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)


Property changes on: avidemux/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /avidemux/trunk:1-5689
   + /avidemux/trunk:1-7243

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-07-28 23:55:54 UTC (rev 7243)
+++ testing-i686/PKGBUILD	2008-07-29 00:32:58 UTC (rev 7244)
@@ -2,49 +2,27 @@
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=avidemux
-pkgver=2.4.2
-origver=$pkgver
+pkgver=2.4.3
 pkgrel=1
 pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
 arch=("i686" "x86_64")
-license=('GPL2')
+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')
-
-# neededpatchesuris=(http://download.berlios.de/avidemux/2.0.38_eq2_patch.diff)
-# neededpatches=(2.0.38_eq2_patch.diff)
-
-#source=(http://fixounet.free.fr/avidemux/$pkgname-$pkgver.tar.gz)
+makedepends=('cmake')
 options=('!makeflags')
-source=("http://download.berlios.de/avidemux/${pkgname}_$origver.tar.gz" \
-        $neededpatchesuris \
-        "avidemux.desktop")
-md5sums=('6c86fcfa491491b83e1291112fe3a3be'
-         'a9cf864c209782307afda5bc6a33a0cd')
+source=("http://download.berlios.de/avidemux/${pkgname}_$pkgver.tar.gz"  "avidemux.desktop")
+md5sums=('ff8e6ac186321e7e8bec9f8177df3724' 'a9cf864c209782307afda5bc6a33a0cd')
 
 build() {
-  cd $startdir/src/${pkgname}_$origver
-
-  # apply patches if needed:
-    if [ -n "$neededpatches" ]    # $neededpatches is not NULL
-    then
-    for i in $neededpatches; do
-        cat $startdir/src/$i | patch -d $pkgname -p0 || return 1
-    done
-    fi
-
-  # the author uses an older version of automake:
-  #autoreconf --force || return 1
-  make -f Makefile.dist || return 1
-
-  # finally, we can start building:
-  ./configure --prefix=/usr \
-	      --without-arts --without-esd
+  cd $startdir/src/${pkgname}_$pkgver
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .. || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install || return 1
+  make DESTDIR=$startdir/pkg install || return 1
 
   # freedesktop thingies
-  install -Dm644 avidemux_icon.png ${startdir}/pkg/usr/share/pixmaps/avidemux.png
+  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
-
 }