summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cairo
diff options
context:
space:
mode:
authorFilip Jareš <filipjares@gmail.com>2019-06-05 09:34:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-06 00:38:38 +0100
commit85cdf2ddfbfa956f9fcb705f886645f1884149c1 (patch)
treef0fe77ad1086d96fed8c069d50c019b3387937eb /meta/recipes-graphics/cairo
parent4e3b013daaa07934f1fa81f1b26fe40fea1e3435 (diff)
downloadopenembedded-core-contrib-85cdf2ddfbfa956f9fcb705f886645f1884149c1.tar.gz
recipes: Fix license "names"/versions.
These were broken in commit 4786ecdf7cd427089464dcb62579110d494e7cd7 which performed a cleanup to avoid non-standard field names. There is an SPDX License list at https://spdx.org/licenses/ which aims to be a standard. Yocto also uses a substitution map SPDXLICENSEMAP, default one stored at meta/conf/licenses.conf. According to meta/conf/licenses.conf, "AFL-2" corresponds to "AFL-2.0" which is not correct for dbus. According to the same licenses.conf file "MPL-1" corresponds to "MPL-1.0", which is correct for libical but since SPDX aims to be a standard I am updating the identifier in libical's .bb file as well. To verify the actual license used you can use: dbus: cd /tmp/ wget http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz tar -xaf dbus-glib-0.110.tar.gz cd dbus-glib-0.110 grep -A1 "^The Academic Free License$" COPYING cd /tmp/ wget http://dbus.freedesktop.org/releases/dbus/dbus-1.12.14.tar.gz tar -xaf dbus-1.12.14.tar.gz cd dbus-1.12.14 grep -A1 "^The Academic Free License$" COPYING cairo: wget --quiet -O - https://cgit.freedesktop.org/cairo/plain/COPYING-MPL-1.1?h=1.16.0 | grep -A1 "MOZILLA PUBLIC LICENSE" libical: wget --quiet -O - https://raw.githubusercontent.com/libical/libical/v2.0.0/COPYING | grep "Mozilla Public License" taglib: wget --quiet -O - https://raw.githubusercontent.com/taglib/taglib/v1.11.1/COPYING.MPL | grep -A1 "MOZILLA PUBLIC LICENSE" Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo')
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.16.0.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index c2628ae0ca..f32e9ba1bc 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -10,12 +10,12 @@ HOMEPAGE = "http://cairographics.org"
BUGTRACKER = "http://bugs.freedesktop.org"
SECTION = "libs"
-LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+"
-LICENSE_${PN} = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-doc = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-script-interpreter = "MPL-1 & LGPLv2.1"
+LICENSE = "MPL-1.1 & LGPLv2.1 & GPLv3+"
+LICENSE_${PN} = "MPL-1.1 & LGPLv2.1"
+LICENSE_${PN}-dev = "MPL-1.1 & LGPLv2.1"
+LICENSE_${PN}-doc = "MPL-1.1 & LGPLv2.1"
+LICENSE_${PN}-gobject = "MPL-1.1 & LGPLv2.1"
+LICENSE_${PN}-script-interpreter = "MPL-1.1 & LGPLv2.1"
LICENSE_${PN}-perf-utils = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"