Re: [PULL 20/24] audio: Add sndio backend

[Alexandre Ratchov <alex@caoua.org>]

On Fri, Sep 13, 2024 at 10:04:29AM +0200, Markus Armbruster wrote:
> Alexandre Ratchov <alex@caoua.org> writes:
> 
> > On Tue, Sep 10, 2024 at 03:28:57PM +0100, Daniel P. Berrangé wrote:
> >> > 
> >> > This is the single use of the ISC license in the more than 10k
> >> > files in the repository. Just checking IIUC this document:
> >> > https://www.gnu.org/licenses/quick-guide-gplv3.en.html
> >> > 
> >> > ISC -> LGPLv2.1 -> GPLv2 -> GPLv3
> >> > 
> >> > So ISC is compatible with GPLv2-or-later. Is that correct?
> >> 
> >> ISC is a permissive license that's semantically pretty much equivalent
> >> to either MIT or BSD 2 clause licenses and thus is broadly compatible
> >> with most other licenses, including the various GPL variants/versions.
> >> 
> >> None the less, since sndioaudio.c was a new file, it should have been
> >> submitted using the GPLv2+, unless there was a reason it needed to
> >> diverge and use ISC.
> >> 
> >> An example justification for divering is if the new code is derived
> >> from some non-QEMU source that was already ISC.
> >> 
> >
> > The ISC license is more permissive than GPLv2+ and compatible with it.
> > The file uses this license for history reasons: initial versions of it
> > used to be part of the OpenBSD ports repository, which uses ISC.
> >
> > If ISC is not appropriate for qemu, I agree to use GPLv2+ instead (I'm
> > the author this file).
> 
> Let's adjust the license then.  Alexandre, care to post the patch?
> 

Almost all audio backends (in the audio/ directory) have the same
header with a copy of the MIT license. So here's a patch to make
audiosndio.c also use this header. The "QEMU <insert_api_here> audio
driver" comment was also missing, so I've added it as well.

OK? better suggestions?

diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c
index 8eb35e1e53..3922b73045 100644
--- a/audio/sndioaudio.c
+++ b/audio/sndioaudio.c
@@ -1,7 +1,25 @@
 /*
- * SPDX-License-Identifier: ISC
+ * QEMU sndio audio driver
  *
  * Copyright (c) 2019 Alexandre Ratchov <alex@caoua.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 /*