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

Conflicts:
	community-testing/collectd/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/xulrunner/PKGBUILD

11 files changed, 139 insertions, 50 deletions

diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 833881841..0c630fdcd 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124404 2011-05-20 15:01:13Z bisson $
+# $Id: PKGBUILD 128038 2011-06-21 06:55:54Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ url='http://audacious-media-player.org/'
 license=('GPL3')
 depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('unzip: zipped skins support')
-source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz")
-sha1sums=('886e1cde03069b3dee15a6df04e3e8f5934018f1')
+source=("http://distfiles.atheme.org/$pkgname-$pkgver.tar.gz")
+sha1sums=('48b2662d1513959479ae561465b41df08369a689')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD
index 6a45eaac8..741597dfe 100644
--- a/extra/exiv2/PKGBUILD
+++ b/extra/exiv2/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 110922 2011-02-23 07:38:47Z eric $
+#$Id: PKGBUILD 128049 2011-06-21 07:56:57Z eric $
 # Maintainer: tobias <tobias@arhlinux.org>
 
 pkgname=exiv2
 pkgver=0.21.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Exif and Iptc metadata manipulation library and tools."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://exiv2.org"
@@ -16,7 +16,7 @@ sha1sums=('d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD
index a93979c58..d8e765fb5 100644
--- a/extra/farsight2/PKGBUILD
+++ b/extra/farsight2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124193 2011-05-17 15:41:27Z ibiru $
+# $Id: PKGBUILD 128061 2011-06-21 14:53:16Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: William Díaz <wdiaz@archlinux.us>
 
 pkgname=farsight2
-pkgver=0.0.28
-pkgrel=2
+pkgver=0.0.29
+pkgrel=1
 pkgdesc="Audio/Video conference software for Instant Messengers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://farsight.freedesktop.org"
@@ -13,7 +13,7 @@ depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0
 optdepends=('gstreamer0.10-ugly-plugins: h264 codec')
 options=('!libtool' '!emptydirs')
 source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('38767e775067270754a32aaf8e3a7db1')
+md5sums=('276076f65b70236d981c288413572168')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 1bd7fc9b4..6d1e06693 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 122938 2011-05-07 11:51:04Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
diff --git a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch
new file mode 100644
index 000000000..ac10e4f4a
--- /dev/null
+++ b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch
@@ -0,0 +1,37 @@
+From a3a0af4fb1237bed0af75868073f9a63db8b1864 Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Thu, 7 Apr 2011 10:19:23 -0300
+Subject: [PATCH] avutil: make aes and sha api public
+
+The functions are already av_ prefixed and sha1 header is already provided.
+Install libavutil/{aes,sha}.h
+
+Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
+Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
+---
+ libavutil/Makefile |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libavutil/Makefile b/libavutil/Makefile
+index 300acb1..baee496 100644
+--- a/libavutil/Makefile
++++ b/libavutil/Makefile
+@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak
+ NAME = avutil
+ 
+ HEADERS = adler32.h                                                     \
++          aes.h                                                         \
+           attributes.h                                                  \
+           audioconvert.h                                                \
+           avassert.h                                                    \
+@@ -33,6 +34,7 @@ HEADERS = adler32.h                                                     \
+           random_seed.h                                                 \
+           rational.h                                                    \
+           samplefmt.h                                                   \
++          sha.h                                                         \
+           sha1.h                                                        \
+ 
+ BUILT_HEADERS = avconfig.h
+-- 
+1.7.2.5
+
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
new file mode 100644
index 000000000..aeceaaaa6
--- /dev/null
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 128097 2011-06-21 19:32:41Z dan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+
+pkgname=postgresql-old-upgrade
+pkgver=8.4.8
+_majorver=${pkgver%.*}
+pkgrel=1
+pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org/"
+license=('custom:PostgreSQL')
+depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+        build.patch)
+
+build() {
+  cd "${srcdir}/postgresql-${pkgver}"
+
+  # patch to remove regress/test make target (won't build with it present)
+  patch -Np1 -i ../build.patch
+
+  ./configure --prefix=/opt/pgsql-${_majorver} \
+  --with-libxml --with-openssl --without-perl \
+  --without-python --with-pam --without-readline \
+  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
+  --enable-thread-safety
+
+  make -C src all
+}
+
+package() {
+  cd "${srcdir}/postgresql-${pkgver}"
+
+  # install
+  make DESTDIR="${pkgdir}" -C src install
+
+  # install license
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  # clean up unneeded installed items
+  rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
+}
+
+md5sums=('4603e8ea30cee97189b62b39022f2043'
+         '4d74f4227dc5e12bf95b3490758d86c9')
+sha256sums=('3e90ef2a86a9f4831e21ff4a574fbfb8e1b8c097af637c93ec43c64c684a0938'
+            '1f020ae1d921a6f47e4889c2026c5ef69879d204e14aeac9330f89b7e6088348')
diff --git a/extra/postgresql-old-upgrade/build.patch b/extra/postgresql-old-upgrade/build.patch
new file mode 100644
index 000000000..c8f665d12
--- /dev/null
+++ b/extra/postgresql-old-upgrade/build.patch
@@ -0,0 +1,11 @@
+diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
+--- postgresql-8.2.3-orig/src/Makefile	2006-06-22 16:50:35.000000000 -0700
++++ postgresql-8.2.3/src/Makefile	2007-03-05 10:46:24.000000000 -0800
+@@ -23,7 +23,6 @@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+ 	$(MAKE) -C makefiles $@
+-	$(MAKE) -C test/regress $@
+ 
+ install: install-local
+ 
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index 63e1713ed..4b7aa5d94 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 127981 2011-06-20 14:56:52Z andrea $
+# $Id: PKGBUILD 128044 2011-06-21 07:08:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vandenoever.info/software/strigi/"
 license=('GPL2')
-depends=('qt' 'bzip2' 'exiv2' 'libxml2')
-makedepends=('cmake' 'pkg-config')
+depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs')
+makedepends=('qt' 'cmake' 'pkg-config' 'boost')
 source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('0559e2ab65d187d30916e9ffe36e0fb6')
-options=('!libtool')
 
 build() {
   cd "${srcdir}"
@@ -25,18 +24,20 @@ build() {
     -DENABLE_INOTIFY=ON \
     -DENABLE_LOG4CXX=OFF \
     -DENABLE_FAM=OFF \
-    -DENABLE_CLUCENE=OFF
+    -DENABLE_CLUCENE=OFF \
+    -DENABLE_CLUCENE_NG=OFF \
+    -DENABLE_FFMPEG=OFF \
+    -DENABLE_XINE=OFF
   make
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd "${srcdir}/build/libstreams"
   make DESTDIR="${pkgdir}" install
 
-  # strigidaemon isn't needed
-  rm -r "${pkgdir}"/usr/bin/{strigicmd,strigidaemon}
-  rm -r "${pkgdir}"/usr/include/strigi/{asyncsocketclient,asyncsocket,clientinterface,socketclient}.h
-  rm -r "${pkgdir}"/usr/lib/libsearchclient.so{,.0,.0.7.5}
-  rm -r "${pkgdir}"/usr/lib/libsearchclient/LibSearchClientConfig.cmake
-  rm -r "${pkgdir}"/usr/share/dbus-1/services/{org.freedesktop.xesam.searcher,vandenoever.strigi}.service
+  cd "${srcdir}/build/libstreamanalyzer"
+  make DESTDIR="${pkgdir}" install
+  
+  cd "${srcdir}/build/strigiutils"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD
index ebc6f52b3..b72920f75 100644
--- a/extra/telepathy-farsight/PKGBUILD
+++ b/extra/telepathy-farsight/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124113 2011-05-16 16:15:50Z ibiru $
+# $Id: PKGBUILD 128060 2011-06-21 14:52:50Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Ju Liu <liuju86 at gmail dot com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 pkgname=telepathy-farsight
-pkgver=0.0.18
+pkgver=0.0.19
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-glib' 'farsight2')
 makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('984be4153c635ca1b2010de27d74eff4')
+md5sums=('6bacc22aaec00823f3bbce8517600ec3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index f37422b8e..29cef1a5e 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 126144 2011-06-01 19:05:33Z ibiru $
+# $Id: PKGBUILD 128070 2011-06-21 15:42:15Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 pkgname=telepathy-glib
-pkgver=0.14.7
+pkgver=0.14.8
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3230f7389cd3a0ebe4436eb1f7e40c18')
+md5sums=('07dae468cd6b55a2bddbd0b3c80f3796')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 1196fd176..1f3cd5e44 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126161 2011-06-01 20:45:14Z ibiru $
+# $Id: PKGBUILD 128075 2011-06-21 17:45:36Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
 pkgver=2.0.1
 _ffoxver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -19,27 +19,27 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
         port_gnomevfs_to_gio.patch
         mips.patch)
 options=('!emptydirs')
-
+replaces=('xulrunner-oss')
 build() {
   cd "${srcdir}/icecat-${_ffoxver}/"
-#  cp "${srcdir}/mozconfig" .mozconfig
+   cp "${srcdir}/mozconfig" .mozconfig
 
   #fix libdir/sdkdir - fedora
-#  patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
+   patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
 
   #Force installation to the same path for every version
-#  patch -Np1 -i "${srcdir}/xulrunner-version.patch"
+   patch -Np1 -i "${srcdir}/xulrunner-version.patch"
 
   #https://bugzilla.mozilla.org/show_bug.cgi?id=620931
-#  patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
+   patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
 
   #https://bugzilla.mozilla.org/show_bug.cgi?id=494163
-#  patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
+   patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
 
-# [[ "$CARCH" == "mips64el" ]] && {
-#   echo "ac_add_options --disable-ipc" >> .mozconfig
-#   patch -Np0 -i "${srcdir}/mips.patch"
-# }
+  [[ "$CARCH" == "mips64el" ]] && {
+    echo "ac_add_options --disable-ipc" >> .mozconfig
+    patch -Np0 -i "${srcdir}/mips.patch"
+  }
 
   unset CFLAGS
   unset CXXFLAGS
@@ -62,10 +62,3 @@ package() {
   install -d ${pkgdir}/etc/ld.so.conf.d
   echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
 }
-md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
-         '2358a2ddd35bcdd62ff42442dfe548d9'
-         '639ea80e823543dd415b90c0ee804186'
-         'a0236f6c3e55f60b7888d8cf137ff209'
-         'f8b64cf798636a9c1e4e10c08de0b859'
-         '42f83468b296452fb754a81a4317ca64'
-         '0e970ff5600246e953f527813883e744')