Hello community,
here is the log from the commit of package mumble for openSUSE:Factory checked
in at 2014-08-13 08:48:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mumble (Old)
and /work/SRC/openSUSE:Factory/.mumble.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mumble"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mumble/mumble.changes 2014-08-11
10:07:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mumble.new/mumble.changes 2014-08-13
08:48:56.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Aug 9 05:49:31 UTC 2014 - mailaen...@opensuse.org
+
+- update to 1.2.8
+ + A PulseAudio issue that could cause the Mumble client
+ to crash on launch has been fixed.
+ + Various source-level issues that made the Mumble build
+ fail when built with Clang has been fixed.
+
+-------------------------------------------------------------------
Old:
----
mumble-1.2.7.tar.gz
mumble-1.2.7.tar.gz.sig
New:
----
mumble-1.2.8.tar.gz
mumble-1.2.8.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mumble.spec ++++++
--- /var/tmp/diff_new_pack.Lc6XIA/_old 2014-08-13 08:48:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Lc6XIA/_new 2014-08-13 08:48:57.000000000 +0200
@@ -108,7 +108,7 @@
%if %{with pulseaudio}
BuildRequires: pulseaudio-devel
%endif
-Version: 1.2.7%{?snapshot:_%snapshot}
+Version: 1.2.8%{?snapshot:_%snapshot}
Release: 0
%if 0%{!?snapshot:1}
Source:
http://downloads.sourceforge.net/project/mumble/Mumble/%{version}/mumble-%{version}.tar.gz
++++++ mumble-1.2.7.tar.gz -> mumble-1.2.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/CHANGES new/mumble-1.2.8/CHANGES
--- old/mumble-1.2.7/CHANGES 2014-06-14 11:11:48.000000000 +0200
+++ new/mumble-1.2.8/CHANGES 2014-08-08 17:51:59.000000000 +0200
@@ -1,3 +1,36 @@
+2014-08-08
+ Mikkel Krautz <mik...@krautz.dk>
+ 82c483e scripts: modify git2cl.pl to work on the currently checked-out
+ branch rather than origin/master.
+
+2014-07-23
+ Mikkel Krautz <mik...@krautz.dk>
+ 0bf4aa3 PulseAudio: don't call pa_stream_drop() for empty
+ pa_stream_peek().
+
+2014-07-20
+ Mikkel Krautz <mik...@krautz.dk>
+ 633f905 PulseAudio: stricter pa_stream_peek() validation.
+
+2014-07-02
+ Mikkel Krautz <mik...@krautz.dk>
+ 76f6870 PulseAudio: fix access to protected enums in AudioInput and
+ AudioOutput.
+ 9529651 installer: add the ability to use a custom bzip2 directory in
+ the Win32 installer.
+ 8609912 installer: fix ability to use a custom OpenSslDir when
+ building the Win32 installer.
+
+2014-06-29
+ Mikkel Krautz <mik...@krautz.dk>
+ 196a6f7 Allow building 1.2.x on Windows with
+ mumble-releng/buildenv/1.2.x/win32
+
+2014-06-14
+ Mikkel Krautz <mik...@krautz.dk>
+ 414494d Bump version to 1.2.8
+ 173ec2b Update changelog
+
2014-06-13
Mikkel Krautz <mik...@krautz.dk>
aef3509 Add CA certificate filter to MumbleSSL::addSystemCA() to work
@@ -31,6 +64,15 @@
8323bd4 mumble: allow Log_macx.mm to build against the OS X 10.4 SDK
(for universal builds).
+2013-08-02
+ Mikkel Krautz <mik...@krautz.dk>
+ 228f844 mumble: fix VoiceRecorderDialog build on Apple clang-500.1.70.
+
+2013-06-08
+ Mikkel Krautz <mik...@krautz.dk>
+ 9c06ecf bonjour: use Qt::AutoConnection for BonjourServiceResolver's
+ QSocketNotifier slot.
+
2013-06-01
Stefan Hacker <d...@users.sourceforge.net>
5ff038e Update changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/compiler.pri
new/mumble-1.2.8/compiler.pri
--- old/mumble-1.2.7/compiler.pri 2014-06-14 11:11:48.000000000 +0200
+++ new/mumble-1.2.8/compiler.pri 2014-08-08 17:51:59.000000000 +0200
@@ -4,7 +4,7 @@
# Import dependency paths for windows
include(winpaths_default.pri)
- INCLUDEPATH *= "$$BOOST_PATH/include/boost-1_49/"
+ INCLUDEPATH *= "$$BOOST_PATH/include" "$$BOOST_PATH/include/boost-1_49/"
QMAKE_LIBDIR *= "$$OPENSSL_PATH/lib" "$$LIBSNDFILE_PATH/lib"
"$$BOOST_PATH/lib"
INCLUDEPATH *= "$$OPENSSL_PATH/include" "$$LIBSNDFILE_PATH/include"
CONFIG(intelcpp) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/g15helper/g15helper.plist
new/mumble-1.2.8/g15helper/g15helper.plist
--- old/mumble-1.2.7/g15helper/g15helper.plist 2014-06-14 11:11:48.000000000
+0200
+++ new/mumble-1.2.8/g15helper/g15helper.plist 2014-08-08 17:51:59.000000000
+0200
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>G15H</string>
<key>CFBundleVersion</key>
- <string>1.2.7</string>
+ <string>1.2.8</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2009 Mikkel Krautz
<mik...@krautz.dk></string>
</dict>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/g15helper/g15helper.rc
new/mumble-1.2.8/g15helper/g15helper.rc
--- old/mumble-1.2.7/g15helper/g15helper.rc 2014-06-14 11:11:48.000000000
+0200
+++ new/mumble-1.2.8/g15helper/g15helper.rc 2014-08-08 17:51:59.000000000
+0200
@@ -15,8 +15,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,7,0
- PRODUCTVERSION 1,2,7,0
+ FILEVERSION 1,2,8,0
+ PRODUCTVERSION 1,2,8,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@
BEGIN
VALUE "CompanyName", "Mikkel Krautz"
VALUE "FileDescription", "Mumble G15 LCD Helper"
- VALUE "FileVersion", "1.2.7"
- VALUE "ProductVersion", "1.2.7"
+ VALUE "FileVersion", "1.2.8"
+ VALUE "ProductVersion", "1.2.8"
VALUE "LegalCopyright", "Copyright (C)
2008-2011, Mikkel Krautz <mik...@krautz.dk>"
VALUE "OriginalFilename",
"mumble-g15-helper.exe"
VALUE "ProductName", "Mumble G15 LCD Helper"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/macx/common.pri
new/mumble-1.2.8/macx/common.pri
--- old/mumble-1.2.7/macx/common.pri 2014-06-14 11:11:48.000000000 +0200
+++ new/mumble-1.2.8/macx/common.pri 2014-08-08 17:51:59.000000000 +0200
@@ -1,6 +1,6 @@
# Common OSX overlay settings.
-VERSION = 1.2.7
+VERSION = 1.2.8
DEFINES *= VERSION=\\\"$$VERSION\\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/macx/osax/osax.plist
new/mumble-1.2.8/macx/osax/osax.plist
--- old/mumble-1.2.7/macx/osax/osax.plist 2014-06-14 11:11:48.000000000
+0200
+++ new/mumble-1.2.8/macx/osax/osax.plist 2014-08-08 17:51:59.000000000
+0200
@@ -13,7 +13,7 @@
<key>CFBundlePackageType</key>
<string>osax</string>
<key>CFbundleVersion</key>
- <string>1.2.7</string>
+ <string>1.2.8</string>
<key>CFBundleSignature</key>
<string>MUOL</string>
<key>CSResourcesFileMapped</key>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/overlay/overlay.pro
new/mumble-1.2.8/overlay/overlay.pro
--- old/mumble-1.2.7/overlay/overlay.pro 2014-06-14 11:11:48.000000000
+0200
+++ new/mumble-1.2.8/overlay/overlay.pro 2014-08-08 17:51:59.000000000
+0200
@@ -1,6 +1,6 @@
include (../compiler.pri)
-VERSION = 1.2.7
+VERSION = 1.2.8
TARGET_EXT = .dll
TEMPLATE = lib
CONFIG -= qt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/overlay_gl/overlay_gl.pro
new/mumble-1.2.8/overlay_gl/overlay_gl.pro
--- old/mumble-1.2.7/overlay_gl/overlay_gl.pro 2014-06-14 11:11:48.000000000
+0200
+++ new/mumble-1.2.8/overlay_gl/overlay_gl.pro 2014-08-08 17:51:59.000000000
+0200
@@ -5,7 +5,7 @@
CONFIG -= qt
CONFIG *= debug_and_release
TARGET = mumble$(TARGET_ADD)
-VERSION = 1.2.7
+VERSION = 1.2.8
SOURCES = overlay.c
LIBS *= -lrt -ldl
QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/Version.h
new/mumble-1.2.8/src/Version.h
--- old/mumble-1.2.7/src/Version.h 2014-06-14 11:11:48.000000000 +0200
+++ new/mumble-1.2.8/src/Version.h 2014-08-08 17:51:59.000000000 +0200
@@ -36,7 +36,7 @@
#define MUMTEXT(X) MUMXTEXT(X)
#ifndef MUMBLE_VERSION
-#define MUMBLE_VERSION 1.2.7
+#define MUMBLE_VERSION 1.2.8
#endif
#ifndef MUMBLE_VERSION
#define MUMBLE_RELEASE "Compiled " __DATE__ " " __TIME__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/bonjour/BonjourServiceResolver.cpp
new/mumble-1.2.8/src/bonjour/BonjourServiceResolver.cpp
--- old/mumble-1.2.7/src/bonjour/BonjourServiceResolver.cpp 2014-06-14
11:11:48.000000000 +0200
+++ new/mumble-1.2.8/src/bonjour/BonjourServiceResolver.cpp 2014-08-08
17:51:59.000000000 +0200
@@ -63,7 +63,7 @@
err = kDNSServiceErr_Invalid;
} else {
rr->bonjourSocket = new QSocketNotifier(sockfd,
QSocketNotifier::Read, this);
- connect(rr->bonjourSocket, SIGNAL(activated(int)),
this, SLOT(bonjourSocketReadyRead(int)), Qt::QueuedConnection);
+ connect(rr->bonjourSocket, SIGNAL(activated(int)),
this, SLOT(bonjourSocketReadyRead(int)));
qmResolvers.insert(sockfd, rr);
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/mumble/PulseAudio.cpp
new/mumble-1.2.8/src/mumble/PulseAudio.cpp
--- old/mumble-1.2.7/src/mumble/PulseAudio.cpp 2014-06-14 11:11:49.000000000
+0200
+++ new/mumble-1.2.8/src/mumble/PulseAudio.cpp 2014-08-08 17:51:59.000000000
+0200
@@ -455,13 +455,23 @@
PulseAudioSystem *pas = reinterpret_cast<PulseAudioSystem *>(userdata);
size_t length = bytes;
- const void *data;
+ const void *data = NULL;
pa_stream_peek(s, &data, &length);
+ if (data == NULL && length > 0) {
+ qWarning("PulseAudio: pa_stream_peek reports no data at current
read index.");
+ } else if (data == NULL && length == 0) {
+ qWarning("PulseAudio: pa_stream_peek reports empty memblockq.");
+ } else if (data == NULL || length == 0) {
+ qWarning("PulseAudio: invalid pa_stream_peek state
encountered.");
+ return;
+ }
AudioInputPtr ai = g.ai;
PulseAudioInput *pai = dynamic_cast<PulseAudioInput *>(ai.get());
if (! pai) {
- pa_stream_drop(s);
+ if (length > 0) {
+ pa_stream_drop(s);
+ }
pas->wakeup();
return;
}
@@ -474,27 +484,33 @@
pai->iMicFreq = pss->rate;
pai->iMicChannels = pss->channels;
if (pss->format == PA_SAMPLE_FLOAT32NE)
- pai->eMicFormat = AudioInput::SampleFloat;
+ pai->eMicFormat = PulseAudioInput::SampleFloat;
else
- pai->eMicFormat = AudioInput::SampleShort;
+ pai->eMicFormat = PulseAudioInput::SampleShort;
pai->initializeMixer();
}
- pai->addMic(data, length / pai->iMicSampleSize);
+ if (data != NULL) {
+ pai->addMic(data, length / pai->iMicSampleSize);
+ }
} else if (s == pas->pasSpeaker) {
if (!pa_sample_spec_equal(pss, &pai->pssEcho)) {
pai->pssEcho = *pss;
pai->iEchoFreq = pss->rate;
pai->iEchoChannels = pss->channels;
if (pss->format == PA_SAMPLE_FLOAT32NE)
- pai->eEchoFormat = AudioInput::SampleFloat;
+ pai->eEchoFormat = PulseAudioInput::SampleFloat;
else
- pai->eEchoFormat = AudioInput::SampleShort;
+ pai->eEchoFormat = PulseAudioInput::SampleShort;
pai->initializeMixer();
}
- pai->addEcho(data, length / pai->iEchoSampleSize);
+ if (data != NULL) {
+ pai->addEcho(data, length / pai->iEchoSampleSize);
+ }
}
- pa_stream_drop(s);
+ if (length > 0) {
+ pa_stream_drop(s);
+ }
}
void PulseAudioSystem::write_callback(pa_stream *s, size_t bytes, void
*userdata) {
@@ -520,9 +536,9 @@
pao->pss = *pss;
pao->pcm = *pcm;
if (pss->format == PA_SAMPLE_FLOAT32NE)
- pao->eSampleFormat = AudioOutput::SampleFloat;
+ pao->eSampleFormat = PulseAudioOutput::SampleFloat;
else
- pao->eSampleFormat = AudioOutput::SampleShort;
+ pao->eSampleFormat = PulseAudioOutput::SampleShort;
pao->iMixerFreq = pss->rate;
pao->iChannels = pss->channels;
unsigned int chanmasks[pss->channels];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/mumble/VoiceRecorderDialog.cpp
new/mumble-1.2.8/src/mumble/VoiceRecorderDialog.cpp
--- old/mumble-1.2.7/src/mumble/VoiceRecorderDialog.cpp 2014-06-14
11:11:49.000000000 +0200
+++ new/mumble-1.2.8/src/mumble/VoiceRecorderDialog.cpp 2014-08-08
17:51:59.000000000 +0200
@@ -38,7 +38,7 @@
#include "ServerHandler.h"
#include "VoiceRecorder.h"
-VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p = NULL) : QDialog(p),
qtTimer(new QTimer(this)) {
+VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p) : QDialog(p), qtTimer(new
QTimer(this)) {
qtTimer->setObjectName(QLatin1String("qtTimer"));
qtTimer->setInterval(200);
setupUi(this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/mumble/VoiceRecorderDialog.h
new/mumble-1.2.8/src/mumble/VoiceRecorderDialog.h
--- old/mumble-1.2.7/src/mumble/VoiceRecorderDialog.h 2014-06-14
11:11:49.000000000 +0200
+++ new/mumble-1.2.8/src/mumble/VoiceRecorderDialog.h 2014-08-08
17:51:59.000000000 +0200
@@ -43,7 +43,7 @@
QTimer *qtTimer;
public:
- explicit VoiceRecorderDialog(QWidget *p);
+ explicit VoiceRecorderDialog(QWidget *p = NULL);
~VoiceRecorderDialog();
void closeEvent(QCloseEvent *evt);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/mumble/mumble.plist
new/mumble-1.2.8/src/mumble/mumble.plist
--- old/mumble-1.2.7/src/mumble/mumble.plist 2014-06-14 11:11:49.000000000
+0200
+++ new/mumble-1.2.8/src/mumble/mumble.plist 2014-08-08 17:51:59.000000000
+0200
@@ -26,7 +26,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.2.7</string>
+ <string>1.2.8</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2005-2010 Thorvald Natvig
<sli...@users.sourceforge.net></string>
</dict>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/mumble/mumble.rc
new/mumble-1.2.8/src/mumble/mumble.rc
--- old/mumble-1.2.7/src/mumble/mumble.rc 2014-06-14 11:11:49.000000000
+0200
+++ new/mumble-1.2.8/src/mumble/mumble.rc 2014-08-08 17:51:59.000000000
+0200
@@ -15,8 +15,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,7,0
- PRODUCTVERSION 1,2,7,0
+ FILEVERSION 1,2,8,0
+ PRODUCTVERSION 1,2,8,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@
BEGIN
VALUE "CompanyName", "Thorvald Natvig"
VALUE "FileDescription", "Mumble - Low-latency
VoIP client"
- VALUE "FileVersion", "1.2.7"
- VALUE "ProductVersion", "1.2.7"
+ VALUE "FileVersion", "1.2.8"
+ VALUE "ProductVersion", "1.2.8"
VALUE "LegalCopyright", "Copyright (C)
2005-2011, Thorvald Natvig <thorv...@natvig.com>"
VALUE "OriginalFilename", "mumble.exe"
VALUE "ProductName", "Mumble"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/mumble.pri
new/mumble-1.2.8/src/mumble.pri
--- old/mumble-1.2.7/src/mumble.pri 2014-06-14 11:11:48.000000000 +0200
+++ new/mumble-1.2.8/src/mumble.pri 2014-08-08 17:51:59.000000000 +0200
@@ -1,6 +1,6 @@
include(../compiler.pri)
-VERSION = 1.2.7
+VERSION = 1.2.8
DIST = mumble.pri Message.h PacketDataStream.h CryptState.h Timer.h
Version.h OSInfo.h SSL.h Mumble.proto
CONFIG += qt thread debug_and_release warn_on
DEFINES *= MUMBLE_VERSION_STRING=$$VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/murmur/murmur.plist
new/mumble-1.2.8/src/murmur/murmur.plist
--- old/mumble-1.2.7/src/murmur/murmur.plist 2014-06-14 11:11:49.000000000
+0200
+++ new/mumble-1.2.8/src/murmur/murmur.plist 2014-08-08 17:51:59.000000000
+0200
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>MMUR</string>
<key>CFBundleVersion</key>
- <string>1.2.7</string>
+ <string>1.2.8</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2005-2010 Thorvald Natvig
<sli...@users.sourceforge.net></string>
</dict>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mumble-1.2.7/src/murmur/murmur.rc
new/mumble-1.2.8/src/murmur/murmur.rc
--- old/mumble-1.2.7/src/murmur/murmur.rc 2014-06-14 11:11:49.000000000
+0200
+++ new/mumble-1.2.8/src/murmur/murmur.rc 2014-08-08 17:51:59.000000000
+0200
@@ -15,8 +15,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,7,0
- PRODUCTVERSION 1,2,7,0
+ FILEVERSION 1,2,8,0
+ PRODUCTVERSION 1,2,8,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@
BEGIN
VALUE "CompanyName", "Thorvald Natvig"
VALUE "FileDescription", "Murmur - Low-latency
VoIP server"
- VALUE "FileVersion", "1.2.7"
- VALUE "ProductVersion", "1.2.7"
+ VALUE "FileVersion", "1.2.8"
+ VALUE "ProductVersion", "1.2.8"
VALUE "LegalCopyright", "Copyright (C)
2005-2011, Thorvald Natvig <thorv...@natvig.com>"
VALUE "OriginalFilename", "murmur.exe"
VALUE "ProductName", "Mumble"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
