[pulseaudio] 01/01: Imported Upstream version 6.0
Luke Yelavich
themuso-guest at moszumanska.debian.org
Fri Feb 13 00:11:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
themuso-guest pushed a commit to branch upstream
in repository pulseaudio.
commit 03f5d80e9f5042a3926876833227f2abf250d735
Author: Luke Yelavich <themuso at ubuntu.com>
Date: Fri Feb 13 11:08:24 2015 +1100
Imported Upstream version 6.0
---
.tarball-version | 2 +-
.version | 2 +-
NEWS | 8 +++++++-
configure | 20 ++++++++++----------
shell-completion/bash/pulseaudio | 2 +-
src/Makefile.am | 2 +-
src/Makefile.in | 3 ++-
.../mixer/paths/analog-output-speaker-always.conf | 8 ++++++++
.../alsa/mixer/paths/analog-output-speaker.conf | 8 ++++++++
src/modules/alsa/mixer/profile-sets/default.conf | 2 +-
.../profile-sets/force-speaker-and-int-mic.conf | 2 +-
.../alsa/mixer/profile-sets/force-speaker.conf | 2 +-
src/modules/alsa/module-alsa-card.c | 6 ++++++
src/modules/module-device-restore.c | 1 +
src/modules/module-loopback.c | 2 +-
src/pulse/version.h | 6 +++---
16 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/.tarball-version b/.tarball-version
index 8e2be86..e0ea36f 100644
--- a/.tarball-version
+++ b/.tarball-version
@@ -1 +1 @@
-5.99.3
+6.0
diff --git a/.version b/.version
index 8e2be86..e0ea36f 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-5.99.3
+6.0
diff --git a/NEWS b/NEWS
index 6e49f6b..cd661f8 100644
--- a/NEWS
+++ b/NEWS
@@ -22,19 +22,24 @@ Contributors:
Andrey Semashev
Arun Raghavan
Bradley Broom
+ Cheng-Chia Tseng
Colin Guthrie
David Henningsson
Dimitris Spingos
Dušan Kazik
Evan Nemerson
Felipe Sateler
+ Georg Chini
Hemanth Meenakshisundaram
Hui Wang
James Bunton
+ Jason Newton
Javier Jardón
- João Paulo Rechi Vita
Joe Marcus Clarke
+ Josef Andersson
+ João Paulo Rechi Vita
Juho Hämäläinen
+ kozdincer
Luiz Augusto von Dentz
Lukas Peleska
Lukasz Marek
@@ -47,6 +52,7 @@ Contributors:
Peter Meerwald
Peter Ujfalusi
Pierre Ossman
+ Piotr Drąg
poljar (Damir Jelić)
Rafael Ferreira
Rex Dieter
diff --git a/configure b/configure
index 94a60a7..a3c0fa4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.3.
+# Generated by GNU Autoconf 2.69 for pulseaudio 6.0.
#
# Report bugs to <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pulseaudio'
PACKAGE_TARNAME='pulseaudio'
-PACKAGE_VERSION='5.99.3'
-PACKAGE_STRING='pulseaudio 5.99.3'
+PACKAGE_VERSION='6.0'
+PACKAGE_STRING='pulseaudio 6.0'
PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org'
PACKAGE_URL='http://pulseaudio.org/'
@@ -1733,7 +1733,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pulseaudio 5.99.3 to adapt to many kinds of systems.
+\`configure' configures pulseaudio 6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1803,7 +1803,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pulseaudio 5.99.3:";;
+ short | recursive ) echo "Configuration of pulseaudio 6.0:";;
esac
cat <<\_ACEOF
@@ -2098,7 +2098,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pulseaudio configure 5.99.3
+pulseaudio configure 6.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2688,7 +2688,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pulseaudio $as_me 5.99.3, which was
+It was created by pulseaudio $as_me 6.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3640,7 +3640,7 @@ fi
# Define the identity of the package.
PACKAGE='pulseaudio'
- VERSION='5.99.3'
+ VERSION='6.0'
cat >>confdefs.h <<_ACEOF
@@ -28693,7 +28693,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pulseaudio $as_me 5.99.3, which was
+This file was extended by pulseaudio $as_me 6.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28760,7 +28760,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pulseaudio config.status 5.99.3
+pulseaudio config.status 6.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/shell-completion/bash/pulseaudio b/shell-completion/bash/pulseaudio
index 4d7e0b8..cfcf7ff 100644
--- a/shell-completion/bash/pulseaudio
+++ b/shell-completion/bash/pulseaudio
@@ -112,7 +112,7 @@ _pactl() {
local cur prev words cword preprev command
local comps
local flags='-h --help --version -s --server= --client-name='
- local list_types='short sinks sources sink-inputs source outputs cards
+ local list_types='short sinks sources sink-inputs source-outputs cards
modules samples clients'
local commands=(stat info list exit upload-sample play-sample remove-sample
load-module unload-module move-sink-input move-source-output
diff --git a/src/Makefile.am b/src/Makefile.am
index e37a22a..5cb5564 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2030,7 +2030,7 @@ if HAVE_WEBRTC
libwebrtc_util_la_SOURCES = modules/echo-cancel/webrtc.cc
libwebrtc_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS) -DHAVE_WEBRTC=1
-libwebrtc_util_la_LIBADD = $(WEBRTC_LIBS)
+libwebrtc_util_la_LIBADD = libpulsecore- at PA_MAJORMINOR@.la $(WEBRTC_LIBS)
libwebrtc_util_la_LDFLAGS = -avoid-version
module_echo_cancel_la_CFLAGS += -DHAVE_WEBRTC=1
diff --git a/src/Makefile.in b/src/Makefile.in
index 76aed02..38b93f8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1084,6 +1084,7 @@ librtp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(librtp_la_LDFLAGS) $(LDFLAGS) -o $@
@OS_IS_WIN32_FALSE at am_librtp_la_rpath = -rpath $(modlibexecdir)
@HAVE_WEBRTC_TRUE at libwebrtc_util_la_DEPENDENCIES = \
+ at HAVE_WEBRTC_TRUE@ libpulsecore- at PA_MAJORMINOR@.la \
@HAVE_WEBRTC_TRUE@ $(am__DEPENDENCIES_1)
am__libwebrtc_util_la_SOURCES_DIST = modules/echo-cancel/webrtc.cc
@HAVE_WEBRTC_TRUE at am_libwebrtc_util_la_OBJECTS = modules/echo-cancel/libwebrtc_util_la-webrtc.lo
@@ -4659,7 +4660,7 @@ module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
# even conditional ones).
@HAVE_WEBRTC_TRUE at libwebrtc_util_la_SOURCES = modules/echo-cancel/webrtc.cc
@HAVE_WEBRTC_TRUE at libwebrtc_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS) -DHAVE_WEBRTC=1
- at HAVE_WEBRTC_TRUE@libwebrtc_util_la_LIBADD = $(WEBRTC_LIBS)
+ at HAVE_WEBRTC_TRUE@libwebrtc_util_la_LIBADD = libpulsecore- at PA_MAJORMINOR@.la $(WEBRTC_LIBS)
@HAVE_WEBRTC_TRUE at libwebrtc_util_la_LDFLAGS = -avoid-version
# RTP modules
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index a8e5d05..b6d9f94 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -33,6 +33,14 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Line Out]
+state.plugged = no
+state.unplugged = unknown
+
+[Jack Line Out Front]
+state.plugged = no
+state.unplugged = unknown
+
[Element Hardware Master]
switch = mute
volume = merge
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index 2c51f6c..39193dd 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -36,6 +36,14 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Line Out]
+state.plugged = no
+state.unplugged = unknown
+
+[Jack Line Out Front]
+state.plugged = no
+state.unplugged = unknown
+
[Jack Speaker Phantom]
required-any = any
state.plugged = unknown
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index bfb54c9..2d6720e 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -118,7 +118,7 @@ priority = 10
[Mapping analog-surround-21]
device-strings = surround21:%f
channel-map = front-left,front-right,lfe
-paths-output = analog-output analog-output-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker
priority = 8
direction = output
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
index 9c57a20..41924f4 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
@@ -37,7 +37,7 @@ priority = 10
[Mapping analog-surround-21]
device-strings = surround21:%f
channel-map = front-left,front-right,lfe
-paths-output = analog-output analog-output-speaker-always
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
priority = 8
direction = output
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
index 8e5d429..dec57d5 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
@@ -36,7 +36,7 @@ priority = 10
[Mapping analog-surround-21]
device-strings = surround21:%f
channel-map = front-left,front-right,lfe
-paths-output = analog-output analog-output-speaker-always
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
priority = 8
direction = output
diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index df04155..a7fec04 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -455,6 +455,12 @@ static void init_eld_ctls(struct userdata *u) {
if (!u->mixer_handle)
return;
+ /* The code in this function expects ports to have a pa_alsa_port_data
+ * struct as their data, but in UCM mode ports don't have any data. Hence,
+ * the ELD controls can't currently be used in UCM mode. */
+ if (u->use_ucm)
+ return;
+
PA_HASHMAP_FOREACH(port, u->card->ports, state) {
pa_alsa_port_data *data = PA_DEVICE_PORT_DATA(port);
snd_mixer_elem_t* melem;
diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
index 09ba60a..70a6517 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -1021,6 +1021,7 @@ static void read_sink_format_reply(struct userdata *u, pa_tagstruct *reply, pa_s
PA_IDXSET_FOREACH(f, e->formats, idx) {
pa_tagstruct_put_format_info(reply, f);
}
+ perportentry_free(e);
}
pa_xfree(name);
}
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index e17051a..7e2b92a 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -272,7 +272,7 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk)
pa_source_output_assert_io_context(o);
pa_assert_se(u = o->userdata);
- if (u->skip > chunk->length) {
+ if (u->skip >= chunk->length) {
u->skip -= chunk->length;
return;
}
diff --git a/src/pulse/version.h b/src/pulse/version.h
index e437e4b..9fcbe15 100644
--- a/src/pulse/version.h
+++ b/src/pulse/version.h
@@ -33,7 +33,7 @@ PA_C_DECL_BEGIN
/** Return the version of the header files. Keep in mind that this is
a macro and not a function, so it is impossible to get the pointer of
it. */
-#define pa_get_headers_version() ("5.99.0")
+#define pa_get_headers_version() ("6.0.0")
/** Return the version of the library the current application is
* linked to. */
@@ -50,10 +50,10 @@ const char* pa_get_library_version(void);
#define PA_PROTOCOL_VERSION 30
/** The major version of PA. \since 0.9.15 */
-#define PA_MAJOR 5
+#define PA_MAJOR 6
/** The minor version of PA. \since 0.9.15 */
-#define PA_MINOR 99
+#define PA_MINOR 0
/** The micro version of PA (will always be 0 from v1.0 onwards). \since 0.9.15 */
#define PA_MICRO 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git
More information about the pkg-pulseaudio-devel
mailing list