Mon Nov 4 01:26:54 PST 2013

4 files changed, 21 insertions, 15 deletions

diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 88a87a2f3..3c81ee687 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198679 2013-11-02 02:19:38Z eric $
+# $Id: PKGBUILD 198752 2013-11-03 00:30:32Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
 pkgver=6.8.7.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
@@ -27,12 +27,15 @@ prepare() {
 
 build() {
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
+  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
+
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
     --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
     --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
     --enable-opencl --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw 
+    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
  make
 }
 
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index cdefb4720..31ab30360 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171531 2012-11-18 12:48:44Z ronald $
+# $Id: PKGBUILD 198759 2013-11-03 11:28:03Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -7,7 +7,7 @@
 pkgbase=lapack
 pkgname=('lapack' 'blas')
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran' 'cmake')
@@ -29,23 +29,25 @@ build() {
     -DCMAKE_SKIP_RPATH=ON \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_Fortran_COMPILER=gfortran
+    -DCMAKE_Fortran_COMPILER=gfortran \
+    -DLAPACKE=ON
   make
 }
 
 package_lapack() {
   depends=("blas=${pkgver}")
 
-  install -m755 -d ${pkgdir}/usr/{lib,bin}
+  install -m755 -d ${pkgdir}/usr/{lib,bin,include}
   
-  for libname in liblapack libtmglib; do
+  for libname in liblapack libtmglib liblapacke; do
     install -m755 "${srcdir}/build/lib/${libname}.so" \
       "${pkgdir}/usr/lib/"
-    ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}"
-    ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.3"
+    ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}"
+    ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.3"
   done
   
   install -m755 ${srcdir}/build/bin/* ${pkgdir}/usr/bin
+  install -m644 ${srcdir}/build/include/* ${pkgdir}/usr/include
   install -m755 -d "${pkgdir}/usr/share/licenses/lapack"
   install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
     "${pkgdir}/usr/share/licenses/lapack/"
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index e8866c165..105a060ad 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 196980 2013-10-21 12:13:11Z andrea $
+# $Id: PKGBUILD 198755 2013-11-03 09:14:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
 pkgver=0.9.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat')
 makedepends=('cmake' 'boost')
+options=('staticlibs') # libindiclient builds as static only
 source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
 md5sums=('c1456544a36f543e2884f88913cf3eb0')
 
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 4e086ad51..654f69a43 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196286 2013-10-10 15:22:37Z giovanni $
+# $Id: PKGBUILD 198757 2013-11-03 10:27:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.7.2
+pkgver=2.8
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('ec00ddc6aadfea1e11b23650cb741d53'
+md5sums=('76b565f48000e9f331356ab107a5bcbb'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {