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

Conflicts:
	community/unifdef/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libmpeg2/PKGBUILD
	extra/mesa/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libdrm/no-pthread-stubs.patch
	multilib/lib32-mesa/PKGBUILD

2 files changed, 29 insertions, 18 deletions

diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index 6dc55356a..90020879c 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -1,38 +1,38 @@
-# $Id: PKGBUILD 95269 2010-10-18 00:20:50Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 134338 2011-08-02 23:29:16Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xmms
 pkgver=1.2.11
-pkgrel=3
+pkgrel=4
 pkgdesc="The X MultiMedia System - a multimedia player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://legacy.xmms2.org/"
 license=('GPL')
-depends=('gtk' 'libxxf86vm' 'libsm')
-makedepends=('mesa' 'libmikmod' 'libvorbis' 'esound' 'alsa-lib' 'libgl')
+depends=('gtk' 'libxxf86vm' 'libsm' 'desktop-file-utils')
+makedepends=('mesa' 'libmikmod' 'libvorbis' 'alsa-lib' 'libgl')
 optdepends=('libmikmod: for the MikMod input plugin' \
             'libvorbis: for the Ogg Vorbis input plugin' \
-            'esound: for the esound output plugin' \
             'alsa-lib: for the alsa output plugin' \
             'libgl: for the OpenGL Spectrum analyser visualization plugin')
 options=('!libtool')
+install=xmms.install
 source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \
 	xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \
         xmms-1.2.11-CVE-2007-0653.0654.patch xmms-1.2.11-fix-http-title-mpg123.patch \
         xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch \
         xmms-1.2.10-fonts.patch xmms.16.png xmms.32.png xmms.48.png)
-md5sums=('f3e6dbaf0b3f571a532ab575656be506' 'b7b6f1811bad8d14e4c4534240e45980'\
-         '4eb222111a82a2e1ebe63b5f6109133d' 'd7f9dc3712c486658149c4504f7478a7'\
-         'e59e8c66f4e4077a8096ad98c77f0eb6' '25609a6b5b7632e4c8e6de927f8d70db'\
-         '2b534832b0dbb0d06dbcc829e2b702e6' 'd1715c291d35ee8854e5d926912e8b0d'\
-         '408ea5e28c4c4c221cf3c8ded76fd1f0' '3c328565c99c85d92ac0b9918805da46'\
-         '128406a02c07cd477dc901f2a658add5' 'd022280df4379383732a8a26abea1d08')
-sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'\
-         'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5' 'c227284955f2cc16f027dade670155c0f0fbc4ff'\
-         '4ef47c34b27b6c868d4301b7a078b257c8604471' '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'\
-         '6f6db13c780ba4cbddb8613f0abd2db2823f3021' '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'\
-         '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3' '0089d11aa3bce67f3496592d68ee65837406e220'\
-         'f24071ae484d9b55e61dba076801fa8e7976ff2f' '485c67cb8c8d4678bb3b0b280d2e233b14153b22')
+sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
+          '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'
+          'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5'
+          'c227284955f2cc16f027dade670155c0f0fbc4ff'
+          '4ef47c34b27b6c868d4301b7a078b257c8604471'
+          '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'
+          '6f6db13c780ba4cbddb8613f0abd2db2823f3021'
+          '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'
+          '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3'
+          '0089d11aa3bce67f3496592d68ee65837406e220'
+          'f24071ae484d9b55e61dba076801fa8e7976ff2f'
+          '485c67cb8c8d4678bb3b0b280d2e233b14153b22')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xmms/xmms.install b/extra/xmms/xmms.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/extra/xmms/xmms.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}