tags 675971 patch thanks
Greetings.
CCing the tech-ctte and release-team, as the intent is to coordinate with both
for approval to upload this NMU.
Ron, I tried contacting you about a month ago but I haven't heard back from
you since the TC decision on Aug 30th. I tried contacting Thorvald (the only
other uploader) in early Sept (he is very busy so I knew this was a long shot)
and he replied that he wanted a few days to try to contact you, but I haven't
heard back from him since then either.
I contacted Gregor Hermann and with his help we created a minimal diff for a
new upload targeted for Wheezy, as requested in TC #682010. I'm posting it
here to give you a chance to review it if you wish. Unless you wish to
discuss it, this will be uploaded soon to a DELAYED/XX queue at which time
there will be an additional notification posted here.
Three patches attached:
mumble-celt.diff -- the fix for #675971
mumble-349-rules.diff -- (optional) fix debian/rules to remove the Ice/
directory in the 'clean' target to allow
repeat building
mumble-349-defuzz.diff -- (optional) Removes fuzz from two quilt patches
in the current package
Thanks.
-- Chris
--
Chris Knadle
[email protected]
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 13:42:05.000000000 -0400 +++ mumble-1.2.3-349-g315b5f5/debian/changelog 2012-10-04 21:03:18.000000000 -0400 @@ -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 Hermann for his help and guidance.] + + -- Christopher Knadle <[email protected]> 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 13:42:05.000000000 -0400 +++ mumble-1.2.3-349-g315b5f5/debian/mumble.install 2012-10-04 21:02:08.000000000 -0400 @@ -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 1969-12-31 19:00:00.000000000 -0500 +++ mumble-1.2.3-349-g315b5f5/debian/patches/07-use-embedded-celt-baseline 2012-10-04 21:02:08.000000000 -0400 @@ -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 13:42:05.000000000 -0400 +++ mumble-1.2.3-349-g315b5f5/debian/patches/20-add-opus-threshold-option 2012-10-04 21:02:08.000000000 -0400 @@ -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 13:42:05.000000000 -0400 +++ mumble-1.2.3-349-g315b5f5/debian/patches/series 2012-10-04 21:02:08.000000000 -0400 @@ -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 13:42:05.000000000 -0400 +++ mumble-1.2.3-349-g315b5f5/debian/rules 2012-10-04 21:02:08.000000000 -0400 @@ -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) \
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 13:42:05.000000000 -0400 +++ mumble-1.2.3-349-g315b5f5/debian/rules 2012-09-28 19:47:48.000000000 -0400 @@ -51,8 +52,7 @@ dh_testroot rm -f build-arch-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) distclean - [ ! -d gendoc ] || rm -rf Ice - rm -rf release debug + rm -rf release debug Ice [ ! -d release-32 ] || rm -rf release-32 rm -f $(CURDIR)/debian/mumble-server.logrotate $(CURDIR)/mumble-server.init debconf-updatepo
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 13:42:05.000000000 -0400
+++ mumble-1.2.3-349-g315b5f5/debian/patches/20-add-opus-threshold-option 2012-09-28 20:11:42.000000000 -0400
@@ -17,7 +17,7 @@
index 0d7a5ed..4b6be72 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
-@@ -391,7 +391,9 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
+@@ -393,7 +393,9 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
mpsug.set_positional(qvSuggestPositional.toBool());
if (! qvSuggestPushToTalk.isNull())
mpsug.set_push_to_talk(qvSuggestPushToTalk.toBool());
diff -Nru mumble-1.2.3-349-g315b5f5/debian/patches/25-add-codec-warnings mumble-1.2.3-349-g315b5f5/debian/patches/25-add-codec-warnings
--- mumble-1.2.3-349-g315b5f5/debian/patches/25-add-codec-warnings 2012-07-08 13:42:05.000000000 -0400
+++ mumble-1.2.3-349-g315b5f5/debian/patches/25-add-codec-warnings 2012-09-28 20:11:55.000000000 -0400
@@ -2,7 +2,7 @@
index 4b6be72..6310f89 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
-@@ -201,6 +201,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
+@@ -203,6 +203,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
mpcrypt.set_client_nonce(std::string(reinterpret_cast<const char *>(uSource->csCrypt.decrypt_iv), AES_BLOCK_SIZE));
sendMessage(uSource, mpcrypt);
@@ -10,7 +10,7 @@
if (msg.celt_versions_size() > 0) {
for (int i=0;i < msg.celt_versions_size(); ++i)
uSource->qlCodecs.append(msg.celt_versions(i));
-@@ -217,6 +219,12 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
+@@ -219,6 +221,12 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
mpcv.set_opus(bOpus);
sendMessage(uSource, mpcv);
signature.asc
Description: This is a digitally signed message part.
