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

Conflicts:
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/telepathy-glib/PKGBUILD
	gnome-unstable/telepathy-mission-control/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	testing/iputils/PKGBUILD
	testing/iputils/iputils.install
	testing/ypserv/PKGBUILD

6 files changed, 54 insertions, 20 deletions

diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD
index 175851c6b..61d49f0b1 100644
--- a/community/catalyst-dkms/PKGBUILD
+++ b/community/catalyst-dkms/PKGBUILD
@@ -1,16 +1,19 @@
-# $Id: PKGBUILD 76979 2012-10-02 21:27:47Z lcarlier $
+# $Id: PKGBUILD 77076 2012-10-04 11:57:37Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
 # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
 
 pkgname=catalyst-dkms
 pkgver=12.8
-pkgrel=0.1
+pkgrel=1
 pkgdesc="AMD proprietary gpu kernel driver"
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
-depends=('linux>=3.5' 'linux-headers>=3.5' 'dkms')
+depends=('dkms')
+optdepends=('linux-headers: build the module against Arch kernel'
+            'linux-lts-headers: build the module against LTS Arch kernel')
+replaces=('catalyst-lts-dkms') # useless
 source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
         dkms.conf
         3.5-do_mmap.patch)
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index 1623f8045..8fd4dd440 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 76647 2012-09-25 15:44:46Z svenstaro $
+# $Id: PKGBUILD 77052 2012-10-04 03:54:27Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 
 pkgname=cegui
-pkgver=0.7.6
-pkgrel=6
+pkgver=0.7.7
+pkgrel=1
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
@@ -18,16 +18,12 @@ optdepends=("python2: python bindings"
             "ogre: ogre module"
             "irrlicht: irrlicht module")
 options=(!libtool)
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz
-        cegui-0.7.6-python-detection.patch)
-md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3'
-         '4600775f78b7349621a8a314ade8c902')
+source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
+md5sums=('8b83577f86eaa1581765dd155c7c8f24')
 
 build() {
   cd $srcdir/CEGUI-${pkgver}
 
-  patch -Np0 < $srcdir/cegui-0.7.6-python-detection.patch
-
   ./bootstrap
 
   ./configure --prefix=/usr \
diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD
index 9eff60264..7a50ca009 100644
--- a/community/freeimage/PKGBUILD
+++ b/community/freeimage/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=freeimage
 pkgver=3.15.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Library project for developers who would like to support popular graphics image formats"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'custom:FIPL')
@@ -26,6 +26,9 @@ build() {
 
   cp -r FreeImage FreeImagefip
 
+  export CFLAGS="$CFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS"
+  export CXXFLAGS="$CXXFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS"
+
   cd FreeImage
   make
 
diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD
index f2996f957..77ec7bf24 100644
--- a/community/moreutils/PKGBUILD
+++ b/community/moreutils/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 74174 2012-07-22 18:31:30Z spupykin $
+# $Id: PKGBUILD 77069 2012-10-04 09:18:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=moreutils
 pkgver=0.47
-pkgrel=1
+pkgrel=2
 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://joeyh.name/code/moreutils/"
 license=('GPL')
 makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax')
-depends=('perl')
-optdepends=('perl-timedate' 'perl-time-duration' 'perl-ipc-run')
+depends=('perl' 'perl-ipc-run' 'perl-timedate' 'perl-time-duration')
 options=('!emptydirs' 'zipman')
 replaces=(moreutils-svn)
 source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz)
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 8f703df80..9ffd6f29f 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.10.3
+pkgver=0.11.0
 pkgrel=1
 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://crawl.develz.org/'
-depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'freetype2')
+depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'freetype2' 'ttf-dejavu')
 makedepends=('bison' 'flex' 'gendesk')
 conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git')
 license=('custom')
@@ -65,4 +65,4 @@ build() {
 
 }
 
-md5sums=('ec617185bd3d5562904a401a45c65afd')
+md5sums=('715d800410a7251499bf8efcc8675ca6')
diff --git a/community/xvba-video-open/PKGBUILD b/community/xvba-video-open/PKGBUILD
new file mode 100644
index 000000000..b676215f2
--- /dev/null
+++ b/community/xvba-video-open/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 77096 2012-10-04 19:43:11Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Jesse Jaara <gmail.com: jesse.jaara>
+
+pkgname=xvba-video-open
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="OSS version of xvba-video lib to enable hw video acceleration on AMD's HD series of GFX cards"
+arch=('i686' 'x86_64')
+url="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/"
+license=('GPL2')
+depends=('catalyst-utils' 'libva')
+makedepends=('mesa')
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/community/xvba-video-open/xvba-video-${pkgver}.tar.gz
+        http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz)
+md5sums=('d9ddec2e7f02c1fa533773918e88e311'
+         'b8f56bc55aa70cb19dd12857fdc184cc')
+
+build() {
+  cd "${srcdir}/xvba-video-${pkgver}"
+
+  export CPPFLAGS="${CPPFLAGS} -I${srcdir}/include"
+  
+  ./configure --disable-debug --enable-libxvba-dlopen --prefix=/usr
+  make PYTHON=python2
+}
+
+package() {
+  cd "${srcdir}/xvba-video-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}