Tue May 22 00:02:33 UTC 2012

11 files changed, 121 insertions, 50 deletions

diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index cafcc74d1..b469acf89 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 7cc1baea4..c611db88b 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')
 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 053915392..db4322f0b 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')
@@ -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
@@ -29,7 +29,7 @@ build() {
   CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math"
 
   CONFIGURE="./configure F77=gfortran --prefix=/usr \
-                 --enable-shared --enable-threads"
+                 --enable-shared --enable-threads --enable-type-prefix"
 
   # build & install double precision
   $CONFIGURE --enable-sse2
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 56665db73..bcefb1925 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')
@@ -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/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 230eafac7..ebc6604ad 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')
@@ -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/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 5de207936..3e57ddefa 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')
 url="http://www.open-mpi.org"
@@ -10,20 +10,20 @@ license=('custom')
 depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
 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}"
 
-   # 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/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index 4e6c88070..6fd029b12 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')
@@ -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/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index f2509a086..c0fafbfb4 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>
 
@@ -9,7 +9,7 @@ _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}	#3070700
 #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')
 license=('custom')
@@ -47,7 +47,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
@@ -59,9 +59,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
@@ -72,7 +72,7 @@ package_sqlite-doc() {
  pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
  #arch=('any') - not yet supported
  provides=("sqlite3-doc=$pkgver")
- replaces=("sqlite3-doc=$pkgver")
+ replaces=("sqlite3-doc")
  
   #cd ${srcdir}/sqlite-doc-${_amalgamationver}
   cd ${srcdir}/sqlite-doc-${_docver}
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 27d16ef44..47873d47f 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')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -16,19 +16,17 @@ 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)
-sha1sums=('bb9985bae271aa896de7fa12e49a0dbd8e244d2c'
-          '63836e5cfb4ae7353fb2e31239a544409c7ead32'
-          '175de5630b43dbc97778adfba5563b7fdd77f11f'
-          '4acb39587f73bcbb9a331377d6ef99cb73eb95a8'
-          '526cbffbc742dc3449065e3501d290a607d80aa3'
-          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
-          '6838fc00ef4618c924a77e0fb03c05346080908a'
-          '993798f3d22ad672d769dae5f48d1fa068d5578f')
+sha256sums=('052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509'
+            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
+            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -45,7 +43,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
 
   autoreconf -fi
   ./configure --prefix=/usr \