Merge branch 'master' of github.com:xtraeme/xbps-packages

* 'master' of github.com:xtraeme/xbps-packages:
  mumble: remove unnecessary libmumble subpkg
  mumble: re-enable pulseaudio (portaudio sucks)
  mumble: Enable PortAudio support (which disables PulseAudio)

srcpkgs/libmumble

@@ -1 +0,0 @@
-mumble

srcpkgs/mumble/libmumble.template

@@ -1,20 +0,0 @@
-# Template file for 'libmumble'.
-#
-short_desc="${short_desc} Runtime library"
-long_desc="${long_desc}
-
- This package contains the Mumble runtime lib(s)."
-
-Add_dependency run glibc
-Add_dependency run libstdc++
-Add_dependency run qt
-Add_dependency run libgcc
-
-do_install()
-{
-	vmkdir usr/lib/mumble
-	cp ${wrksrc}/release/*.so* ${DESTDIR}/usr/lib/mumble
-	cp ${wrksrc}/release/plugins/* ${DESTDIR}/usr/lib/mumble	
-}
-
-

srcpkgs/mumble/murmur.template

@@ -14,9 +14,11 @@ Add_dependency run libssl
 Add_dependency run avahi-compat-libs
 Add_dependency run libstdc++
 Add_dependency run libgcc
-Add_dependency run libmumble
+Add_dependency run mumble
 Add_dependency run qt-plugin-sqlite
 
+revision=1
+
 do_install()
 {
 	vmkdir usr/bin

srcpkgs/mumble/template

@@ -1,6 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.2.3
+revision=3
 homepage="http://mumble.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
@@ -15,7 +16,8 @@ long_desc="
  or about Mumble and Murmur the whole voice chat application suite."
 
 disable_parallel_build=yes
-subpackages="lib${pkgname} murmur"
+subpackages="murmur"
+replaces="libmumble<=1.2.3"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
@@ -33,7 +35,6 @@ Add_dependency run MesaLib
 Add_dependency run libstdc++
 Add_dependency run libgcc
 Add_dependency run libogg
-Add_dependency run libmumble
 Add_dependency run qt-plugin-sqlite
 
 Add_dependency build libcap-devel
@@ -61,7 +62,7 @@ do_configure()
 	# Needs bundled celt for some reason
 	qmake -recursive main.pro \
 		CONFIG+="no-speechd bundled-celt no-bundled-speex no-g15 \
-			no-embed-qt-translations no-update" \
+			pulseaudio no-embed-qt-translations no-update" \
 		DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
 }
 
@@ -73,12 +74,15 @@ do_build()
 do_install()
 {
 	vmkdir usr/bin
+	vmkdir usr/lib/mumble
 	vmkdir usr/share/applications
 	vmkdir usr/share/man/man1
 	vmkdir usr/share/icons/hicolor/scalable/apps
 
 	cp ${wrksrc}/release/mumble ${DESTDIR}/usr/bin
 	cp ${wrksrc}/release/mumble11x ${DESTDIR}/usr/bin
+	cp ${wrksrc}/release/*.so* ${DESTDIR}/usr/lib/mumble
+	cp ${wrksrc}/release/plugins/* ${DESTDIR}/usr/lib/mumble
 
 	cp ${wrksrc}/scripts/mumble.desktop ${DESTDIR}/usr/share/applications
 	cp ${wrksrc}/man/mumble{,11x}.1 ${DESTDIR}/usr/share/man/man1