Merge branch 'pa12.2' into 'master'

Update to PulseAudio 12.2.

See merge request mer-core/pulseaudio!24

LICENSE

@@ -26,7 +26,7 @@ details.
 
 Some other files pulled into PA source (i.e. reference implementations that are
 considered too small and stable to be considered as an external library) use the
-more permissive MIT license. This include the device reservation DBus protocol
+more permissive MIT license. These include the device reservation DBus protocol
 and realtime kit implementations.
 
 A more permissive BSD-style license is used for LFE filters, see
@@ -35,10 +35,6 @@ src/pulsecore/filter/LICENSE.WEBKIT for details.
 Additionally, a more permissive Sun license is used for code that performs
 u-law, A-law and linear PCM conversions.
 
-The qpaeq program (src/utils/qpaeq) is licensed under the GNU Affero General
-Public License (version 3, or any later version at your discretion). See the
-file AGPL for details.
-
 While we attempt to provide a summary here, it is the ultimate responsibility of
 the packager to ensure the components they use in their build of PulseAudio
 meets their license requirements.

Makefile.am

@@ -16,7 +16,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
-	AGPL \
 	bootstrap.sh \
 	coverity/model.c \
 	git-version-gen \
@@ -69,14 +68,14 @@ bashcompletiondir=@bashcompletiondir@
 dist_bashcompletion_DATA = shell-completion/bash/pulseaudio
 
 install-bashcompletion-aliases:
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pactl
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacmd
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pasuspender
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/padsp
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacat
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/paplay
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parec
-	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parecord
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio pactl
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio pacmd
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio pasuspender
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio padsp
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio pacat
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio paplay
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio parec
+	cd $(DESTDIR)$(bashcompletiondir) && $(LN_S) -f pulseaudio parecord
 
 install-data-hook: install-bashcompletion-aliases
 

NEWS

@@ -1,3 +1,108 @@
+PulseAudio 12.2
+
+The previous release tarball contained a broken configure script, this release
+fixes the tarball. There are no changes in the source, except for this NEWS
+file update.
+
+Contributors
+
+  Tanu Kaskinen
+
+
+PulseAudio 12.1
+
+A bug fix release.
+
+ * Fixed crash when switching to A2DP bluetooth profile
+ * Fixed plugin search path in module-ladspa-sink
+ * Fixed file permissions for the pipes created by module-pipe-sink and
+   module-pipe-source
+
+Contributors
+
+  Mr. M
+  Tanu Kaskinen
+
+
+PulseAudio 12.0
+
+Changes at a glance:
+
+ * Better latency reporting (and hence better A/V sync) with the A2DP bluetooth
+   profile
+ * Much more accurate latency reporting for AirPlay devices
+ * module-switch-on-connect now ignores virtual devices
+ * When using passthrough for compressed audio, set the "non-audio" bit
+ * Prioritize HDMI output over S/PDIF output
+ * HSP support for more bluetooth headsets
+ * Choose the A2DP bluetooth profile by default instead of HSP
+ * New "sink_input_properties" module argument for module-ladspa-sink
+ * New "use_system_clock_for_timing" module argument for module-pipe-sink
+ * module-pipe-sink can now use an existing pipe
+ * Fixed a crash or high CPU use problem with Intel HDMI LPE
+ * Steelseries Arctis 7 USB headset stereo output support
+ * Dell Thunderbolt Dock TB16 speaker jack support
+ * Fixed digital input support for some USB sound cards
+ * Fixed Native Instruments Traktor Audio 6 detection
+ * Ability to disable input or output on macOS
+ * New "dereverb" option for the Speex echo canceller
+ * New module: module-always-source
+ * State files not any more readable by all users in the system mode
+ * module-augment-properties now uses XDG_DATA_DIRS to find .desktop files
+ * Updates for the Vala bindings
+ * The GConf dependency can now be avoided
+ * qpaeq license changed from AGPL to LGPL
+ * qpaeq ported to Qt 5
+ * Compatibility with glibc 2.27
+ * The esdcompat tool isn't any more installed if esound support is disabled
+
+Detailed change log:
+
+  https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/12.0/
+
+Contributors
+
+  Andika Triwidada
+  Andrius Štikonas
+  Arun Raghavan
+  Cheng-Chia Tseng
+  Colin Leroy
+  Constantine Kharlamov
+  Daniel Rusek
+  David Henningsson
+  David Hewitt
+  Felipe Sateler
+  Georg Chini
+  Guenter Milde
+  Hui Wang
+  Ian Ray
+  Iceyer
+  jnqnfe
+  Johan Heikkilä
+  Josef Andersson
+  Jungsup Lee
+  Khem Raj
+  KimJeongYeon
+  Kristian Klausen
+  Laurent Bigonville
+  Mihai Moldovan
+  Mr. M
+  Peter Meerwald-Stadler
+  Pierre-Louis Bossart
+  Piotr Drąg
+  Roliga
+  Russell Treleaven
+  Salvador Fandino
+  Samo Pogačnik
+  Sangchul Lee
+  Sebastian Dröge
+  Sylvain Baubeau
+  Tanu Kaskinen
+  Vivek Dasmohapatra
+  wellington wallace
+  Yuri Chornoivan
+
+
 PulseAudio 11.1
 
 A bug fix release.

bootstrap.sh

@@ -32,13 +32,17 @@ fi
 # configure file faulty.
 if ! pkg-config --version &>/dev/null; then
     echo "pkg-config is required to bootstrap this program"
-    DIE=1
+    exit 1
 fi
-
 # Other necessary programs
-intltoolize --version >/dev/null || DIE=1
-test "$DIE" = 1 && exit 1
-
+if ! autopoint --version &>/dev/null ; then
+    echo "autopoint is required to bootstrap this program"
+    exit 1
+fi
+if ! intltoolize --version >/dev/null ; then
+    echo "intltoolize is required to bootstrap this program"
+    exit 1
+fi
 autopoint --force
 AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 

configure.ac

@@ -44,7 +44,7 @@ AC_SUBST(PA_PROTOCOL_VERSION, 32)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [20:2:20])
+AC_SUBST(LIBPULSE_VERSION_INFO, [20:3:20])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z
@@ -84,9 +84,9 @@ AM_PROG_CC_C_O
 # Only required if you want the WebRTC canceller -- no runtime dep on
 # libstdc++ otherwise
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11([ext],[optional])
 AC_PROG_GCC_TRADITIONAL
 AC_USE_SYSTEM_EXTENSIONS
+AX_CXX_COMPILE_STDCXX_11([ext],[optional])
 
 # M4
 
@@ -213,6 +213,9 @@ AC_SUBST([VERSIONING_LDFLAGS])
 # The -z now syntax is lifted from Sun's linker and works with GNU's too, other linkers might be added later.
 AX_APPEND_LINK_FLAGS([-Wl,-z,now], [IMMEDIATE_LDFLAGS])
 AC_SUBST([IMMEDIATE_LDFLAGS])
+AS_CASE([$IMMEDIATE_LDFLAGS],[*-z,now*],
+    [AC_DEFINE([HAVE_BIND_NOW],[1],
+               [Define to 1 if immediate binding is available])])
 
 # On ELF systems we don't want the libraries to be unloaded since we don't clean them up properly,
 # so we request the nodelete flag to be enabled.
@@ -410,7 +413,7 @@ AC_SUBST([LIBLTDL])
 AC_HEADER_STDC
 
 # POSIX
-AC_CHECK_HEADERS_ONCE([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
+AC_CHECK_HEADERS_ONCE([arpa/inet.h cpuid.h glob.h grp.h netdb.h netinet/in.h \
     netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
     sys/mman.h sys/select.h sys/socket.h sys/wait.h \
     sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
@@ -607,6 +610,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
     [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
                   *** Use linux v3.17 or higher for such a feature.])])
 
+AS_IF([test "x$HAVE_MEMFD" = "x1"],
+    AC_CHECK_FUNCS([memfd_create]))
+
 AC_SUBST(HAVE_MEMFD)
 AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
 AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
@@ -906,19 +912,47 @@ AS_IF([test "x$enable_gtk3" = "xyes" && test "x$HAVE_GTK30" = "x0"],
 AM_CONDITIONAL([HAVE_GTK30], [test "x$HAVE_GTK30" = x1])
 AS_IF([test "x$HAVE_GTK30" = "x1"], AC_DEFINE([HAVE_GTK], 1, [Have GTK?]))
 
-#### GConf support (optional) ####
+#### GSettings and GConf support (optional) ####
+
+AC_ARG_ENABLE([gsettings],
+    AS_HELP_STRING([--disable-gsettings],[Disable optional GSettings support]))
 
 AC_ARG_ENABLE([gconf],
     AS_HELP_STRING([--disable-gconf],[Disable optional GConf support]))
 
+AS_IF([test "x$enable_gsettings" != "xno"],
+    [PKG_CHECK_MODULES(GSETTINGS, [ gio-2.0 >= 2.26.0 ], [HAVE_GSETTINGS=1], [HAVE_GSETTINGS=0])],
+    HAVE_GSETTINGS=0)
+
+AS_IF([test "x$enable_gsettings" = "xyes" && test "x$HAVE_GSETTINGS" = "x0"],
+    [AC_MSG_ERROR([*** GSettings support not found])])
+
 AS_IF([test "x$enable_gconf" != "xno"],
     [PKG_CHECK_MODULES(GCONF, [ gconf-2.0 >= 2.4.0 gobject-2.0 ], HAVE_GCONF=1, HAVE_GCONF=0)],
     HAVE_GCONF=0)
 
 AS_IF([test "x$enable_gconf" = "xyes" && test "x$HAVE_GCONF" = "x0"],
     [AC_MSG_ERROR([*** GConf support not found])])
 
-AM_CONDITIONAL([HAVE_GCONF], [test "x$HAVE_GCONF" = x1])
+# Enable only one of GSettings and GConf, unless both were explicitly
+# requested. If neither was explicitly requested and both are available, prefer
+# GSettings. This is done, because if module-gsettings and module-gconf are
+# both loaded, they can cause conflicting or at least confusing configuration.
+# Distributions may want to enable both modules when building PulseAudio, if
+# they ensure that both modules are never installed at the same time.
+AS_IF([test "x$HAVE_GSETTINGS" = "x1" && test "x$enable_gconf" != "xyes"],
+      [HAVE_GCONF=0])
+AS_IF([test "x$HAVE_GCONF" = "x1" && test "x$enable_gsettings" != "xyes"],
+      [HAVE_GSETTINGS=0])
+
+AM_CONDITIONAL([HAVE_GSETTINGS], [test "x$HAVE_GSETTINGS" = "x1"])
+AC_SUBST([HAVE_GSETTINGS])
+AM_CONDITIONAL([HAVE_GCONF], [test "x$HAVE_GCONF" = "x1"])
+AC_SUBST([HAVE_GCONF])
+
+if test "x$HAVE_GSETTINGS" = "x1" ; then
+    GLIB_GSETTINGS
+fi
 
 #### Avahi support (optional) ####
 
@@ -1504,7 +1538,6 @@ doxygen/doxygen.conf
 src/pulse/version.h
 po/Makefile.in
 man/pulseaudio.1.xml
-man/esdcompat.1.xml
 man/pax11publish.1.xml
 man/pacat.1.xml
 man/pacmd.1.xml
@@ -1518,7 +1551,12 @@ man/pulse-cli-syntax.5.xml
 man/start-pulseaudio-x11.1.xml
 ])
 
-AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
+AS_IF([test "x$HAVE_ESOUND" = "x1"],
+    [
+        AC_CONFIG_FILES([man/esdcompat.1.xml])
+        AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
+    ])
+
 AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], [chmod +x src/start-pulseaudio-x11])
 AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in])
 AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in],
@@ -1557,6 +1595,7 @@ AS_IF([test "x$HAVE_WAVEOUT" = "x1"], ENABLE_WAVEOUT=yes, ENABLE_WAVEOUT=no)
 AS_IF([test "x$HAVE_GLIB20" = "x1"], ENABLE_GLIB20=yes, ENABLE_GLIB20=no)
 AS_IF([test "x$HAVE_GTK30" = "x1"], ENABLE_GTK30=yes, ENABLE_GTK30=no)
 AS_IF([test "x$HAVE_GCONF" = "x1"], ENABLE_GCONF=yes, ENABLE_GCONF=no)
+AS_IF([test "x$HAVE_GSETTINGS" = "x1"], ENABLE_GSETTINGS=yes, ENABLE_GSETTINGS=no)
 AS_IF([test "x$HAVE_AVAHI" = "x1"], ENABLE_AVAHI=yes, ENABLE_AVAHI=no)
 AS_IF([test "x$HAVE_JACK" = "x1"], ENABLE_JACK=yes, ENABLE_JACK=no)
 AS_IF([test "x$HAVE_LIBASYNCNS" = "x1"], ENABLE_LIBASYNCNS=yes, ENABLE_LIBASYNCNS=no)
@@ -1619,6 +1658,7 @@ echo "
     Enable GLib 2.0:               ${ENABLE_GLIB20}
     Enable Gtk+ 3.0:               ${ENABLE_GTK30}
     Enable GConf:                  ${ENABLE_GCONF}
+    Enable GSettings:              ${ENABLE_GSETTINGS}
     Enable Avahi:                  ${ENABLE_AVAHI}
     Enable Jack:                   ${ENABLE_JACK}
     Enable Async DNS:              ${ENABLE_LIBASYNCNS}

man/Makefile.am

@@ -18,7 +18,6 @@ DISTCLEANFILES = \
 
 noinst_DATA = \
 	pulseaudio.1.xml \
-	esdcompat.1.xml \
 	pax11publish.1.xml \
 	pacat.1.xml \
 	pacmd.1.xml \
@@ -31,6 +30,10 @@ noinst_DATA = \
 	pulse-cli-syntax.5.xml \
 	start-pulseaudio-x11.1.xml
 
+if HAVE_ESOUND
+noinst_DATA += esdcompat.1.xml
+endif
+
 xmllint: $(noinst_DATA)
 	for f in $(noinst_DATA) ; do \
 			xmllint --noout --valid "$$f" || exit 1 ; \
@@ -40,7 +43,6 @@ if BUILD_MANPAGES
 
 dist_man_MANS = \
 	pulseaudio.1 \
-	esdcompat.1 \
 	pax11publish.1 \
 	pacat.1 \
 	pacmd.1 \
@@ -53,6 +55,9 @@ dist_man_MANS = \
 	pulse-cli-syntax.5 \
 	start-pulseaudio-x11.1
 
+if HAVE_ESOUND
+dist_man_MANS += esdcompat.1
+endif
 CLEANFILES = \
 	$(dist_man_MANS)