From 21afc62c03d6b7884772dd85c43c779a283293a2 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Wed, 9 Sep 2020 12:25:08 +0530 Subject: [PATCH 1/7] COPYING: Use SPDX tags tinycompress project is licensed under LGPL 2.1 and BSD 3 Clause, so remove the license text and use SPDX tags Signed-off-by: Vinod Koul --- COPYING | 57 ++++----------------------------------------------------- 1 file changed, 4 insertions(+), 53 deletions(-) diff --git a/COPYING b/COPYING index dfc7426..7e5a935 100644 --- a/COPYING +++ b/COPYING @@ -1,54 +1,5 @@ -tinycompress is provided under a dual BSD/LGPLv2.1 license. When using or - redistributing tinycompress, you may do so under either license. +tinycompress is provided under: + SPDX-License-Identifier: LGPL-2.1-only OR BSD-3-Clause -BSD LICENSE - -tinycompress library for compress audio offload in alsa -Copyright (c) 2011-2012, Intel Corporation -All rights reserved. - -Author: Vinod Koul - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. -Neither the name of Intel Corporation nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -LGPL LICENSE - -tinycompress library for compress audio offload in alsa -Copyright (c) 2011-2012, Intel Corporation. - - -This program is free software; you can redistribute it and/or modify it -under the terms and conditions of the GNU Lesser General Public License, -version 2.1, as published by the Free Software Foundation. - -This program is distributed in the hope it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public -License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to -the Free Software Foundation, Inc., -51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. +All contributions to the tinycompress project are subject to this COPYING +file. From 2f3fcafdcad48586c6ac5d6915f8eaed80ac4c3e Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Wed, 9 Sep 2020 12:37:01 +0530 Subject: [PATCH 2/7] src: use SPDX tags in C files Update to use SPDX tags in the C files. Ensure the Copyright and Author information is retained Signed-off-by: Vinod Koul --- src/lib/compress.c | 59 +++--------------------------------------- src/utils/cplay.c | 58 +++-------------------------------------- src/utils/crecord.c | 63 ++++----------------------------------------- 3 files changed, 11 insertions(+), 169 deletions(-) diff --git a/src/lib/compress.c b/src/lib/compress.c index bba4fcf..b26015d 100644 --- a/src/lib/compress.c +++ b/src/lib/compress.c @@ -1,59 +1,6 @@ -/* - * This file is provided under a dual BSD/LGPLv2.1 license. When using or - * redistributing this file, you may do so under either license. - * - * BSD LICENSE - * - * tinycompress library for compress audio offload in alsa - * Copyright (c) 2011-2012, Intel Corporation - * All rights reserved. - * - * Author: Vinod Koul - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - * - * LGPL LICENSE - * - * tinycompress library for compress audio offload in alsa - * Copyright (c) 2011-2012, Intel Corporation. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to - * the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - */ +/* SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) */ +/* Copyright (c) 2011-2012, Intel Corporation */ +/* Author: Vinod Koul */ #include #include diff --git a/src/utils/cplay.c b/src/utils/cplay.c index 3e9fcac..5f073f2 100644 --- a/src/utils/cplay.c +++ b/src/utils/cplay.c @@ -1,58 +1,6 @@ -/* - * This file is provided under a dual BSD/LGPLv2.1 license. When using or - * redistributing this file, you may do so under either license. - * - * BSD LICENSE - * - * tinyplay command line player for compress audio offload in alsa - * Copyright (c) 2011-2012, Intel Corporation - * All rights reserved. - * - * Author: Vinod Koul - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - * - * LGPL LICENSE - * - * tinyplay command line player for compress audio offload in alsa - * Copyright (c) 2011-2012, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to - * the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - */ +/* SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) */ +/* Copyright (c) 2011-2012, Intel Corporation */ +/* Author: Vinod Koul */ #include #include diff --git a/src/utils/crecord.c b/src/utils/crecord.c index 12ad961..a82d494 100644 --- a/src/utils/crecord.c +++ b/src/utils/crecord.c @@ -1,61 +1,8 @@ -/* - * This file is provided under a dual BSD/LGPLv2.1 license. When using or - * redistributing this file, you may do so under either license. - * - * BSD LICENSE - * - * crecord command line recorder for compress audio record in alsa - * Copyright (c) 2011-2012, Intel Corporation - * Copyright (c) 2013-2014, Wolfson Microelectronic Ltd. - * All rights reserved. - * - * Author: Vinod Koul - * Author: Charles Keepax - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - * - * LGPL LICENSE - * - * crecord command line recorder for compress audio record in alsa - * Copyright (c) 2011-2012, Intel Corporation - * Copyright (c) 2013-2014, Wolfson Microelectronic Ltd. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to - * the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - */ +/* SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) */ +/* Copyright (c) 2011-2012, Intel Corporation */ +/* Copyright (c) 2013-2014, Wolfson Microelectronic Ltd. */ +/* Author: Vinod Koul */ +/* Author: Charles Keepax */ #include #include From e8322438a313d8ab4075a0622bbaaa116d6d27c8 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Wed, 9 Sep 2020 12:37:01 +0530 Subject: [PATCH 3/7] include: use SPDX tags in H files Update to use SPDX tags in the H files. Ensure the Copyright and Author information is retained Signed-off-by: Vinod Koul --- include/tinycompress/tinycompress.h | 56 +-------------------------- include/tinycompress/tinymp3.h | 60 ++--------------------------- include/tinycompress/version.h | 56 +-------------------------- 3 files changed, 7 insertions(+), 165 deletions(-) diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h index f0fae30..edabbde 100644 --- a/include/tinycompress/tinycompress.h +++ b/include/tinycompress/tinycompress.h @@ -1,57 +1,5 @@ -/* - * This file is provided under a dual BSD/LGPLv2.1 license. When using or - * redistributing this file, you may do so under either license. - * - * BSD LICENSE - * - * Copyright (c) 2011-2012, Intel Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - * - * LGPL LICENSE - * - * tinycompress library for compress audio offload in alsa - * Copyright (c) 2011-2012, Intel Corporation. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to - * the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - */ - +/* SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) */ +/* Copyright (c) 2011-2012, Intel Corporation */ #ifndef __TINYCOMPRESS_H #define __TINYCOMPRESS_H diff --git a/include/tinycompress/tinymp3.h b/include/tinycompress/tinymp3.h index b0d429d..5c3031c 100644 --- a/include/tinycompress/tinymp3.h +++ b/include/tinycompress/tinymp3.h @@ -1,60 +1,6 @@ -/* - * This file is provided under a dual BSD/LGPLv2.1 license. When using or - * redistributing this file, you may do so under either license. - * - * BSD LICENSE - * - * mp3 header and prasing - * Copyright (c) 2011-2012, Intel Corporation - * All rights reserved. - * - * Author: Vinod Koul - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - * - * LGPL LICENSE - * - * mp3 header and parsing - * Copyright (c) 2011-2012, Intel Corporation. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to - * the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - */ - +/* SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) */ +/* Copyright (c) 2011-2012, Intel Corporation */ +/* Author: Vinod Koul */ #ifndef __TINYMP3_H #define __TINYMP3_H diff --git a/include/tinycompress/version.h b/include/tinycompress/version.h index 82a3e6c..cdff894 100644 --- a/include/tinycompress/version.h +++ b/include/tinycompress/version.h @@ -1,57 +1,5 @@ -/* - * This file is provided under a dual BSD/LGPLv2.1 license. When using or - * redistributing this file, you may do so under either license. - * - * BSD LICENSE - * - * Copyright (c) 2011-2012, Intel Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - * - * LGPL LICENSE - * - * tinycompress library for compress audio offload in alsa - * Copyright (c) 2011-2012, Intel Corporation. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to - * the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - */ - +/* SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) */ +/* Copyright (c) 2011-2012, Intel Corporation */ #ifndef __VERSION_H #define __VERSION_H From 4a0a95ee9fd23f95af735d6994f38ff5ebe935f8 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Wed, 9 Sep 2020 12:37:01 +0530 Subject: [PATCH 4/7] tinycompress: use SPDX tags in build files The Makefile.am and Android.mk files do not contains any license information, add the SPDX tags in the files Signed-off-by: Vinod Koul --- Android.mk | 2 ++ include/Makefile.am | 2 ++ src/Makefile.am | 2 ++ src/lib/Makefile.am | 2 ++ src/utils/Makefile.am | 2 ++ 5 files changed, 10 insertions(+) diff --git a/Android.mk b/Android.mk index d201cfa..03edf82 100644 --- a/Android.mk +++ b/Android.mk @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) diff --git a/include/Makefile.am b/include/Makefile.am index 2a89e11..3743737 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) + nobase_include_HEADERS = tinycompress/tinycompress.h noinst_HEADERS = sound/compress_offload.h \ diff --git a/src/Makefile.am b/src/Makefile.am index 4a8c867..27e2c22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) + SUBDIRS = lib utils if BUILD_FCPLAY SUBDIRS += utils-lgpl diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 4baeab5..636f8db 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) + tinycompressdir = $(libdir) tinycompress_LTLIBRARIES = libtinycompress.la diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 1b996d4..5a0a6c3 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) + bin_PROGRAMS = cplay crecord cplay_SOURCES = cplay.c From b4a5d80dc31ba9a0a79ad0db60ae1903cc804529 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Wed, 9 Sep 2020 12:37:01 +0530 Subject: [PATCH 5/7] utils-lgpl: Add COPYING file Since utils-lgpl in only licensed as LGPL-2.1, add the COPYING file mentioning this explicitly Signed-off-by: Vinod Koul --- src/utils-lgpl/COPYING | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/utils-lgpl/COPYING diff --git a/src/utils-lgpl/COPYING b/src/utils-lgpl/COPYING new file mode 100644 index 0000000..3d6ca33 --- /dev/null +++ b/src/utils-lgpl/COPYING @@ -0,0 +1,6 @@ +tinycompress util-lgpl folder is provided under: + SPDX-License-Identifier: LGPL-2.1-only + +All contributions to this section of the tinycompress project are subject to +this COPYING file. + From 0250d25686cc7c014ee87f81b44551fbb879c04f Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Wed, 9 Sep 2020 12:48:40 +0530 Subject: [PATCH 6/7] fcplay: update SDPX tag style Use the /* ... */ style to add SDPX tags. Signed-off-by: Vinod Koul --- src/utils-lgpl/fcplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils-lgpl/fcplay.c b/src/utils-lgpl/fcplay.c index 83d48a0..485a365 100644 --- a/src/utils-lgpl/fcplay.c +++ b/src/utils-lgpl/fcplay.c @@ -1,7 +1,7 @@ -//SPDX-License-Identifier: LGPL-2.1-only +/* SPDX-License-Identifier: LGPL-2.1-only */ -//Copyright (c) 2011-2012, Intel Corporation -//Copyright (c) 2018-2019, Linaro Ltd +/* Copyright (c) 2011-2012, Intel Corporation */ +/* Copyright (c) 2018-2019, Linaro Ltd */ #include #include From 3b6fdbfe9c4eb9f72891e6d79d3a4927b5e819b4 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Wed, 9 Sep 2020 12:37:01 +0530 Subject: [PATCH 7/7] utils-lgpl: use SPDX tags in build files The Makefile.am file do not contains any license information, add the SPDX tags in the files Signed-off-by: Vinod Koul --- src/utils-lgpl/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/utils-lgpl/Makefile.am b/src/utils-lgpl/Makefile.am index c78d708..5aeb740 100644 --- a/src/utils-lgpl/Makefile.am +++ b/src/utils-lgpl/Makefile.am @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-only + bin_PROGRAMS = fcplay fcplay_SOURCES = fcplay.c