Re: [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package

From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
Cc: Zoltan Gyarmati <zgyarmati@zgyarmati.de>,
	Jesse Van Gavere <jesseevg@gmail.com>,
	Samuel Martin <s.martin49@gmail.com>,
	buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package
Date: Fri, 12 Jul 2024 10:51:38 +0200	[thread overview]
Message-ID: <20240712105138.4e28f65d@windsurf> (raw)
In-Reply-To: <20240625211847.1419944-6-roykollensvendsen@gmail.com>

Hello Roy,

On Tue, 25 Jun 2024 23:18:30 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:

> diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
> new file mode 100644
> index 0000000000..1b47dc6132
> --- /dev/null
> +++ b/package/qt6/qt6shadertools/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_QT6SHADERTOOLS
> +	bool "qt6shadertools"
> +	select BR2_PACKAGE_HOST_QT6BASE_GUI

I've added a comment above this line (taken from your commit log) to
explain why we are selecting this, as it's not obvious.

> +QT6SHADERTOOLS_LICENSE = \
> +	GPL-2.0+ or LGPL-3.0, \
> +	GPL-3.0, GFDL-1.3 no invariants (docs)

This licensing information looked not correct, and actually the
licensing info was also not correct for qt6languageserver, it seems to
just be copy/pasted. So I'm wondering if the licensing information for
qt6 packages we already have in the tree is correct. Could you do a
review?

To do this review, just do:

grep -r SPDX *

in the source tree.

For shadertools, this gives us:

buildroot-build/include/QtShaderTools/qtshadertoolsexports.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
buildroot-build/include/QtShaderTools/6.7.2/QtShaderTools/private/qtshadertoolsexports_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
buildroot-build/lib/cmake/Qt6BuildInternals/StandaloneTests/QtShaderToolsTestsConfig.cmake:# SPDX-License-Identifier: BSD-3-Clause
buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfig.cmake:# SPDX-License-Identifier: BSD-3-Clause
buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsDependencies.cmake:# SPDX-License-Identifier: BSD-3-Clause
buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfigVersion.cmake:# SPDX-License-Identifier: BSD-3-Clause
CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
licenseRule.json:                     "spdx: list of SPDX-License-Expression's allowed in the matching files.",
src/SPIRV-Cross/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
src/3rdparty/SPIRV-Cross/spirv_hlsl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_hlsl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/GLSL.std.450.h: * SPDX-License-Identifier: MIT
src/3rdparty/SPIRV-Cross/spirv_glsl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cpp.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_c.h: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cfg.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_util.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_msl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_parser.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_util.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cfg.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_c.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_error_handling.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_parser.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_reflect.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cpp.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_common.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_glsl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_reflect.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_msl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
src/shadertools/qshaderrewriter_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvshader_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvcompiler.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
src/shadertools/qspirvcompiler_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvshaderremap.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qtshadertoolsglobal.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qshaderrewriter.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qshaderbaker.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/doc/src/qtshadertools-index.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/doc/src/qtshadertools-qsb.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/doc/src/qtshadertools-overview.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/doc/src/qtshadertools-build.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/qspirvshaderremap_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvshader.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qshaderbaker.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qtshadertoolsglobal_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/glslang/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/cmake/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/qshaderbaker/tst_qshaderbaker.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/auto/qshaderbaker/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/buildtimeqsb/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/buildtimeqsb/tst_buildtimeqsb.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/manual/qmlappshadermacro/main.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/manual/qmlappshadermacro/main.qml:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/manual/qmlappshadermacro/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tools/qsb/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tools/qsb/qsb.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
tools/qsb/Qt6ShaderToolsMacros.cmake:# SPDX-License-Identifier: BSD-3-Clause

So, I've summarized that as:

+QT6SHADERTOOLS_LICENSE = \
+       Apache-2.0 or MIT (SPIRV-Cross), \
+       GPL-2.0 or LGPL-3.0 or GPL-3.0, \
+       GPL-3.0 (tests), GFDL-1.3 no invariants (docs), \
+       GPL-3.0 WITH Qt-GPL-exception-1.0 (tools)

> +QT6SHADERTOOLS_LICENSE_FILES = \
> +	LICENSES/GPL-2.0-only.txt \
> +	LICENSES/GPL-3.0-only.txt \
> +	LICENSES/LGPL-3.0-only.txt \
> +	LICENSES/GFDL-1.3-no-invariants-only.txt

I've added:

LICENSES/Qt-GPL-exception-1.0.txt

Could you do a similar review on *existing* qt6 packages? I'll do the
review for the next qt6 packages in your series, while applying them.

I've applied your patch with those changes.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot