Skip to content

Commit

Permalink
change licencing to LGPL-2.1-or-later
Browse files Browse the repository at this point in the history
It appears that it is not permitted to put GPL-2.0-only code into
LGPL-3.0-or-later code.

https://www.gnu.org/licenses/gpl-faq.en.html#AllCompatibility

Unfortunately, one of UAPI headers of Linux kernel
(include/sound/firewire.h) is included in libhitaki for backporting,
and it is licensed under GPL-2.0-only. The last change of the header is
for v6.3 kernel, therefore it seems to be preferable to keep it for a
while.

It is granted to put GPL-2.0-only code into LGPL-2.1-or-later code. This
commit relicenses libhitaki itself under LGPL-2.1-or-later.

Signed-off-by: Takashi Sakamoto <[email protected]>
  • Loading branch information
takaswie committed Feb 16, 2024
1 parent 1fefff1 commit ecd1e0f
Show file tree
Hide file tree
Showing 39 changed files with 536 additions and 199 deletions.
657 changes: 497 additions & 160 deletions COPYING.LESSER

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
The libhitaki project
=====================

2023/03/14
2024/02/16
Takashi Sakamoto

Introduction
Expand All @@ -23,7 +23,7 @@ The latest release is `0.2.0 <https://github.com/alsa-project/libhitaki/tags/v0.
License
=======

Released under GNU Lesser General Public License version 3 or later, including UAPI header of ALSA
Released under GNU Lesser General Public License version 2.1 or later, including UAPI header of ALSA
firewire stack released under GNU General Public License version 2.0.

Repository
Expand Down
2 changes: 1 addition & 1 deletion doc/hitaki.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version = "@VERSION@"
description = "The library to operate ALSA HwDep character device for Audio and Music unit in IEEE 1394 bus"
authors = "Takashi Sakamoto"
license = "LGPL-3.0-or-later"
license = "LGPL-2.1-or-later"
website_url = "https://alsa-project.github.io/gobject-introspection-docs/hitaki/"
docs_url = "https://alsa-project.github.io/gobject-introspection-docs/hitaki/"
browse_url = "https://github.com/alsa-project/libhitaki/"
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project('hitaki', 'c',
version: '0.2.0',
license: 'LGPL-3.0-or-later',
license: 'LGPL-2.1-or-later',
meson_version: '>= 0.46.0',
)

Expand Down
2 changes: 1 addition & 1 deletion src/alsa_firewire.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/alsa_firewire.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_ALSA_FIREWIRE_H__
#define __HITAKI_ALSA_FIREWIRE_H__

Expand Down
2 changes: 1 addition & 1 deletion src/alsa_firewire_private.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion src/alsa_firewire_private.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_ALSA_FIREWIRE_PRIVATE_H__
#define __HITAKI_ALSA_FIREWIRE_PRIVATE_H__

Expand Down
2 changes: 1 addition & 1 deletion src/efw_protocol.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "efw_protocol_private.h"

#include <sound/firewire.h>
Expand Down
2 changes: 1 addition & 1 deletion src/efw_protocol.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_EFW_PROTOCOL_H__
#define __HITAKI_EFW_PROTOCOL_H__

Expand Down
2 changes: 1 addition & 1 deletion src/efw_protocol_private.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_EFW_PROTOCOL_PRIVATE_H__
#define __HITAKI_EFW_PROTOCOL_PRIVATE_H__

Expand Down
2 changes: 1 addition & 1 deletion src/hitaki.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_H__
#define __HITAKI_H__

Expand Down
2 changes: 1 addition & 1 deletion src/hitaki_enum_types.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_ENUM_TYPES_H__
#define __HITAKI_ENUM_TYPES_H__

Expand Down
2 changes: 1 addition & 1 deletion src/motu_command_dsp.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "motu_command_dsp.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/motu_command_dsp.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_MOTU_COMMAND_DSP_H__
#define __HITAKI_MOTU_COMMAND_DSP_H__

Expand Down
2 changes: 1 addition & 1 deletion src/motu_register_dsp.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "motu_register_dsp.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/motu_register_dsp.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_MOTU_REGISTER_DSP_H__
#define __HITAKI_MOTU_REGISTER_DSP_H__

Expand Down
2 changes: 1 addition & 1 deletion src/quadlet_notification.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "quadlet_notification.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/quadlet_notification.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_QUADLET_NOTIFICATION_H__
#define __HITAKI_QUADLET_NOTIFICATION_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_dice.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/snd_dice.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_DICE_H__
#define __HITAKI_SND_DICE_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_digi00x.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/snd_digi00x.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_DIGI00X_H__
#define __HITAKI_SND_DIGI00X_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_efw.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"
#include "efw_protocol_private.h"

Expand Down
2 changes: 1 addition & 1 deletion src/snd_efw.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_EFW_H__
#define __HITAKI_SND_EFW_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_fireface.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/snd_fireface.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_FIREFACE_H__
#define __HITAKI_SND_FIREFACE_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_motu.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/snd_motu.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_MOTU_H__
#define __HITAKI_SND_MOTU_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_motu_register_dsp_parameter.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/snd_motu_register_dsp_parameter.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_MOTU_REGISTER_DSP_PARAMETER_H__
#define __HITAKI_SND_MOTU_REGISTER_DSP_PARAMETER_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_tascam.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"
#include "tascam_protocol.h"

Expand Down
2 changes: 1 addition & 1 deletion src/snd_tascam.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_TASCAM_H__
#define __HITAKI_SND_TASCAM_H__

Expand Down
2 changes: 1 addition & 1 deletion src/snd_unit.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "alsa_firewire_private.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/snd_unit.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_SND_UNIT_H__
#define __HITAKI_SND_UNIT_H__

Expand Down
2 changes: 1 addition & 1 deletion src/tascam_protocol.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "tascam_protocol.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/tascam_protocol.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_TASCAM_PROTOCOL_H__
#define __HITAKI_TASCAM_PROTOCOL_H__

Expand Down
2 changes: 1 addition & 1 deletion src/timestamped_quadlet_notification.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "timestamped_quadlet_notification.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/timestamped_quadlet_notification.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifndef __HITAKI_TIMESTAMPED_QUADLET_NOTIFICATION_H__
#define __HITAKI_TIMESTAMPED_QUADLET_NOTIFICATION_H__

Expand Down

0 comments on commit ecd1e0f

Please sign in to comment.