Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: extra/mesa/PKGBUILD extra/nmap/PKGBUILD extra/openmpi/PKGBUILD extra/rasqal/PKGBUILD extra/sqlite/PKGBUILD extra/totem/PKGBUILD extra/xorg-server/PKGBUILD multilib/lib32-e2fsprogs/PKGBUILD multilib/lib32-libcups/PKGBUILD multilib/lib32-mesa/PKGBUILD staging/libreoffice/PKGBUILD testing/udev/PKGBUILD testing/udev/initcpio-hooks-udev testing/udev/initcpio-install-udev
author: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-05-23 13:22:09 -0300
committer: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-05-23 13:22:09 -0300
commit: 2906c522e750f7e013d7af606f01ad849a7d3876 (patch)
tree: d62491c93d6534817db7f9b7d07adf64b9670b48 /extra
parent: 193046ad8ed67a836ffe11e235296e6201e56ce8 (diff)
parent: bd614ac21d2754d778a796cd5e92d1568ec8baec (diff)
23 files changed, 205 insertions, 131 deletions
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 04e2f16cd..f8b8fd41b 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151738 2012-03-01 21:58:23Z bisson $
+# $Id: PKGBUILD 159348 2012-05-22 02:25:46Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,8 +6,8 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.0
-_pkgver=9.9.0
+pkgver=9.9.1
+_pkgver=9.9.1
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
@@ -25,7 +25,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
+sha1sums=('c963de85ba6f55d7615471b29b356efe6c844e9c'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           '18f477f510df31e6c6f547ee2d5fc46e973479bf'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 9ce3fafeb..26ee11a6f 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 151562 2012-02-27 18:02:08Z dan $
+# $Id: PKGBUILD 159263 2012-05-19 22:02:41Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64 'mips64el')
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('5ff66c50ca9288d9a3d695a031f6950c')
-sha1sums=('7f4348418dc3efefd357b32a2b5c8010211ab284')
+md5sums=('d79e54453b313c3200d2c2bf677edd7d')
+sha1sums=('239ae65b521ce09a36a68a48d85a84217233be87')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 09fa101ed..0a7072c58 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159026 2012-05-15 10:34:53Z heftig $
+# $Id: PKGBUILD 159319 2012-05-21 16:13:22Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.4.2
+pkgver=3.4.2.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,8 +18,8 @@ optdepends=('telepathy-gabble: XMPP/Jabber support'
 options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e68936811d52c0b5419c93a87a81429b09f944d3f6cd65eb1554e6c7d489de32')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('e73a30259492860d5c93213b33f8850b8a45053222062fd6e2784ba447d9cce0')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index ed5a81393..432db4f56 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156746 2012-04-23 09:04:34Z ibiru $
+# $Id: PKGBUILD 159282 2012-05-20 21:18:36Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('01f5763340f9fac0994f689ea6655c2c9760bddd77bbd8628b9c6075d9b6ed0d')
+sha256sums=('fb5b0d48c4d8725031d023fd6a054c10cb9f166cd430db7fc2383d8d2af5d615')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index 1b6bc3143..e931b2a3a 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
@@ -12,14 +12,18 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
 source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-        'ffmpegthumbnailer.desktop')
+        'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch')
 options=('!libtool')
 sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53')
+          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
+          '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Don't use deprecated (removed?) ffmpeg api
+  patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
+
   ./configure --prefix=/usr --enable-gio
   make
 }
@@ -29,6 +33,7 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # FS#24105: Generate thumbnails in nautilus
+  # FS#26540: Rename to .thumbnailer for nautilus
   install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop"
+    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
 }
diff --git a/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
new file mode 100644
index 000000000..37e65b059
--- /dev/null
+++ b/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
@@ -0,0 +1,56 @@
+--- libffmpegthumbnailer/moviedecoder.cpp.old	2012-05-20 11:57:04.503450287 +0200
++++ libffmpegthumbnailer/moviedecoder.cpp	2012-05-20 11:57:14.633450566 +0200
+@@ -58,19 +58,26 @@
+ void MovieDecoder::initialize(const string& filename)
+ {
+     av_register_all();
+-    avcodec_init();
+     avcodec_register_all();
+ 
+     string inputFile = filename == "-" ? "pipe:" : filename;
+     m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
+-
++    
++#if LIBAVCODEC_VERSION_MAJOR < 53
+     if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
++#else
++	if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
++#endif
+     {
+ 		destroy();
+         throw logic_error(string("Could not open input file: ") + filename);
+     }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 53
+     if (av_find_stream_info(m_pFormatContext) < 0)
++#else
++	if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
++#endif
+     {
+ 		destroy();
+         throw logic_error(string("Could not find stream information"));
+@@ -90,8 +97,12 @@
+ 
+     if ((!m_FormatContextWasGiven) && m_pFormatContext)
+     {
++#if LIBAVCODEC_VERSION_MAJOR < 53
+         av_close_input_file(m_pFormatContext);
+         m_pFormatContext = NULL;
++#else
++        avformat_close_input(&m_pFormatContext);
++#endif
+     }
+ 
+     if (m_pPacket)
+@@ -159,7 +170,11 @@
+ 
+     m_pVideoCodecContext->workaround_bugs = 1;
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 53
+     if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
++#else
++	if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
++#endif
+     {
+         throw logic_error("Could not open video codec");
+     }
diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD
index f70d86843..c689801ea 100644
--- a/extra/fftw/PKGBUILD
+++ b/extra/fftw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154980 2012-04-01 07:06:27Z ronald $
+# $Id: PKGBUILD 159277 2012-05-20 10:35:50Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=fftw
-pkgver=3.3.1
+pkgver=3.3.2
 pkgrel=1
 pkgdesc="A library for computing the discrete Fourier transform (DFT)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('gcc-fortran')
 options=('!libtool')
 source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz")
 install=fftw.install
-sha1sums=('3fecc492f576503a6a509d2073bd82b3fe0aef13')
+sha1sums=('11a8c31186ff5a7d686a79a3f21b2530888e0dc2')
 
 # notes:
 # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
@@ -39,7 +39,7 @@ build() {
   CFLAGS+=" -O3 -fomit-frame-pointer $aligndouble -fstrict-aliasing -ffast-math"
 
   CONFIGURE="./configure F77=gfortran --prefix=/usr \
-                 --enable-shared --enable-threads"
+                 --enable-shared --enable-threads --enable-type-prefix"
 
   msg "Build & install double precision"
   $CONFIGURE $sse2
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 6cdf95dfa..34f095ef6 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152254 2012-03-06 02:06:32Z stephane $
+# $Id: PKGBUILD 159285 2012-05-20 22:11:18Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('911d2ba77fa968c3c72caf75a9e21637f3677acc')
+sha1sums=('2c2ca4101b4ea6782393b555a320c566da50cb68')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD
index 77579187a..e004e6e6f 100644
--- a/extra/libzrtpcpp/PKGBUILD
+++ b/extra/libzrtpcpp/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 159158 2012-05-16 20:39:07Z andrea $
+# $Id: PKGBUILD 159301 2012-05-21 09:44:12Z andrea $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Michel Brabants <michel.brabants@euphonynet.be>
 
 pkgname=libzrtpcpp
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.1.2
+pkgrel=1
 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification"
 arch=('i686' 'x86_64')
 url='http://www.gnutelephony.org/index.php/GNU_ZRTP'
 license=('GPL3')
 depends=('ccrtp')
 makedepends=('cmake')
-source=("ftp://ftp.gnu.org/pub/gnu/ccrtp/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('dc1501e7e8a46a1608fc3820c7476727'
-         '7216f652aa2e080de114e02a85127dbc')
+source=("https://github.com/downloads/wernerd/ZRTPCPP/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('2f78cffbdb0f3e0ee92609fc01a1b6c5')
 
 build() {
   sed 's/lib64/lib/g' -i "${srcdir}"/${pkgname}-${pkgver}/CMakeLists.txt
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 9e55dd5c8..ca6df82a1 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158924 2012-05-13 10:20:49Z giovanni $
+# $Id: PKGBUILD 159279 2012-05-20 14:16:33Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.05.11
+pkgver=2012.05.17
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('6ffb354005fe211dd455042f2e0c6564')
+md5sums=('e46d6070d7043b67c776389276d8bfed')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 415735e2b..0241dde0e 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156089 2012-04-13 11:14:35Z juergen $
+# $Id: PKGBUILD 159253 2012-05-19 18:59:08Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
-pkgver=5.26.0
-pkgrel=3
+pkgver=5.27.0
+pkgrel=1
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
 install=maxima.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('bc7448486478b217c333605c6d8f6c0bbdd3526c'
+sha1sums=('8d8d0b3db27f002986cff5429dea96ada46a0576'
           '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index cd68b1608..ccb56dd53 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154038 2012-03-21 20:31:55Z andyrtr $
+# $Id: PKGBUILD 159247 2012-05-19 08:19:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel')
-[[ "$CARCH" != "mips64el" ]] && pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+[[ "$CARCH" != "mips64el" ]] && pkgname+=( 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
 
 #_git=true
 _gitdate=20111031
@@ -14,7 +14,7 @@ if [ "${_git}" = "true" ]; then
     pkgver=7.10.99.git20110709
     #pkgver=7.11
   else
-    pkgver=8.0.2
+    pkgver=8.0.3
 fi
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -35,9 +35,6 @@ if [ "${_git}" = "true" ]; then
 )
 fi
 source+=(mesa-loongson.patch)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'a368104e5700707048dc3e8691a9a7a1'
-         '598c24dccfcdcc99c07d883f7c09f36a')
 
 build() {
     cd ${srcdir}/?esa-*
@@ -53,7 +50,8 @@ if [ "${_git}" = "true" ]; then
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --enable-gallium-egl --enable-shared-glapi\
+    --enable-shared-glapi \
+    --enable-gbm \
     --enable-glx-tls \
     --enable-glx \
     --enable-osmesa \
@@ -64,13 +62,15 @@ if [ "${_git}" = "true" ]; then
     --enable-xa \
     $extraconf
     
+    #--enable-gbm \
     #    --enable-gallium-svga \
     
   else
      autoreconf -vfi
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --enable-gallium-egl --enable-shared-glapi\
+    --enable-shared-glapi \
+    --enable-gbm \
     --enable-glx-tls \
     --enable-glx \
     --enable-osmesa \
@@ -132,6 +132,20 @@ package_libglapi() {
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
 }
 
+package_libgbm() {
+  depends=('glibc')
+  pkgdesc="Mesa gbm library"
+
+  cd ${srcdir}/?esa-*   
+  install -m755 -d "${pkgdir}/usr/lib"
+  bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
+}
+
 package_libgles() {
   depends=('libglapi' 'khrplatform-devel')
   pkgdesc="Mesa GLES libraries and headers"
@@ -200,11 +214,12 @@ package_mesa() {
 
   rm -f "${pkgdir}/usr/lib/libGL.so"*
   rm -f "${pkgdir}/usr/lib/libglapi.so"*
+  rm -f "${pkgdir}/usr/lib/libgbm.so"*
   rm -f "${pkgdir}/usr/lib/libGLESv"*
   rm -f "${pkgdir}/usr/lib/libEGL"*
   rm -rf "${pkgdir}/usr/lib/egl"
   rm -f "${pkgdir}/usr/lib/libOSMesa"*
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc}
+  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
   rm -rf "${pkgdir}/usr/lib/xorg"
   rm -f "${pkgdir}/usr/include/GL/glew.h"
   rm -f "${pkgdir}/usr/include/GL/glxew.h"
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index 5762345ec..5c814321d 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,45 +1,41 @@
-# $Id: PKGBUILD 149962 2012-02-11 23:31:11Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# $Id: PKGBUILD 159344 2012-05-22 00:00:17Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=nmap
-pkgver=5.51
-pkgrel=3.1
-pkgdesc="A network exploration tool and security/port scanner"
+pkgver=6.00
+pkgrel=1
+pkgdesc='Utility for network discovery and security auditing'
+url='http://nmap.org/'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://nmap.org"
 license=('GPL')
-depends=('pcre' 'openssl' 'libpcap' 'lua')
-# python is needed for zenmap
-makedepends=('python2')
-optdepends=('pygtk: gui for nmap')
 options=('!makeflags')
-source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0b80d2cb92ace5ebba8095a4c2850275')
+optdepends=('pygtk: zenmap')
+makedepends=('pygtk')
+depends=('pcre' 'openssl' 'libpcap' 'lua')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('11d8f418e31a85e5b5ad6b4cf98f3c1b5c19ddb2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop 
-  echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop 
+	# Show icon only if runnable; see FS#12045
+	echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop 
+	echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop 
 
-  # Force usage of external libpcap
-  # OSX bug check fails because of missing types
-  # autoreconf fails because our autotools are too new (?)
-  sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--mandir=/usr/share/man \
 
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --libexecdir=/usr/lib
-  make
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # remove zenmap uninstall script
-  rm "${pkgdir}/usr/bin/uninstall_zenmap"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
-  # install custom GPL2 license
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+	rm "${pkgdir}"/usr/bin/uninstall_zenmap
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index e980fed3f..b8de218c1 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158183 2012-05-03 13:22:34Z stephane $
+# $Id: PKGBUILD 159287 2012-05-20 22:11:21Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
-pkgver=1.5.5
-pkgrel=3
+pkgver=1.6
+pkgrel=2
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org"
@@ -11,10 +11,10 @@ depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc')
 [ "$CARCH" = "mips64el" ] || depends+=('valgrind')
 makedepends=('inetutils')
 options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2
-        openmpi-1.5.4-fix-fakeroot-execution.patch)
-sha1sums=('206e555f6d376443f2342f721d944e67dd1a04ef'
-          'ec46abb6f9e01daca910e4079b9abc036db9ed20')
+source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2
+        openmpi-hostfile.patch)
+sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367'
+          'a76da03418a106d57cfd020d0f8d887d7ec9225b')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,13 +24,12 @@ build() {
    else
      valgrind="--with-valgrind"
    fi
-
-   # Fix fakeroot problem (FS#28644)
-   patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch
-   
    # Make sure we use the system ltdl librariry rather than the ones in the tarball
    rm -r opal/libltdl
 
+   # Search for openmpi-default-hostfile in /etc/openmpi
+   patch -Np1 -i ../openmpi-hostfile.patch
+
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
                --mandir=/usr/share/man \
diff --git a/extra/openmpi/openmpi-hostfile.patch b/extra/openmpi/openmpi-hostfile.patch
new file mode 100644
index 000000000..f6377674b
--- /dev/null
+++ b/extra/openmpi/openmpi-hostfile.patch
@@ -0,0 +1,12 @@
+diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
+--- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile	2012-04-24 13:18:21.000000000 -0600
++++ openmpi-1.6/orte/runtime/orte_mca_params.c	2012-05-15 16:35:24.769565442 -0600
+@@ -225,7 +225,7 @@ int orte_register_params(void)
+                                 false, false, 1000, &orte_timeout_usec_per_proc);
+     
+     /* default hostfile */
+-    asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
++    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
+     mca_base_param_reg_string_name("orte", "default_hostfile",
+                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
+                                    false, false, orte_default_hostfile, &orte_default_hostfile);
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index bba892fbc..3072c0611 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157140 2012-04-24 22:10:55Z bisson $
+# $Id: PKGBUILD 159315 2012-05-21 13:58:46Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
-pkgver=2.9.2
+pkgver=2.9.3
 pkgrel=1
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
@@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('fda7ec5ac79300577f61a68561171bd501b1b20c'
+sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index 5f0c56680..a1f63c3b5 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152250 2012-03-06 01:50:30Z stephane $
+# $Id: PKGBUILD 159295 2012-05-21 01:39:56Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-egenix-mx-base
 _origname=egenix-mx-base
-pkgver=3.2.3
+pkgver=3.2.4
 pkgrel=1
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('python2')
 replaces=('egenix-mx-base')
 provides=('egenix-mx-base')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('6f56a301859b8f9513141fbeeca3e537e082aa53')
+sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index 5e58afc6f..9cd293b53 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 142916 2011-11-18 08:48:56Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 159309 2012-05-21 11:10:25Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lawrence Lee <valheru@facticius.net>
 
 pkgname=rasqal
 epoch=1
-pkgver=0.9.28
+pkgver=0.9.29
 pkgrel=1
 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
 url="http://librdf.org/rasqal"
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('raptor>=2.0.3' 'mpfr')
+depends=('raptor' 'mpfr')
 options=('!libtool')
 source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a3662b8d9efef9d8ef0a3c182450fba2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -25,10 +25,11 @@ build() {
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make -k check || /bin/true # fails some checks - should be reported upstream
+  make -k check || true # still fails some checks
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
+md5sums=('49e4b75a0c67465edf55dd20606715fa')
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index 4f1fe455e..b15e23f42 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144455 2011-12-06 03:46:24Z bisson $
+# $Id: PKGBUILD 159299 2012-05-21 08:16:43Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
-pkgver=1.7.2.0
+pkgver=1.7.2.1
 pkgrel=1
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
@@ -12,7 +12,7 @@ license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('readline' 'openssl')
 source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('32181b08aa91309ee368e1e36a2cb337eedc425a')
+sha1sums=('6e3328cc409550b2367efa8028fe4436e84eb490')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 544efc0a7..c4af9200b 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159008 2012-05-14 20:33:16Z andyrtr $
+# $Id: PKGBUILD 159275 2012-05-20 10:17:15Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -8,7 +8,7 @@ _amalgamationver=3071200
 _amalgamationver2=${_amalgamationver/00/}
 #pkgver=${_amalgamationver2//0/.}
 pkgver=3.7.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -43,7 +43,7 @@ package_sqlite() {
  pkgdesc="A C library that implements an SQL database engine"
  depends=('readline')
  provides=("sqlite3=$pkgver")
- replaces=("sqlite3=$pkgver")
+ replaces=("sqlite3")
  
   cd ${srcdir}/sqlite-autoconf-$_amalgamationver
   make DESTDIR=${pkgdir} install
@@ -55,9 +55,9 @@ package_sqlite() {
 package_sqlite-tcl() {
  
  pkgdesc="sqlite Tcl Extension Architecture (TEA)"
- depends=('sqlite>=3.7.5')
+ depends=('sqlite')
  provides=("sqlite3-tcl=$pkgver")
- replaces=("sqlite3-tcl=$pkgver")
+ replaces=("sqlite3-tcl")
  
   cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
   make DESTDIR=${pkgdir} install
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index da36a746e..8adb828b5 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159098 2012-05-15 15:11:50Z ibiru $
+# $Id: PKGBUILD 159297 2012-05-21 06:53:17Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,12 +13,12 @@ license=('GPL2' 'custom')
 depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
          'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
          'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
-         'clutter-gtk' 'mx' 'python2-gobject' 'pylint')
+         'clutter-gtk' 'mx' 'python2-gobject')
 makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils'
-             'libepc' 'bluez' 'vala' 'grilo')
+             'libepc' 'bluez' 'vala' 'grilo' 'pylint')
 [ "$CARCH" = "mips64el" ] && {
 makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner'
-             'libepc' 'bluez' 'vala' 'grilo')
+             'libepc' 'bluez' 'vala' 'grilo' 'pylint')
 }
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 8e0469de5..5564ee1de 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=wxmaxima
-pkgver=12.01.0
+pkgver=12.04.0
 pkgrel=1
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
 install=wxmaxima.install
-sha1sums=('d80002ddea3260b0f3315072f23b4bb3cce3a10a')
+sha1sums=('f29134a212db77e3087321bc944e346e6976cb40')
 
 build() {
   cd "${srcdir}/wxMaxima-${pkgver}"
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index f7b20cd68..a35c4b65c 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159237 2012-05-18 15:27:59Z andyrtr $
+# $Id: PKGBUILD 159267 2012-05-20 08:22:19Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.1.901
-pkgrel=3
+pkgver=1.12.1.902
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -17,21 +17,12 @@ options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
-        EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
-        git-fixes.patch
+        #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+        #git-fixes.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
 	loongson.patch)
-sha1sums=('bb9985bae271aa896de7fa12e49a0dbd8e244d2c'
-          '63836e5cfb4ae7353fb2e31239a544409c7ead32'
-          '175de5630b43dbc97778adfba5563b7fdd77f11f'
-          '4acb39587f73bcbb9a331377d6ef99cb73eb95a8'
-          '526cbffbc742dc3449065e3501d290a607d80aa3'
-          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
-          '6838fc00ef4618c924a77e0fb03c05346080908a'
-          '993798f3d22ad672d769dae5f48d1fa068d5578f'
-          'ac016ff8e3adfbd584fe16a770f6891724e254f4')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -48,7 +39,7 @@ build() {
 #  patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
 
   # Add post-release patches from 1.12 branch
-  patch -Np1 -i ${srcdir}/git-fixes.patch
+#  patch -Np1 -i ${srcdir}/git-fixes.patch
 
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"
author	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-05-23 13:22:09 -0300
committer	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-05-23 13:22:09 -0300
commit	2906c522e750f7e013d7af606f01ad849a7d3876 (patch)
tree	d62491c93d6534817db7f9b7d07adf64b9670b48 /extra
parent	193046ad8ed67a836ffe11e235296e6201e56ce8 (diff)
parent	bd614ac21d2754d778a796cd5e92d1568ec8baec (diff)