From bf1b4a5c59b8c4c8baa0bab40d10d86a6d4b358c Mon Sep 17 00:00:00 2001 From: Philipp Wallisch Date: Fri, 27 Sep 2024 12:00:19 +0200 Subject: [PATCH] Clarify licensing in headers, LICENSE and README.md --- LICENSE | 8 +++----- README.md | 6 ++++++ Sources/ChromaSwift/AcoustID.swift | 4 ++-- Sources/ChromaSwift/AudioDecoder.swift | 6 +++--- Sources/ChromaSwift/AudioFingerprint.swift | 4 ++-- Sources/ChromaSwift/URLSessionProtocol.swift | 4 ++-- Tests/CChromaprintTests/CChromaprintTests.swift | 4 ++-- Tests/ChromaSwiftTests/ChromaSwiftTests.swift | 4 ++-- Tests/ChromaSwiftTests/URLSessionMock.swift | 4 ++-- 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/LICENSE b/LICENSE index 5256c74..4125c21 100644 --- a/LICENSE +++ b/LICENSE @@ -1,10 +1,8 @@ MIT License -Copyright (c) 2010-2016 Lukas Lalinsky on chromaprint -https://github.com/acoustid/chromaprint -Copyright (c) 2016 David Dias on substantial parts of AudioDecoder.swift -https://github.com/NeoTeo/fingerprinter-chromaprint -Copyright (c) 2021 Philipp Wallisch on any other code +Copyright 2010-2016 Lukas Lalinsky on chromaprint +Copyright 2016 David Dias on substantial parts of AudioDecoder.swift +Copyright 2021, 2024 Philipp Wallisch on any other code Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 5b4f1d0..852a7de 100644 --- a/README.md +++ b/README.md @@ -153,3 +153,9 @@ The `AudioFingerprint` class throws either `AudioDecoder.Error` or `AudioFingerp You can also `import CChromaprint` to directly interact with Chromaprints C interface. Please refer to the official documentation for further information. *Note: To avoid licensing issues, CChromaprint has internal input resampling disabled and thus requires that input audio for the fingerprinter is already at the configured fingerprint sample rate.* + +### Licensing + +This package is distributed under the MIT license, see the LICENSE file for details. + +The chromaprint project by default includes resampling code from the ffmpeg library, which is licensed under LGPL 2.1. ChromaSwift however uses Apples AVFoundation for resampling and removes all ffmpeg code from the build, making the package fully MIT compliant. diff --git a/Sources/ChromaSwift/AcoustID.swift b/Sources/ChromaSwift/AcoustID.swift index 96bc2b6..3f43b12 100644 --- a/Sources/ChromaSwift/AcoustID.swift +++ b/Sources/ChromaSwift/AcoustID.swift @@ -1,5 +1,5 @@ -// Copyright (c) 2021 Philipp Wallisch -// Distributed under the MIT license, see the LICENSE file for details. +// Copyright 2021, 2024 Philipp Wallisch +// SPDX-License-Identifier: MIT import Foundation diff --git a/Sources/ChromaSwift/AudioDecoder.swift b/Sources/ChromaSwift/AudioDecoder.swift index cec0f47..e65fd53 100644 --- a/Sources/ChromaSwift/AudioDecoder.swift +++ b/Sources/ChromaSwift/AudioDecoder.swift @@ -1,6 +1,6 @@ -// Copyright (c) 2021 Philipp Wallisch -// Copyright (c) 2016 David Dias -// Distributed under the MIT license, see the LICENSE file for details. +// Copyright 2016 David Dias +// Copyright 2021 Philipp Wallisch +// SPDX-License-Identifier: MIT import AVFoundation import CChromaprint diff --git a/Sources/ChromaSwift/AudioFingerprint.swift b/Sources/ChromaSwift/AudioFingerprint.swift index ad5d1ea..bfa2d28 100644 --- a/Sources/ChromaSwift/AudioFingerprint.swift +++ b/Sources/ChromaSwift/AudioFingerprint.swift @@ -1,5 +1,5 @@ -// Copyright (c) 2021 Philipp Wallisch -// Distributed under the MIT license, see the LICENSE file for details. +// Copyright 2021, 2024 Philipp Wallisch +// SPDX-License-Identifier: MIT import Foundation import CChromaprint diff --git a/Sources/ChromaSwift/URLSessionProtocol.swift b/Sources/ChromaSwift/URLSessionProtocol.swift index b268b91..a6291ed 100644 --- a/Sources/ChromaSwift/URLSessionProtocol.swift +++ b/Sources/ChromaSwift/URLSessionProtocol.swift @@ -1,5 +1,5 @@ -// Copyright (c) 2024 Philipp Wallisch -// Distributed under the MIT license, see the LICENSE file for details. +// Copyright 2024 Philipp Wallisch +// SPDX-License-Identifier: MIT import Foundation diff --git a/Tests/CChromaprintTests/CChromaprintTests.swift b/Tests/CChromaprintTests/CChromaprintTests.swift index 77bd52f..939d095 100644 --- a/Tests/CChromaprintTests/CChromaprintTests.swift +++ b/Tests/CChromaprintTests/CChromaprintTests.swift @@ -1,5 +1,5 @@ -// Copyright (c) 2021 Philipp Wallisch -// Distributed under the MIT license, see the LICENSE file for details. +// Copyright 2021 Philipp Wallisch +// SPDX-License-Identifier: MIT import XCTest import CChromaprint diff --git a/Tests/ChromaSwiftTests/ChromaSwiftTests.swift b/Tests/ChromaSwiftTests/ChromaSwiftTests.swift index e8f9dbf..bbc9147 100644 --- a/Tests/ChromaSwiftTests/ChromaSwiftTests.swift +++ b/Tests/ChromaSwiftTests/ChromaSwiftTests.swift @@ -1,5 +1,5 @@ -// Copyright (c) 2021 Philipp Wallisch -// Distributed under the MIT license, see the LICENSE file for details. +// Copyright 2021, 2024 Philipp Wallisch +// SPDX-License-Identifier: MIT import XCTest @testable import ChromaSwift diff --git a/Tests/ChromaSwiftTests/URLSessionMock.swift b/Tests/ChromaSwiftTests/URLSessionMock.swift index e5cb171..fea9a0e 100644 --- a/Tests/ChromaSwiftTests/URLSessionMock.swift +++ b/Tests/ChromaSwiftTests/URLSessionMock.swift @@ -1,5 +1,5 @@ -// Copyright (c) 2024 Philipp Wallisch -// Distributed under the MIT license, see the LICENSE file for details. +// Copyright 2024 Philipp Wallisch +// SPDX-License-Identifier: MIT import Foundation @testable import ChromaSwift