Skip to contentSkip to conversation

cairo: Adapt license for cairo-dbg and cairo-src based on contents

PATCH In review Peter Kjellerstedt 3 participants 3 messages Jan 10, 2020 – Jan 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 cairo: Adapt license for cairo-dbg and cairo-src based on contents

Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only part of the code licensed as GPL-3.0, and which is normally packaged separately in cairo-perf-utils). By disabling this, we can adapt the licenses for cairo-dbg and cairo-src so that they do not include "GPLv3+" when trace is disabled and thus they can be used also when, e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE.

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

---

PATCHv2: Remove the /usr/bin and /usr/lib/cairo directories if they are empty.

 meta/recipes-graphics/cairo/cairo_1.16.0.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
meta/recipes-graphics/cairo/cairo_1.16.0.bb +9 -1
index e3de3f6164..d5820166b1 100644
@@ -17,6 +17,10 @@ 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+"
+# Adapt the licenses for cairo-dbg and cairo-src depending on whether
+# cairo-trace is being built.
+LICENSE_${PN}-dbg = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', d)}"
+LICENSE_${PN}-src = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', d)}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
@@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
+                   trace"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
@@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind"
 PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl"
 PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2"
 PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
+PACKAGECONFIG[trace] = "--enable-trace,--disable-trace"
 
 EXTRA_OECONF += " \
     ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-point', '', d)} \
@@ -66,6 +72,8 @@ do_install_append () {
 	rm -rf ${D}${libdir}/cairo/cairo-sphinx*
 	rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr*
 	rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx*
+	rmdir -p --ignore-fail-on-non-empty ${D}${bindir}
+	rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo
 }
 
 PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
Signature · 1 line
2.21.1
#1 lore raw
Quoted 6 lines · Peter Kjellerstedt

Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only part of the code licensed as GPL-3.0, and which is normally packaged separately in cairo-perf-utils). By disabling this, we can adapt the licenses for cairo-dbg and cairo-src so that they do not include "GPLv3+" when trace is disabled and thus they can be used also when, e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE.

The shortlog makes no mention of trace at all. Can this be split into two commits, one for trace and one for the license mangling.

The license mangling is quite ugly but I'm not sure if there's a better solution...

Ross

#2 lore raw
Quoted 16 lines

-----Original Message-----
From: [email protected] <openembedded-core- [email protected]> On Behalf Of Ross Burton
Sent: den 11 januari 2020 00:28
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCHv2] cairo: Adapt license for cairo-dbg and cairo-src based on contents

Quoted 6 lines · Peter Kjellerstedt

Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only part of the code licensed as GPL-3.0, and which is normally packaged separately in cairo-perf-utils). By disabling this, we can adapt the licenses for cairo-dbg and cairo-src so that they do not include "GPLv3+" when trace is disabled and thus they can be used also when, e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE.

Quoted 2 lines

The shortlog makes no mention of trace at all. Can this be split into two commits, one for trace and one for the license mangling.

I will split it in two patches.

Quoted 4 lines

The license mangling is quite ugly but I'm not sure if there's a better solution...

Ross

//Peter