summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2013-06-25 09:20:03 +0530
committerArun Raghavan <arun.raghavan@collabora.co.uk>2013-08-07 23:16:30 +0530
commite870da40c3d6847eaccd2899ddaf7b20fc7dc199 (patch)
tree8c4da1f0f1054f06c3f7793c42fdac46c260e54a /LICENSE
parent9fa3466366fc591e3492ae62a6826bbb48b1e338 (diff)
doc: Update LICENSE to reflect optional libpulse dep on libdbus
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE7
1 files changed, 7 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index cd5e42f24..30833e59e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,6 +13,13 @@ Since the PulseAudio daemon, tests, various utilities/helpers and the modules
link to libpulsecore and/or the afore mentioned optional GPL dependencies they
are of course also GPL licensed also in this scenario.
+In addition to this, if D-Bus support is enabled, the PulseAudio client library
+(libpulse) MAY need to be licensed under the GPL, depending on the license
+adopted for libdbus. libdbus is licensed under either of the Academic Free
+License 2.1 or GPL 2.0 or above. Which of these applies is your choice, and the
+result affects the licensing of libpulse and thus, potentially, all programs
+that link to libpulse.
+
Andre Adrian's echo cancellation implementation is licensed under a less
restrictive license - see src/modules/echo-cancel/adrian-license.txt for
details.