From patchwork Fri Jun 5 18:38:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3957 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F42D603C6 for ; Fri, 5 Jun 2020 20:38:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="mkhHnVsp"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F0CD327C for ; Fri, 5 Jun 2020 20:38:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1591382337; bh=LJVTDcg38/ZisVMZ0KuBO7MMNE2/mHZWI72zsiVmkJs=; h=From:To:Subject:Date:From; b=mkhHnVspHvrw5TosIpkYHAzUdwoBd9Jtv9PcyE0mtCtGtx5frFXyc+z/U+LKq+J16 JXRsHui1NqeqQs9b18+NvgHKsLCY5OzurXyXWwciZ7KCdGH9JydDiouMd3IYFacMzL IK77ZyoQ/o1AtNWPRvFCwoudjpF6izUfWP4A8xgc= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 5 Jun 2020 21:38:31 +0300 Message-Id: <20200605183833.8125-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libcamera: Add missing SPDX headers to miscellaneous small files X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:38:57 -0000 Add missing SPDX headers to miscellaneous small files. Use CC0-1.0 for meson.build, .gitignore and the small include/linux/README, and licenses matching the corresponding component for other files. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- .gitignore | 2 ++ include/linux/README | 2 ++ src/ipa/raspberrypi/README.md | 2 ++ src/ipa/raspberrypi/data/meson.build | 2 ++ src/ipa/vimc/data/vimc.conf | 2 ++ src/qcam/assets/feathericons/feathericons.qrc | 1 + 6 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index f989dee3bcb0..d3d73615bac1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: CC0-1.0 + __pycache__/ build/ patches/ diff --git a/include/linux/README b/include/linux/README index 2d5b2e0240fa..5e8614cb902c 100644 --- a/include/linux/README +++ b/include/linux/README @@ -1,2 +1,4 @@ +# SPDX-License-Identifier: CC0-1.0 + Files in this directory are imported from v5.2 of the Linux kernel. Do not modify them manually. diff --git a/src/ipa/raspberrypi/README.md b/src/ipa/raspberrypi/README.md index 68bdff12fbeb..26534af0f708 100644 --- a/src/ipa/raspberrypi/README.md +++ b/src/ipa/raspberrypi/README.md @@ -1,3 +1,5 @@ +.. SPDX-License-Identifier: BSD-2-Clause + # _libcamera_ for the Raspberry Pi Raspberry Pi provides a fully featured pipeline handler and control algorithms diff --git a/src/ipa/raspberrypi/data/meson.build b/src/ipa/raspberrypi/data/meson.build index 6ff27745ff80..5236bf1ec949 100644 --- a/src/ipa/raspberrypi/data/meson.build +++ b/src/ipa/raspberrypi/data/meson.build @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: CC0-1.0 + conf_files = files([ 'imx219.json', 'imx477.json', diff --git a/src/ipa/vimc/data/vimc.conf b/src/ipa/vimc/data/vimc.conf index b3cda75801e2..8e73b161abf3 100644 --- a/src/ipa/vimc/data/vimc.conf +++ b/src/ipa/vimc/data/vimc.conf @@ -1 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# # Dummy configuration file for the vimc IPA. diff --git a/src/qcam/assets/feathericons/feathericons.qrc b/src/qcam/assets/feathericons/feathericons.qrc index fc8213928ece..656f2b463511 100644 --- a/src/qcam/assets/feathericons/feathericons.qrc +++ b/src/qcam/assets/feathericons/feathericons.qrc @@ -1,3 +1,4 @@ + ./aperture.svg From patchwork Fri Jun 5 18:38:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3958 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B16A860410 for ; Fri, 5 Jun 2020 20:38:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="DyBpX+WY"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 470852BB for ; Fri, 5 Jun 2020 20:38:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1591382337; bh=+J5RoBh21Z7ksGZqXLxnycMYEdHXiz6QT3cDhQqScto=; h=From:To:Subject:Date:In-Reply-To:References:From; b=DyBpX+WYQrUR/6FRaaAGgZw+5d9JO9BNSOJxqiETq3RJMA1FGAPwbVKaO9rnJxlj6 oul2rHxM9T2FYE0VMyx5ku3AdpIpb2fTAhualnHoPx7/P2Ujh/dHIOLKex9db15xTe 4m5XTzlWfCOmNye6U17UfYh8+TpUFtErL5N0u1DY= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 5 Jun 2020 21:38:32 +0300 Message-Id: <20200605183833.8125-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200605183833.8125-1-laurent.pinchart@ideasonboard.com> References: <20200605183833.8125-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: Use DEP5 to specify license of files that don't support SPDX X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:38:58 -0000 Some files can't use SPDX as they don't support comments. This is the case of the JSON files used by the Raspberry Pi IPA and camera tuning tools, as well as the PGM reference picture in the camera tuning tool. The REUSE specification allows handling this case in two different ways: - Adding a ${file}.license file containing the license specification alongside each file. - Adding a .reuse/dep5 file, in Debian machine-readable copyright format (as specified in https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/). The first option isn't practical, use the latter. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- .reuse/dep5 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .reuse/dep5 diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 000000000000..c05441cfb270 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,10 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libcamera +Upstream-Contact: Laurent Pinchart +Source: https://git.linuxtv.org/libcamera.git/ + +Files: src/ipa/raspberrypi/data/*.json + utils/raspberrypi/ctt/ctt_config_example.json + utils/raspberrypi/ctt/ctt_ref.pgm +Copyright: 2019-2020 Raspberry Pi (Trading) Ltd. +License: BSD-2-Clause From patchwork Fri Jun 5 18:38:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3959 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 05F9B613E5 for ; Fri, 5 Jun 2020 20:38:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="t2D1O/RI"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 92B88501 for ; Fri, 5 Jun 2020 20:38:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1591382337; bh=Jn9SRG6JYerMxGmIYWac8Srn32hlVKXZX+4y7AvBQoc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=t2D1O/RI1ptQcX9izvd5gAVkF9wakBCjfLCfH17vCaKGKasInHMbP+y7wsl/8H5P8 iEUXJM4pTpEJpgpmh/yZRRVNyNAU+SZYWfMPI4AD22DLoUcN3pzUuBQPk0UkswEKhG pxYCibFE/l8HXN7Z6I5skDFpOqHShwpbhGB89AWg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 5 Jun 2020 21:38:33 +0300 Message-Id: <20200605183833.8125-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200605183833.8125-1-laurent.pinchart@ideasonboard.com> References: <20200605183833.8125-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] qcam: Specify Feather icons license in DEP5 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:38:58 -0000 Specify the license of the Feather icons files in the .reuse/dep5 file. Technically speaking the SVG format supports comments, SPDX could thus be used, but that would be impractical both due to the large number of files, and the fact that they would then diverge from the upstream project. We can remove the README.md file, as it now only contains redundant or incorrect information: the license and project URL are contained in the DEP5 file, and the comment related to generation of the GRC file is outdated as the file is now manually edited to only include the icons that we need. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- .reuse/dep5 | 5 +++++ src/qcam/assets/feathericons/README.md | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 src/qcam/assets/feathericons/README.md diff --git a/.reuse/dep5 b/.reuse/dep5 index c05441cfb270..a66f27e7fedd 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -8,3 +8,8 @@ Files: src/ipa/raspberrypi/data/*.json utils/raspberrypi/ctt/ctt_ref.pgm Copyright: 2019-2020 Raspberry Pi (Trading) Ltd. License: BSD-2-Clause + +Files: src/qcam/assets/feathericons/*.svg +Copyright: 2019 Cole Bemis (and other Feather icons contributors) +License: MIT +Comment: https://feathericons.com/ diff --git a/src/qcam/assets/feathericons/README.md b/src/qcam/assets/feathericons/README.md deleted file mode 100644 index ce7664f6bf16..000000000000 --- a/src/qcam/assets/feathericons/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Icons from https://feathericons.com/ -License: MIT - -Generate the QRC file with: - rcc --project