[packages/mumble] - adjusted to 1.2.4

[witekfl]

commit f0db1c7da9b020257bda15b9836f4194d6ff7d37
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Thu Jan 9 11:04:24 2014 +0100

    - adjusted to 1.2.4

 mumble-celt.patch      | 19 ++++++++++---------
 mumble-murmurini.patch | 32 +++++++++++++++++---------------
 2 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/mumble-celt.patch b/mumble-celt.patch
index 37aebc7..5063a30 100644
--- a/mumble-celt.patch
+++ b/mumble-celt.patch
@@ -1,12 +1,13 @@
---- mumble-1.2.3/src/mumble/AudioInput.cpp~	2011-02-19 22:35:16.000000000 +0100
-+++ mumble-1.2.3/src/mumble/AudioInput.cpp	2011-09-11 21:38:25.093933057 +0200
-@@ -823,7 +823,9 @@
- 
- 		cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_PREDICTION(0));
+--- mumble-1.2.4/src/mumble/AudioInput.cpp~	2014-01-09 10:15:07.909966051 +0100
++++ mumble-1.2.4/src/mumble/AudioInput.cpp	2014-01-09 10:15:53.780675423 +0100
+@@ -696,8 +696,9 @@
+ 		cCodec->celt_encoder_ctl(ceEncoder, CELT_RESET_STATE);
  
+ 	cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_PREDICTION(0));
+-
 +#ifdef CELT_SET_VBR_RATE
- 		cCodec->celt_encoder_ctl(ceEncoder,CELT_SET_VBR_RATE(iAudioQuality));
+ 	cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_VBR_RATE(iAudioQuality));
 +#endif
- 		len = cCodec->encode(ceEncoder, psSource, buffer, qMin(iAudioQuality / 800, 127));
- 		iBitrate = len * 100 * 8;
- 	} else {
+ 	len = cCodec->encode(ceEncoder, psSource, buffer, qMin(iAudioQuality / (8 * 100), 127));
+ 	iBitrate = len * 100 * 8;
+ 
diff --git a/mumble-murmurini.patch b/mumble-murmurini.patch
index 061b021..9c38789 100644
--- a/mumble-murmurini.patch
+++ b/mumble-murmurini.patch
@@ -1,6 +1,7 @@
---- scripts/murmur.ini.orig	2010-04-15 20:49:02.190090655 +0200
-+++ scripts/murmur.ini	2010-04-15 20:49:47.077091064 +0200
-@@ -1,6 +1,6 @@
+--- scripts/murmur.ini.orig	2013-06-01 23:16:31.000000000 +0200
++++ scripts/murmur.ini	2014-01-09 10:08:11.826864748 +0100
+@@ -13,7 +13,7 @@
+ 
  # Path to database. If blank, will search for
  # murmur.sqlite in default locations or create it if not found.
 -database=
@@ -8,24 +9,25 @@
  
  # If you wish to use something other than SQLite, you'll need to set the name
  # of the database above, and also uncomment the below.
-@@ -48,10 +48,10 @@
- 
- # Murmur default to logging to murmur.log. If you leave this blank,
- # murmur will log to the console (linux) or through message boxes (win32).
--#logfile=murmur.log
+@@ -73,12 +73,14 @@
+ # on Unix-like systems, Murmur will force itself into foreground
+ # mode which logs to the console.
+ #logfile=murmur.log
 +logfile=/var/log/murmur
  
- # If set, murmur will write its process ID to this file.
--#pidfile=
+ # If set, Murmur will write its process ID to this file
+ # when running in daemon mode (when the -fg flag is not
+ # specified on the command line). Only available on
+ # Unix-like systems.
+ #pidfile=
 +pidfile=/var/run/murmurd.pid
  
  # The below will be used as defaults for new configured servers.
  # If you're just running one server (the default), it's easier to
-@@ -123,7 +123,7 @@
- 
- # If murmur is started as root, which user should it switch to?
- # This option is ignored if murmur isn't started with root privileges.
--#uname=
+@@ -163,6 +165,7 @@
+ # If Murmur is started as root, which user should it switch to?
+ # This option is ignored if Murmur isn't started with root privileges.
+ #uname=
 +uname=murmur
  
  # If this options is enabled, only clients which have a certificate are allowed
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mumble.git/commitdiff/0569a988afde782d8e10a6c8d2e17d60caacb04f