Skip to content

Commit

Permalink
Relicense as MIT/X11
Browse files Browse the repository at this point in the history
Remove some obsolete files
  • Loading branch information
wtay committed Nov 5, 2018
1 parent e107d75 commit 85f2e93
Show file tree
Hide file tree
Showing 257 changed files with 4,364 additions and 5,089 deletions.
26 changes: 26 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright © 2018 Wim Taymans

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 (including the next
paragraph) 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.

---

The above is the version of the MIT "Expat" License used by X.org:

http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
340 changes: 0 additions & 340 deletions GPL

This file was deleted.

510 changes: 0 additions & 510 deletions LGPL

This file was deleted.

4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
All PipeWire source files are licensed under the GNU Lesser General Public
License. (see file LGPL for details)
All PipeWire source files are licensed under the MIT License.
(see file COPYING for details)

6 changes: 1 addition & 5 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,4 @@ $ meson build
$ cd build
$ ninja

You can see the available meson options in meson_options.txt file. All plugins are
disabled by default. To enable a spa plugin you need to enable spa-plugins and the
plugin name meson option.

$ meson build -Dspa-plugins=true -D<plugin-name>=true
You can see the available meson options in meson_options.txt file.
15 changes: 0 additions & 15 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
#!/bin/sh

# This file is part of PipeWire
#
# PipeWire 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 of the License, or
# (at your option) any later version.
#
# PipeWire 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 Lesser General Public License
# along with PipeWire; if not, see <http://www.gnu.org/licenses/>.

# Only there to make jhbuild happy

git submodule init
Expand Down
170 changes: 0 additions & 170 deletions git-version-gen

This file was deleted.

13 changes: 0 additions & 13 deletions man/pipewire-cli.1.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@

<!--
This file is part of PipeWire.
PipeWire 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.
PipeWire 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 PipeWire; if not, see <http://www.gnu.org/licenses/>.
-->

<manpage name="pipewire-cli" section="1" desc="The PipeWire Command Line Interface">
Expand Down
13 changes: 0 additions & 13 deletions man/pipewire-monitor.1.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@

<!--
This file is part of PipeWire.
PipeWire 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.
PipeWire 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 PipeWire; if not, see <http://www.gnu.org/licenses/>.
-->

<manpage name="pipewire-monitor" section="1" desc="The PipeWire monitor">
Expand Down
13 changes: 0 additions & 13 deletions man/pipewire.1.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@

<!--
This file is part of PipeWire.
PipeWire 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.
PipeWire 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 PipeWire; if not, see <http://www.gnu.org/licenses/>.
-->

<manpage name="pipewire" section="1" desc="The PipeWire media server">
Expand Down
13 changes: 0 additions & 13 deletions man/pipewire.conf.5.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@

<!--
This file is part of PipeWire.
PipeWire 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.
PipeWire 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 PipeWire; if not, see <http://www.gnu.org/licenses/>.
-->

<manpage name="pipewire.conf" section="5" desc="The PipeWire server configuration file">
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ cdata.set('PIPEWIRE_DATADIR', '"@0@"'.format(pipewire_datadir))
cdata.set('LOCALEDIR', '"@0@"'.format(pipewire_localedir))
cdata.set('LIBDIR', '"@0@"'.format(pipewire_libdir))
cdata.set('GETTEXT_PACKAGE', '"pipewire"')
cdata.set('PIPEWIRE_LICENSE', '"LGPL"')
cdata.set('PIPEWIRE_LICENSE', '"MIT"')
cdata.set('PIPEWIRE_PACKAGE_ORIGIN', '"Unknown package origin"')
cdata.set('PIPEWIRE_PACKAGE_NAME', '"PipeWire source release"')
cdata.set('PACKAGE', '"pipewire"')
Expand Down
31 changes: 17 additions & 14 deletions spa/include/spa/buffer/alloc.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
/* Simple Plugin API
* Copyright (C) 2018 Wim Taymans <wim.taymans@gmail.com>
* Copyright © 2018 Wim Taymans
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
* 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:
*
* This library 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
* Library General Public License for more details.
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
* 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.
*/

#ifndef __SPA_BUFFER_ALLOC_H__
#define __SPA_BUFFER_ALLOC_H__

Expand Down
Loading

0 comments on commit 85f2e93

Please sign in to comment.