Skip to content

Commit ab8a0bf

Browse files
committed
Add a COPYING file to each aux. source directory
Include a COPYING inside perf/, test/, util/ to clarify the licensing conditions beneath the respective directories. This is because cairo itself (libcairo.so) is LGPL-2.1/MPL-1.1 but that only relates to src/. The auxiliary source files are under a mix of free licenses and we wish to be clear just what license applies to each file. In particular, cairo-trace needs to include the GPL terms and conditions.
1 parent c554f18 commit ab8a0bf

File tree

10 files changed

+709
-11
lines changed

10 files changed

+709
-11
lines changed

COPYING

+9-8
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ Please see each file in the implementation for copyright and licensing
1717
information, (in the opening comment of each file).
1818

1919
[*] The implementation of cairo is contained entirely within the "src"
20-
and "pixman" directories of the cairo source distribution. There are
21-
other components of the cairo source distribution (such as the "test"
22-
and "perf") that are auxiliary to the library itself. None of the
23-
source code in these directories contributes to a build of the cairo
24-
library itself, (libcairo.so or cairo.dll or similar).
20+
directory of the cairo source distribution. There are other components
21+
of the cairo source distribution (such as the "test", "util", and "perf")
22+
that are auxiliary to the library itself. None of the source code in these
23+
directories contributes to a build of the cairo library itself, (libcairo.so
24+
or cairo.dll or similar).
2525

26-
These auxilary components are also free software, but may be under
26+
These auxiliary components are also free software, but may be under
2727
different license terms than cairo itself. For example, most of the
2828
test cases in the perf and test directories are made available under
2929
an MIT license to simplify any use of this code for reference purposes
3030
in using cairo itself. Other files might be available under the GNU
31-
General Public License (GPL), for example. Again, please see the
32-
opening comment of each file for copyright and licensing information.
31+
General Public License (GPL), for example. Again, please see the COPYING
32+
file under each directory and the opening comment of each file for copyright
33+
and licensing information.

perf/COPYING

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Cairo is free software.
2+
3+
These tests are mainly available under a liberal MIT license to simplify
4+
any use of the code for reference purposes. Please check the opening comment
5+
of each file for copyright and licensing information.

perf/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
88
$(CAIRO_CFLAGS)
99

1010
EXTRA_PROGRAMS += cairo-perf cairo-perf-diff-files cairo-perf-graph-files
11-
EXTRA_DIST += cairo-perf-diff
11+
EXTRA_DIST += cairo-perf-diff COPYING
1212
EXTRA_LTLIBRARIES += libcairoperf.la
1313

1414
LDADD = $(top_builddir)/boilerplate/libcairoboilerplate.la \

test/COPYING

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Cairo is free software.
2+
3+
These tests are mainly available under a liberal MIT license to simplify
4+
any use of the code for reference purposes. Please check the opening comment
5+
of each file for copyright and licensing information.

test/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ endif
287287

288288
BUILT_SOURCES += cairo-test-constructors.c
289289
noinst_SCRIPTS = make-cairo-test-constructors.pl
290-
EXTRA_DIST += $(BUILT_SOURCES) $(noinst_SCRIPTS)
290+
EXTRA_DIST += $(BUILT_SOURCES) $(noinst_SCRIPTS) COPYING
291291
CLEANFILES += $(BUILT_SOURCES)
292292

293293
# All tests which have a reference image go here.

util/COPYING

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Cairo is free software.
2+
3+
These utilities are all free software, please see the licensing conditions
4+
in the opening comments of each file.

util/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ backtrace_symbols_la_LIBADD = -lbfd -liberty
2525
malloc_stats_la_LIBADD = $(backtrace_symbols_la_LIBADD) backtrace-symbols.lo
2626

2727
EXTRA_DIST += \
28+
COPYING \
2829
xr2cairo \
2930
cairo-api-update

util/cairo-trace/COPYING

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Cairo is free software.
2+
3+
cairo-trace is released under the terms of the GNU General Public License
4+
(GPL) version 3. Please see COPYING-GPL-3 for the precise terms and
5+
conditions.

util/cairo-trace/COPYING-GPL-3

+674
Large diffs are not rendered by default.

util/cairo-trace/Makefile.am

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ system-install:
1818
system-uninstall:
1919
sed -e '/\/usr\/local\/lib\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload;
2020

21-
EXTRA_DIST = cairo-trace.in
21+
EXTRA_DIST = \
22+
COPYING \
23+
COPYING-GPL-3 \
24+
cairo-trace.in

0 commit comments

Comments
 (0)