Merged upstream, mesa needs revision

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

Conflicts:
	community-staging/gigi/PKGBUILD
	community-staging/lxdm/PKGBUILD
	community-staging/lxdm/lxdm-pam
	community-staging/lxdm/lxdm.install
	community-staging/lxdm/service
	community-testing/gigi/PKGBUILD
	community/calf/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/prboom/PKGBUILD
	community/scorched3d/PKGBUILD
	community/tmux/PKGBUILD
	community/torcs/PKGBUILD
	core/curl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/akonadi/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ftgl/PKGBUILD
	extra/gcin/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	extra/python-telepathy/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/ruby/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-sqlite/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/calligra/PKGBUILD
	staging/inkscape/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase-workspace/kdm.service
	staging/libreoffice/PKGBUILD
	staging/libreoffice/libreoffice-common.csh
	staging/libreoffice/libreoffice-common.sh
	staging/poppler/PKGBUILD
	testing/dbus-python/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/iptables/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kde-np.pam
	testing/kdebase-workspace/kde.pam
	testing/kdebindings-python/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm-on-crypt.service
	testing/lvm2/lvm.service
	testing/miro/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/ppp/PKGBUILD
	testing/ppp/ip-down
	testing/pyqt/PKGBUILD
	testing/qscintilla/PKGBUILD
	testing/sip/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/util-linux/PKGBUILD
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/xf86-video-intel/PKGBUILD

2 files changed, 30 insertions, 20 deletions

diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD
index 04e7eb64b..993264769 100644
--- a/community/calf/PKGBUILD
+++ b/community/calf/PKGBUILD
@@ -1,35 +1,31 @@
-# Maintainer: Ray Rashif <schiv@archlinux.org>
+# $Id: PKGBUILD 77743 2012-10-14 09:43:37Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Ray Rashif <schiv@archlinux.org>
 
 pkgname=calf
-pkgver=0.0.18.6
+pkgver=0.0.19
+_rc=8
 pkgrel=1
-pkgdesc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host"
+pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://calf.sf.net/"
+url='http://calf.sf.net/'
 license=('LGPL')
-depends=('libglade' 'lash')
+depends=('libglade' 'fftw' 'lash' 'dssi' 'fluidsynth' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('lv2core' 'ladspa' 'dssi')
-source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'include_fix.patch')
-md5sums=('780854561dad1cb873041d7a0b98cbcd'
-         '5aab4d057fb3646c43e6dfcad4c7128f')
+source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver-rc$_rc.tar.gz")
+install=calf.install
+options=('!libtool')
+sha256sums=('57cb536a24a7b9df890dc665fd75c2f4d307859e55f3b25015c73cdc726a56b5')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/include_fix.patch"
-
-  ./configure	--prefix=/usr \
-              --enable-experimental
+  cd $srcdir/$pkgname-$pkgver-rc$_rc
+  ./configure	--prefix=/usr --enable-experimental --enable-sse
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  rm "$pkgdir/usr/share/icons/hicolor/icon-theme.cache"
+  cd $srcdir/$pkgname-$pkgver-rc$_rc
+  make DESTDIR=$pkgdir install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/calf/calf.install b/community/calf/calf.install
new file mode 100644
index 000000000..b83f56c72
--- /dev/null
+++ b/community/calf/calf.install
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  update-desktop-database /usr/share/applications
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et: