Commit Graph

14 Commits

Author SHA1 Message Date
Peter Kjellerstedt
ed3db56c49 cairo: Adapt the license information based on what is being built
If the "trace" PACKAGECONFIG is removed to disable cairo-trace (the
only part of the code licensed as GPL-3.0), we can adapt the licenses
for cairo-dbg and cairo-src so that they do not include
"GPL-3.0-or-later" and thus they can be used also when, e.g., GPL-3.0
is blacklisted in INCOMPATIBLE_LICENSE. Also drop the GPL-3.0 license
text from LIC_FILES_CHKSUM in this case.

(From OE-Core rev: 4f0ea44c80f297d00349b7d3cf9438145aec8a74)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-09-08 14:59:39 +01:00
Richard Purdie
809c7768cc cairo: Add missing GPLv3 license checksum entry
The trace tools are licensed under GPL-3.0-or-later but this wasn't
listed in LIC_FILES_CHKSUM. Fix that.

Ultimately we could disable that license if the trace PACKAGECONFIG is
disabled but I'll leave that to someone else if they're keen.

(From OE-Core rev: f763b906ea10705d519c9eebb5ef1ebe87d49d7c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-05-07 22:31:21 +01:00
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Ross Burton
cb93117edb cairo: backport patch for CVE-2020-35492
(From OE-Core rev: 0c4e6f99332ae253855708845a41fdfeb72d4c30)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-11 11:54:26 +01:00
Konrad Weihmann
5e0783d1f2 cairo: remove trailing whitespace
Remove trailing whitespaces after line continuation

(From OE-Core rev: b44a30b7443f271771665c9282ec4cd14e57678b)

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:31 +01:00
Peter Kjellerstedt
e075a77c14 cairo: Do not try to remove nonexistent directories
Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to
native/nativesdk from target) changed the default PACKAGECONFIG for
native and nativesdk so that it becomes empty unless "x11" is in
DISTRO_FEATURES since "trace" was also removed (propbably
unintentionally). This highlighted than an empty PACKAGECONFIG would
lead to a build failure since /usr/bin is never created under these
conditions, but the recipe still tried to remove it.

(From OE-Core rev: 9bb2268677ac8f0c97433bf1f04555abe88028a9)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:31 +01:00
Alexander Kanavin
2e29151a3a bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl
when building for -native: we do not need it, and it would cause build
failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes
as opengl feature is now correctly set for those variants.

(From OE-Core rev: 0e1f8fa0535dab63742f575b52ec9fa891368ca2)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-27 11:04:47 +01:00
Peter Kjellerstedt
58a6955820 cairo: Add a PACKAGECONFIG "trace" to disable cairo-trace
cairo-trace is the only part of cairo that is licensed as GPL-3.0, and
is normally packaged separately in cairo-perf-utils.

The "trace" PACKAGECONFIG is enabled by default for backwards
compatibility.

(From OE-Core rev: e0c4535fb3c347e19d3dada07a97545bfd48239c)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-27 16:48:08 +00:00
Alexander Kanavin
505f7f05a7 cairo: the component is dual licensed
Somehow, over the years, no one noticed that cairo does in fact
offer a choice between mpl and lgpl, but the COPYING makes it clear:

https://gitlab.freedesktop.org/cairo/cairo/blob/1.16/COPYING

(From OE-Core rev: 6b72445aa098054257da77aab8e8d4ffcd3d0437)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-11-21 23:08:20 +00:00
Filip Jareš
9f005f0539 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"

(From OE-Core rev: 85cdf2ddfbfa956f9fcb705f886645f1884149c1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-06-06 00:40:08 +01:00
Ross Burton
0e3a1b57fc cairo: fix CVE-2018-19876 CVE-2019-6461 CVE-2019-6462
CVE-2018-19876 is a backport from upstream.

CVE-2019-6461 and CVE-2019-6462 are patches taken from Clear Linux.

(From OE-Core rev: 078e4d5c2114d942806cd0d5ad501805a011e841)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-03-06 10:39:25 +00:00
Anuj Mittal
eba1e8f564 cairo: fix UPSTREAM_CHECK_REGEX
Otherwise it matches versions for 'rcairo' as well.

(From OE-Core rev: 699623d01f34c061260e98d3d9f0c9cae37edbe6)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-19 16:14:57 +00:00
Anuj Mittal
1d1dc29618 cairo: upgrade 1.14.12 -> 1.16.0
* For changes, see:

https://www.cairographics.org/releases/ChangeLog.cairo-1.16.0

* Remove the backported patch.

* libcairo-trace isn't a version lib anymore, fix the packaging and
include it in perf-utils.

(From OE-Core rev: ce6f4f3e40e8864e50bb06be37250f4e6f323acd)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-15 08:17:49 +00:00