Skip to content

Commit

Permalink
Relicense the project under the 2-clause BSD license
Browse files Browse the repository at this point in the history
As the original and sole author of this project I hereby relicense this
project under the 2-clause BSD license (see the COPYING file).

This relicensng was made possible by a generous offer from Epic Games
International.
  • Loading branch information
erikd committed Sep 13, 2016
1 parent a12aad2 commit 819c6a8
Show file tree
Hide file tree
Showing 40 changed files with 171 additions and 1,197 deletions.
365 changes: 25 additions & 340 deletions COPYING

Large diffs are not rendered by default.

18 changes: 4 additions & 14 deletions Win32/config.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
/*
** Copyright (C) 2002-2011 Erik de Castro Lopo <[email protected]>
** Copyright (c) 2002-2016, Erik de Castro Lopo <[email protected]>
** All rights reserved.
**
** 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
** This code is released under 2-clause BSD license. Please see the
** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
*/

/*
Expand Down
18 changes: 4 additions & 14 deletions Win32/unistd.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
/*
** Copyright (C) 2002-2011 Erik de Castro Lopo <[email protected]>
** Copyright (c) 2002-2016, Erik de Castro Lopo <[email protected]>
** All rights reserved.
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU Lesser General Public License as published by
** the Free Software Foundation; either version 2.1 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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
** This code is released under 2-clause BSD license. Please see the
** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
*/

/*
Expand Down
136 changes: 0 additions & 136 deletions doc/fb2k.html

This file was deleted.

1 change: 0 additions & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<A HREF="faq.html">FAQ</A><BR>
<A HREF="lists.html">Mailing Lists</A><BR>
<A HREF="ChangeLog">ChangeLog</A><BR>
<A HREF="fb2k.html">Foobar 2k</A><BR>
<BR>
<DIV CLASS="block">
Author :<BR>Erik de Castro Lopo
Expand Down
56 changes: 6 additions & 50 deletions doc/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,61 +60,17 @@
<H1><B>License</B></H1>
<!-- pepper -->
<P>
Secret Rabbit Code is released under a dual licensing scheme.
Users can choose which of these two licenses they wish to operate
under :
</P>
<!-- pepper -->
<UL>
<LI> The standard
<A HREF="http://www.gnu.org/copyleft/gpl.html">
GNU General Public License (version 2 or version 3)
</A>
(GPL) as written and published by the Free Software Foundation.
<LI> The very generous
<A HREF="http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf">
libsamplerate Commercial Use License
</A>
that can be purchased for a one off payment of $1000 (one
thousand) Australian dollars.
</UL>
<!-- pepper -->
<P>
Any person or organisation wishing to distribute (either privately or
publicly) software which uses Secret Rabbit Code must either abide by
the GPL or purchase a commercial use license.
</P>
<!-- pepper -->
<P>
The commercial use license allows licensees to use libsamplerate as a
statically linked library in proprietary, shareware or other closed
source applications.
The licensee may use libsamplerate in as many separate products as
they choose and sell as many copies of each as they can without paying
any further licensing fees for libsamplerate.
From its first release in 2002, Secret Rabbit Code was under a dual
licensing scheme where people could chose to use it under the terms
of the GNU General Public License or pay for a commercial use
license.
</P>
<!-- pepper -->
<P>
2005-08-09 : There is a certain amount of
<A HREF="http://www.wordiq.com/definition/GNU_General_Public_License#GPL-related_disputes">
debate</A>
about whether non-GPL software can dynamically link to GPL libraries.
I side with the FSF and assert that an executable dynamically linked
to libsamplerate is a derivative work of libsamplerate and is
therefore subject to the GNU GPL.
In 2016, thanks to a generous offer from Epic Games International,
Secret Rabbit Code was relicensed under the 2-clause BSD license.
</P>
<!-- pepper -->
<P>
For more information, please see the
<A HREF="http://www.mega-nerd.com/SRC/procedure.html">
commercial use licensing procedure
</A>.
</P>

<!-- pepper -->
<!-- <A HREF="mailto:[email protected]">For the spam bots</A> -->
<!-- pepper -->

</DIV>
</TD></TR>
</TABLE>
Expand Down
126 changes: 0 additions & 126 deletions doc/procedure.html

This file was deleted.

Loading

0 comments on commit 819c6a8

Please sign in to comment.