Control: tag 675971 + pending On Mon, 22 Oct 2012 13:39:24 +0200, Julien Cristau wrote: > > > IMO the package needs to be in sid before we consider it. > > > > Thanks for your quick reply! > > > > I was under the impression that the release team prefers to assess > > the situation before an upload in more complicated situations, but > > I'm happy to upload the NMU to a DELAYED queue later today. > > > I guess I don't consider this a complicated situation. Either the new > version is ok, or we release without mumble. Neither the current > version in sid nor the current version in wheezy are suitable anyway, > AIUI. Ok, I've uploaded 1.2.3-349-g315b5f5-2.1 now, to DELAYED/2 in order to give the maintainers or other interested parties another chance to take a look at the changes. I'm attaching the debdiff of the upload against the version currently in sid. Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: The Eagles: Take It Easy
diff -Nru mumble-1.2.3-349-g315b5f5/debian/changelog mumble-1.2.3-349-g315b5f5/debian/changelog
--- mumble-1.2.3-349-g315b5f5/debian/changelog 2012-07-08 19:42:05.000000000 +0200
+++ mumble-1.2.3-349-g315b5f5/debian/changelog 2012-10-14 18:37:03.000000000 +0200
@@ -1,3 +1,31 @@
+mumble (1.2.3-349-g315b5f5-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "Cannot communicate with the vast majority of Mumble servers due
+ to lack of required baseline codec":
+ re-enable using the bundled celt library:
+ debian/patches/series:
+ - add 07-use-embedded-celt-baseline patch
+ debian/patches/07-use-embedded-celt-baseline:
+ - build Celt 0.7.1 and not 0.11.0
+ debian/mumble.install:
+ - ship Celt 0.7.1 library from the embedded source
+ debian/rules:
+ - re-enable Celt using the bundled 0.7.1 version
+ debian/patches/20-add-opus-threshold-option:
+ - fix src/murmur/Meta.cpp to set default iOpusThreshold=100 to only
+ switch from Celt to Opus if 100% of connected clients support Opus
+ (instead of 1%)
+ - fix murmur.ini example for opusthreshold option to =100
+ (instead of =1)
+ - add #opusthreshold=100 comments to murmur.ini.system (shipped as
+ etc/mumble-server.ini) to match murmur.ini example
+ Closes: #675971.
+ This implements the TC decision in #682010.
+ [Thanks to Gregor Herrmann for his help and guidance.]
+
+ -- Christopher Knadle <chris.knadle@coredump.us> Thu, 04 Oct 2012 11:45:05 -0400
+
mumble (1.2.3-349-g315b5f5-2) unstable; urgency=low
* Drop the hard dep on boost-1.46, that's been removed now. Closes: #678759
diff -Nru mumble-1.2.3-349-g315b5f5/debian/mumble.install mumble-1.2.3-349-g315b5f5/debian/mumble.install
--- mumble-1.2.3-349-g315b5f5/debian/mumble.install 2012-07-08 19:42:05.000000000 +0200
+++ mumble-1.2.3-349-g315b5f5/debian/mumble.install 2012-10-14 18:36:54.000000000 +0200
@@ -1,6 +1,6 @@
release/mumble usr/bin/
release/libmumble.so* usr/lib/mumble/
-#release/libcelt0.so.?.?.? usr/lib/mumble/
+release/libcelt0.so.?.?.? usr/lib/mumble/
release/plugins/lib*.so usr/lib/mumble/
icons/mumble.xpm usr/share/pixmaps/
icons/mumble.svg usr/share/icons/hicolor/scalable/apps/
diff -Nru mumble-1.2.3-349-g315b5f5/debian/patches/07-use-embedded-celt-baseline mumble-1.2.3-349-g315b5f5/debian/patches/07-use-embedded-celt-baseline
--- mumble-1.2.3-349-g315b5f5/debian/patches/07-use-embedded-celt-baseline 1970-01-01 01:00:00.000000000 +0100
+++ mumble-1.2.3-349-g315b5f5/debian/patches/07-use-embedded-celt-baseline 2012-10-14 18:36:54.000000000 +0200
@@ -0,0 +1,13 @@
+# build and bundle in only celt 0.7.1 if celt is embedded
+--- a/main.pro
++++ b/main.pro
+@@ -12,7 +12,8 @@
+ SUBDIRS *= speexbuild
+ }
+ !CONFIG(no-bundled-celt) {
+- SUBDIRS *= celt-0.7.0-build celt-0.11.0-build
++ SUBDIRS *= celt-0.7.0-build
++ SUBDIRS -= celt-0.11.0-build
+ }
+
+ CONFIG(opus) {
diff -Nru mumble-1.2.3-349-g315b5f5/debian/patches/20-add-opus-threshold-option mumble-1.2.3-349-g315b5f5/debian/patches/20-add-opus-threshold-option
--- mumble-1.2.3-349-g315b5f5/debian/patches/20-add-opus-threshold-option 2012-07-08 19:42:05.000000000 +0200
+++ mumble-1.2.3-349-g315b5f5/debian/patches/20-add-opus-threshold-option 2012-10-14 18:36:54.000000000 +0200
@@ -8,7 +8,7 @@
+# Amount of users with Opus support needed to force Opus usage, in percent.
+# 0 = Always enable Opus, 100 = enable Opus if it's supported by all clients.
-+#opusthreshold=1
++#opusthreshold=100
+
# Regular expression used to validate channel names
# (note that you have to escape backslashes with \ )
@@ -36,7 +36,7 @@
uiUid = uiGid = 0;
#endif
-+ iOpusThreshold = 1;
++ iOpusThreshold = 100;
+
qrUserName = QRegExp(QLatin1String("[-=\\w\\[\\]\\{\\}\\(\\)\\@\\|\\.]+"));
qrChannelName = QRegExp(QLatin1String("[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+"));
@@ -147,3 +147,16 @@
bool bAllowHTML;
QString qsPassword;
QString qsWelcomeText;
+--- a/scripts/murmur.ini.system
++++ b/scripts/murmur.ini.system
+@@ -86,6 +86,10 @@ bandwidth=72000
+ # Maximum number of concurrent clients allowed.
+ users=100
+
++# Amount of users with Opus support needed to force Opus usage, in percent.
++# 0 = Always enable Opus, 100 = enable Opus if it's supported by all clients.
++#opusthreshold=100
++
+ # Regular expression used to validate channel names
+ # (note that you have to escape backslashes with \ )
+ #channelname=[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+
diff -Nru mumble-1.2.3-349-g315b5f5/debian/patches/series mumble-1.2.3-349-g315b5f5/debian/patches/series
--- mumble-1.2.3-349-g315b5f5/debian/patches/series 2012-07-08 19:42:05.000000000 +0200
+++ mumble-1.2.3-349-g315b5f5/debian/patches/series 2012-10-14 18:36:54.000000000 +0200
@@ -1,5 +1,6 @@
02-reject-with-ip-in-log.diff
05-lsb-description.diff
+07-use-embedded-celt-baseline
10-use-celt-guard
15-fix-noise-in-opus-mode
20-add-opus-threshold-option
diff -Nru mumble-1.2.3-349-g315b5f5/debian/rules mumble-1.2.3-349-g315b5f5/debian/rules
--- mumble-1.2.3-349-g315b5f5/debian/rules 2012-07-08 19:42:05.000000000 +0200
+++ mumble-1.2.3-349-g315b5f5/debian/rules 2012-10-14 18:36:54.000000000 +0200
@@ -25,7 +25,8 @@
CONFIG*=packaged \
CONFIG*=quiet-build-log \
CONFIG*=no-bundled-speex \
- CONFIG*=no-bundled-celt \
+ CONFIG*=bundled-celt \
+ DEFINES*=USE_CELT \
DEFINES*=NO_UPDATE_CHECK \
DEFINES*=PLUGIN_PATH=/usr/lib/mumble \
DEFINES*=MUMBLE_VERSION=$(MUMBLE_DEB_VERSION) \
Attachment:
signature.asc
Description: Digital signature