diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2018-08-27 21:16:39 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 10:42:48 +0100 |
commit | 855e73c613620a188984db69ad780add7bc04eb4 (patch) | |
tree | e6d8900ddf274ecb9f074988ab01958f67f03958 /meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |
parent | a53b5dc5eba5a56c776cc5c23f909fc7a854ee74 (diff) | |
download | poky-855e73c613620a188984db69ad780add7bc04eb4.tar.gz |
pulseaudio: 11.1 -> 12.2
Release notes for 12.0:
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/12.0/
12.1 contains a few regression fixes:
https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030259.html
12.2 is just a fixup for the configure script brokenness in the 12.1 tarball.
qpaeq changed license from AGPL to LGPL, so now there's no AGPL licensed
code any more. This removes the excuse to not enable fftw support (i.e.
module-equalizer-sink and qpaeq). I'll enable fftw in a separate patch.
There's a new gsettings module that should be enabled, but I'll do
that in a separate patch. It's not particularly important, because the
module is only used by the paprefs GUI application that doesn't seem to
be packaged for OE at the moment.
Removed upstreamed patches:
0001-padsp-Make-it-compile-on-musl.patch
0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
License-Update: qpaeq changed license from AGPL to LGPL:
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/61217528a1cb5043ca3fa1051a73ad3268cfb3d8
(From OE-Core rev: 9bc3a8ec4a007fe75dc8f44faf6357517b1fb020)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio.inc')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 8189a569e1..f526690390 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -16,9 +16,6 @@ SECTION = "libs/multimedia" | |||
16 | # The src/pulsecore/filter/ directory contains code under the 3-clause BSD | 16 | # The src/pulsecore/filter/ directory contains code under the 3-clause BSD |
17 | # license. | 17 | # license. |
18 | # | 18 | # |
19 | # src/utils/qpaeq is licensed under AGPL. qpaeq is not installed by this | ||
20 | # recipe, however, which is why AGPL is not mentioned in LICENSE. | ||
21 | # | ||
22 | # People who distribute PulseAudio binaries need to also consider that there | 19 | # People who distribute PulseAudio binaries need to also consider that there |
23 | # are some dependencies to GPL libraries. LGPL code that depends on GPL | 20 | # are some dependencies to GPL libraries. LGPL code that depends on GPL |
24 | # libraries probably becomes effectively GPL-licensed (at compile-time? or at | 21 | # libraries probably becomes effectively GPL-licensed (at compile-time? or at |
@@ -47,16 +44,14 @@ SECTION = "libs/multimedia" | |||
47 | # section 3, and therefore libdbus's GPL license doesn't affect PulseAudio. | 44 | # section 3, and therefore libdbus's GPL license doesn't affect PulseAudio. |
48 | LICENSE = "LGPLv2.1+ & MIT & BSD-3-Clause" | 45 | LICENSE = "LGPLv2.1+ & MIT & BSD-3-Clause" |
49 | 46 | ||
50 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a848e8d03f04976778eab2348b59ed2b \ | 47 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5cd938de1a7a53ea5adac38cc10c39 \ |
51 | file://GPL;md5=4325afd396febcb659c36b49533135d4 \ | 48 | file://GPL;md5=4325afd396febcb659c36b49533135d4 \ |
52 | file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | 49 | file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ |
53 | file://AGPL;md5=73f1eb20517c55bf9493b7dd6e480788 \ | ||
54 | file://src/modules/echo-cancel/adrian-license.txt;md5=abbab006a561fbffccedf1c3531f34ab \ | 50 | file://src/modules/echo-cancel/adrian-license.txt;md5=abbab006a561fbffccedf1c3531f34ab \ |
55 | file://src/pulsecore/filter/LICENSE.WEBKIT;md5=49defbaffddf8c51faf606ff7fc3b1f7 \ | 51 | file://src/pulsecore/filter/LICENSE.WEBKIT;md5=49defbaffddf8c51faf606ff7fc3b1f7 \ |
56 | file://src/pulsecore/resampler.h;beginline=4;endline=21;md5=09794012ae16912c0270f3280cc8ff84 \ | 52 | file://src/pulsecore/resampler.h;beginline=4;endline=21;md5=09794012ae16912c0270f3280cc8ff84 \ |
57 | file://src/modules/reserve.h;beginline=6;endline=28;md5=0e23094760367d51b6609750e9b31fbb \ | 53 | file://src/modules/reserve.h;beginline=6;endline=28;md5=0e23094760367d51b6609750e9b31fbb \ |
58 | file://src/pulsecore/rtkit.h;beginline=6;endline=29;md5=3f00ff966716ae0817c31576d1473528 \ | 54 | file://src/pulsecore/rtkit.h;beginline=6;endline=29;md5=3f00ff966716ae0817c31576d1473528 \ |
59 | file://src/utils/qpaeq;beginline=2;endline=16;md5=7f62515a4762f0c3fc3d4201858bb964 \ | ||
60 | file://src/modules/echo-cancel/adrian-aec.h;beginline=3;endline=12;md5=d3ed4fad1c073f8b06f37495dc5d1026 \ | 55 | file://src/modules/echo-cancel/adrian-aec.h;beginline=3;endline=12;md5=d3ed4fad1c073f8b06f37495dc5d1026 \ |
61 | file://src/pulsecore/filter/biquad.h;beginline=1;endline=4;md5=6d46d1365206528a20137355924233c1 \ | 56 | file://src/pulsecore/filter/biquad.h;beginline=1;endline=4;md5=6d46d1365206528a20137355924233c1 \ |
62 | " | 57 | " |
@@ -93,10 +88,6 @@ EXTRA_OECONF += "--without-soxr" | |||
93 | # ddbd713293 without explaining why it was not made a PACKAGECONFIG item | 88 | # ddbd713293 without explaining why it was not made a PACKAGECONFIG item |
94 | # instead. Oh well, let's keep it disabled until someone expresses some | 89 | # instead. Oh well, let's keep it disabled until someone expresses some |
95 | # interest in having it enabled. | 90 | # interest in having it enabled. |
96 | # | ||
97 | # One nice thing about disabling this is that it also prevents qpaeq from | ||
98 | # being installed, so we avoid adding AGPL to the list of licenses (nothing | ||
99 | # else in PulseAudio is licensed under AGPL). | ||
100 | EXTRA_OECONF += "--without-fftw" | 91 | EXTRA_OECONF += "--without-fftw" |
101 | 92 | ||
102 | # The "adrian" echo canceller implementation has a non-standard license | 93 | # The "adrian" echo canceller implementation has a non-standard license |
@@ -106,6 +97,10 @@ EXTRA_OECONF += "--without-fftw" | |||
106 | # very good anyway, better alternatives exist (such as the webrtc canceller). | 97 | # very good anyway, better alternatives exist (such as the webrtc canceller). |
107 | EXTRA_OECONF += "--disable-adrian-aec" | 98 | EXTRA_OECONF += "--disable-adrian-aec" |
108 | 99 | ||
100 | # FIXME: The gsettings module is temporarily disabled, because adding support | ||
101 | # for it is a bit complicated. | ||
102 | EXTRA_OECONF += "--disable-gsettings" | ||
103 | |||
109 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 104 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
110 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 105 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
111 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ | 106 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ |