update mumble

Signed-off-by: Florian Pritz <bluewind@xssn.at>

2 files changed, 26 insertions, 15 deletions

diff --git a/mumble/PKGBUILD b/mumble/PKGBUILD
index faa2b76..5c669ac 100644
--- a/mumble/PKGBUILD
+++ b/mumble/PKGBUILD
@@ -1,51 +1,51 @@
+# Maintainer: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Sebastian.Salich@gmx.de
-# Maintainer: Doc Angelo
+# Contributor: Doc Angelo
 
 # If you want support for your G15 Keyboard, please add 'g15daemon'
 # to the depends and delete "no-g15" in the configure line below
 
 pkgname=mumble
-pkgver=1.1.8
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('GPL')
-depends=('alsa-lib' 'qt>=4.4.0' 'speex>=1.2rc1' 'lsb-release')
-makedepends=('pkgconfig' 'boost')
+depends=('qt>=4.4.0' 'speex>=1.2rc1' 'celt=>0.7.0' 'lsb-release' 'avahi' 'libsndfile' 'protobuf')
+makedepends=('boost')
 optdepends=('pulseaudio: for using mumble with pulseaudio')
 conflicts=('mumble-client')
 options=('!libtool') 
-install=mumble.install
 url="http://mumble.sourceforge.net/"
 source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" \
-	mumble.install)
-md5sums=('a7da012922d39b87c45d9f481d4b5efb'
-         'dfa125deb91aa1abdaee7b6295fb488e')
+	mumble11x.desktop)
+md5sums=('25872328c8bbc8282ad7ebdeacc0e8b6'
+         'b85a15a46a8d0e9a28e87ff6678bb36a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # Building mumble
   /usr/bin/qmake main.pro \
-    CONFIG+="no-bundled-speex no-speechd no-g15 no-xevie no-server no-embed-qt-translations" \
+    CONFIG+="no-bundled-speex no-speechd no-bundled-celt no-g15 no-xevie no-server \
+     no-embed-qt-translations packaged" \
     DEFINES+="PLUGIN_PATH=/usr/lib/mumble/plugins" || exit 1
   make || exit 1
 
   # create directories and copy files
   install -m755 -D ./release/mumble $pkgdir/usr/bin/mumble
+  install -m755 -D ./release/mumble11x $pkgdir/usr/bin/mumble11x
   install -m755 -D ./scripts/mumble-overlay $pkgdir/usr/bin/mumble-overlay
   install -m755 -d $pkgdir/usr/lib/mumble/plugins
   install -m755 -D ./release/libmumble.so.$pkgver $pkgdir/usr/lib/mumble/
   ln -s libmumble.so.$pkgver $pkgdir/usr/lib/mumble/libmumble.so
   ln -s libmumble.so.$pkgver $pkgdir/usr/lib/mumble/libmumble.so.1
-  ln -s libmumble.so.$pkgver $pkgdir/usr/lib/mumble/libmumble.so.1.1
+  ln -s libmumble.so.$pkgver $pkgdir/usr/lib/mumble/libmumble.so.1i.1
   install -m755 -D ./release/plugins/liblink.so $pkgdir/usr/lib/mumble/plugins/
   install -m755 -d $pkgdir/usr/share/applications
   install -m644 -D ./scripts/mumble.desktop $pkgdir/usr/share/applications/mumble.desktop
+  install -m644 -D $srcdir/mumble11x.desktop $pkgdir/usr/share/applications/mumble11x.desktop
   install -m755 -d $pkgdir/usr/share/man/man1
   install -m644 -D ./man/mum* $pkgdir/usr/share/man/man1/
-  install -m644 -D ./icons/mumble.16x16.png $pkgdir/usr/share/icons/hicolor/16x16/apps/mumble.png
-  install -m644 -D ./icons/mumble.32x32.png $pkgdir/usr/share/icons/hicolor/32x32/apps/mumble.png
-  install -m644 -D ./icons/mumble.48x48.png $pkgdir/usr/share/icons/hicolor/48x48/apps/mumble.png
-  install -m644 -D ./icons/mumble.64x64.png $pkgdir/usr/share/icons/hicolor/64x64/apps/mumble.png
+  install -m644 -D ./icons/mumble.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/mumble.svg
 }
diff --git a/mumble/mumble11x.desktop b/mumble/mumble11x.desktop
new file mode 100644
index 0000000..1305f7c
--- /dev/null
+++ b/mumble/mumble11x.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Mumble (1.1.X compatible)
+GenericName=Voice Chat
+Comment=Voice chat program (compatible with Mumble 1.1.X)
+Exec=mumble11x
+Icon=mumble
+Terminal=false
+Type=Application
+StartupNotify=false
+Categories=Network;Chat;Qt;
+Version=1.0