Commit: fe55789b6f5921b80242e51f79397d17ee2f3470 Author: Campbell Barton Date: Fri Feb 11 14:57:02 2022 +1100 Branches: master https://developer.blender.org/rBfe55789b6f5921b80242e51f79397d17ee2f3470
File headers: manually convert files to use SPDX headers Also add BSD-2-Clause to SPDX license list. =================================================================== M doc/license/SPDX-license-identifiers.txt M intern/audaspace/intern/AUD_PyInit.cpp M intern/audaspace/intern/AUD_PyInit.h M intern/audaspace/intern/AUD_Set.cpp M intern/audaspace/intern/AUD_Set.h M intern/eigen/intern/linear_solver.cc M intern/eigen/intern/linear_solver.h M intern/ffmpeg/ffmpeg_compat.h M intern/ffmpeg/tests/ffmpeg_codecs.cc M intern/guardedalloc/intern/mallocn_inline.h M intern/opencolorio/ocio_impl_glsl.cc M intern/sky/include/sky_model.h M source/blender/blenlib/intern/fnmatch.c M source/blender/blenlib/intern/noise.cc M source/blender/draw/intern/smaa_textures.c M source/blender/draw/intern/smaa_textures.h =================================================================== diff --git a/doc/license/SPDX-license-identifiers.txt b/doc/license/SPDX-license-identifiers.txt index 1e25d002fce..6c68c0c276a 100644 --- a/doc/license/SPDX-license-identifiers.txt +++ b/doc/license/SPDX-license-identifiers.txt @@ -1,6 +1,7 @@ Corresponding SPDX license identifiers in the source code: Apache-2.0 Apache-2-license.txt https://spdx.org/licenses/Apache-2.0.html +BSD-2-Clause https://spdx.org/licenses/BSD-2-Clause.html BSD-3-Clause BSD-3-Clause-license.txt https://spdx.org/licenses/BSD-3-Clause.html GPL-2.0-or-later GPL-license.txt https://spdx.org/licenses/GPL-2.0-or-later.html MIT https://spdx.org/licenses/MIT.html diff --git a/intern/audaspace/intern/AUD_PyInit.cpp b/intern/audaspace/intern/AUD_PyInit.cpp index 47dc4d51c87..eb63183a9ab 100644 --- a/intern/audaspace/intern/AUD_PyInit.cpp +++ b/intern/audaspace/intern/AUD_PyInit.cpp @@ -1,22 +1,5 @@ -/* - * Copyright 2009-2011 Jörg Hermann Müller - * - * This file is part of AudaSpace. - * - * Audaspace is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * AudaSpace is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Audaspace; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2009-2011 Jörg Hermann Müller. */ /** \file * \ingroup audaspaceintern diff --git a/intern/audaspace/intern/AUD_PyInit.h b/intern/audaspace/intern/AUD_PyInit.h index e572ea1a27a..184dc2ee7a4 100644 --- a/intern/audaspace/intern/AUD_PyInit.h +++ b/intern/audaspace/intern/AUD_PyInit.h @@ -1,22 +1,5 @@ -/* - * Copyright 2009-2011 Jörg Hermann Müller - * - * This file is part of AudaSpace. - * - * Audaspace is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * AudaSpace is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Audaspace; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2009-2011 Jörg Hermann Müller. */ /** \file * \ingroup audaspaceintern diff --git a/intern/audaspace/intern/AUD_Set.cpp b/intern/audaspace/intern/AUD_Set.cpp index 2ab576cbd07..ec479299dcb 100644 --- a/intern/audaspace/intern/AUD_Set.cpp +++ b/intern/audaspace/intern/AUD_Set.cpp @@ -1,22 +1,5 @@ -/* - * Copyright 2009-2011 Jörg Hermann Müller - * - * This file is part of AudaSpace. - * - * Audaspace is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * AudaSpace is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Audaspace; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2009-2011 Jörg Hermann Müller. */ /** \file * \ingroup audaspaceintern diff --git a/intern/audaspace/intern/AUD_Set.h b/intern/audaspace/intern/AUD_Set.h index c2c7b7f40ce..c60577eced1 100644 --- a/intern/audaspace/intern/AUD_Set.h +++ b/intern/audaspace/intern/AUD_Set.h @@ -1,22 +1,5 @@ -/* - * Copyright 2009-2011 Jörg Hermann Müller - * - * This file is part of AudaSpace. - * - * Audaspace is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * AudaSpace is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Audaspace; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2009-2011 Jörg Hermann Müller. */ /** \file * \ingroup audaspace diff --git a/intern/eigen/intern/linear_solver.cc b/intern/eigen/intern/linear_solver.cc index 4edc3426dca..24c70788ffd 100644 --- a/intern/eigen/intern/linear_solver.cc +++ b/intern/eigen/intern/linear_solver.cc @@ -1,29 +1,10 @@ -/* - * Sparse linear solver. - * Copyright (C) 2004 Bruno Levy - * Copyright (C) 2005-2015 Blender Foundation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2004 Bruno Levy. + * 2005-2015 Blender Foundation. */ /** \file * \ingroup intern_eigen + * Sparse linear solver. */ #include "linear_solver.h" diff --git a/intern/eigen/intern/linear_solver.h b/intern/eigen/intern/linear_solver.h index 6b9f815ca88..abe1ac9eac6 100644 --- a/intern/eigen/intern/linear_solver.h +++ b/intern/eigen/intern/linear_solver.h @@ -1,29 +1,10 @@ -/* - * Sparse linear solver. - * Copyright (C) 2004 Bruno Levy - * Copyright (C) 2005-2015 Blender Foundation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2004 Bruno Levy. + * 2005-2015 Blender Foundation. */ /** \file * \ingroup intern_eigen + * Sparse linear solver. */ #pragma once diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 17e2a7dc05b..f311e04d8e0 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -1,20 +1,13 @@ -/* - * compatibility macros to make every ffmpeg installation appear +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2011 Peter Schlaile. */ + +/** \file + * \ingroup ffmpeg + * + * Compatibility macros to make every FFMPEG installation appear * like the most current installation (wrapping some functionality sometimes) - * it also includes all ffmpeg header files at once, no need to do it + * it also includes all FFMPEG header files at once, no need to do it * separately. - * - * Copyright (c) 2011 Peter Schlaile - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #ifndef __FFMPEG_COMPAT_H__ diff --git a/intern/ffmpeg/tests/ffmpeg_codecs.cc b/intern/ffmpeg/tests/ffmpeg_codecs.cc index 9538bac84d2..bb6e13579e5 100644 --- a/intern/ffmpeg/tests/ffmpeg_codecs.cc +++ b/intern/ffmpeg/tests/ffmpeg_codecs.cc @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + #include "testing/testing.h" extern "C" { diff --git a/intern/guardedalloc/intern/mallocn_inline.h b/intern/guardedalloc/intern/mallocn_inline.h index 65bd40de492 @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
