Skip to content

Commit f194094

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request #641 from JeromeMartinez/License
License change
2 parents d718f25 + 334769e commit f194094

389 files changed

Lines changed: 306 additions & 20612 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
BSD 2-Clause License
2+
3+
Copyright (c) 2015-2018, MediaArea.net SARL
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are met:
8+
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
16+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
20+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
22+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
23+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎License.GPLv3.html‎

Lines changed: 0 additions & 636 deletions
This file was deleted.

‎License.MPLv2.html‎

Lines changed: 0 additions & 205 deletions
This file was deleted.

‎License.html‎

Lines changed: 74 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,77 @@
11
<!DOCTYPE html>
22
<html lang="en-US">
3-
<head>
4-
<title>MediaConch - License</title>
5-
<meta charset="UTF-8" />
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7-
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
<link rel="stylesheet" href="qrc:/bootstrap.css">
9-
<link rel="stylesheet" type="text/css" href="qrc:/main.css" media="screen"/>
10-
</head>
11-
<body id="body">
12-
13-
<h1>About</h1>
14-
15-
<p>Copyright ©: 2015-2016, MediaArea.net SARL. All Rights Reserved. </p>
16-
17-
<p>Version 17.12 </p>
18-
19-
<p>MediaConch is licensed under a <a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a>/<a href="https://www.mozilla.org/en-US/MPL/2.0/">MPLv2+</a> License. </p>
20-
21-
<p>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 3 of the License, or (at your option) any later version. </p>
22-
23-
<p>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. </p>
24-
25-
<p>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. </p>
26-
27-
<h2>Third party libraries</h2>
3+
<head>
4+
<title>MediaConch - License</title>
5+
<meta charset="UTF-8" />
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<link rel="stylesheet" href="qrc:/bootstrap.css">
9+
<link rel="stylesheet" type="text/css" href="qrc:/main.css" media="screen"/>
10+
</head>
11+
<body>
12+
<div>
13+
<h3 style="text-align: center">MediaConch License</h3>
14+
<p>
15+
Copyright (c) 2015-2018 <a href="mailto:Info@MediaArea.net">MediaArea.net SARL</a>. All rights reserved.
16+
</p>
17+
<p>
18+
Redistribution and use in source and binary forms, with or without modification,
19+
are permitted provided that the following conditions are met:
20+
</p>
21+
<ul>
22+
<li>Redistributions of source code must retain the above copyright notice,
23+
this list of conditions and the following disclaimer.</li>
24+
<li>Redistributions in binary form must reproduce the above copyright notice,
25+
this list of conditions and the following disclaimer in the documentation and/or
26+
other materials provided with the distribution.</li>
27+
</ul>
28+
<p>
29+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &ldquo;AS IS&rdquo;
30+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
31+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
32+
COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
33+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
34+
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
35+
AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
36+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
37+
OF THE POSSIBILITY OF SUCH DAMAGE.
38+
</p>
39+
</div>
40+
41+
<hr/>
42+
<div>
43+
<p>Alternate open source licenses:<br/>
44+
You can relicense (including source headers change) MediaConch
45+
under Apache License 2.0 or later,
46+
and/or GNU Lesser General Public License 2.1 or later,
47+
and/or GNU General Public License 2.0 or later,
48+
and/or Mozilla Public License 2.0 or later.</p>
49+
</div>
50+
51+
<hr/>
52+
<div>
53+
54+
<h3>Third party libraries</h3>
2855

2956
<p>The software relies on third party libraries. Such libraries have their own license: </p>
3057

3158
<ul>
32-
<li>Media analysis library: MediaInfoLib, (c) MediaArea.net SARL, initialy BSD-2-Clause license, relicensed to GPLv3 or later / MPLv2 or later</li>
33-
<li>Base classes library: ZenLib, (c) MediaArea.net SARL, initialy zlib license, relicensed to GPLv3 or later / MPLv2 or later</li>
34-
<li>C++ standard library: <a href="http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01s02.html">libstdc++</a> (GPLv3+ with linking exception), <a href="http://llvm.org/docs/DeveloperPolicy.html#license">libc++</a> (MIT license, could be relicensed to GPLv3 or later / MPLv2 or later), <a href="http://msdn.microsoft.com/en-us/library/vstudio/ms235299.aspx">Visual C++ library</a> (Microsoft proprietary license) or any other C++ standard library</li>
35-
<li>GUI (optional): <a href="https://www.qt.io/qt-licensing-terms/">Qt</a>, LGPLv3+ license, compatible with GPLv3 or later / MPLv2 or later. Uses several third party libraries, <a href="Qt_Licenses/index.html">with their own licenses</a>, all compatible with GPLv3 or later / MPLv2 or later</li>
36-
<li>WebUI engine (optional) : <a href="https://symfony.com/license">Symfony</a>, MIT license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
37-
<li>WebUI design (optional) : <a href="http://getbootstrap.com/getting-started/">Bootstrap</a>, MIT license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
38-
<li>XML parser (optional): <a href="http://www.grinninglizard.com/tinyxml2docs/index.html">TinyXML-2</a>, zlib license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
39-
<li>gzip decompression routine (optional): <a href="http://www.gzip.org/zlib/zlib_license.html">zlib</a>, zlib license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
40-
<li>FTP, FTPS, SFTP, HTTP, HTTPS (optional): <a href="http://curl.haxx.se/docs/copyright.html">libcurl</a>, MIT license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
41-
<li>Base64 (optional): base64 by Bob Withers, public domain, could be relicensed to GPLv3 or later / MPLv2 or later</li>
42-
<li>AES (optional): aes by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
43-
<li>MD5 (optional): md5 by Colin Plumb, public domain, could be relicensed to GPLv3 or later / MPLv2 or later</li>
44-
<li>SHA-1 (optional): sha1 by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
45-
<li>SHA-2 (optional): sha2 by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
46-
<li>HMAC (optional): hmac by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
47-
<li>SQLite (optional): the author disclaims copyright, compatible with GPLv3 or later / MPLv2 or later</li>
59+
<li>Media analysis library: MediaInfoLib, (c) MediaArea.net SARL, BSD-2-Clause license</li>
60+
<li>Base classes library: ZenLib, (c) MediaArea.net SARL, initialy zlib license</li>
61+
<li>C++ standard library: <a href="http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01s02.html">libstdc++</a> (GPLv3+ with linking exception), <a href="http://llvm.org/docs/DeveloperPolicy.html#license">libc++</a> (MIT license), <a href="http://msdn.microsoft.com/en-us/library/vstudio/ms235299.aspx">Visual C++ library</a> (Microsoft proprietary license) or any other C++ standard library</li>
62+
<li>GUI (optional): <a href="https://www.qt.io/qt-licensing-terms/">Qt</a>, LGPLv3+ license</li>
63+
<li>WebUI engine (optional) : <a href="https://symfony.com/license">Symfony</a>, MIT license</li>
64+
<li>WebUI design (optional) : <a href="http://getbootstrap.com/getting-started/">Bootstrap</a>, MIT license/li>
65+
<li>XML parser (optional): <a href="http://www.grinninglizard.com/tinyxml2docs/index.html">TinyXML-2</a>, zlib license</li>
66+
<li>gzip decompression routine (optional): <a href="http://www.gzip.org/zlib/zlib_license.html">zlib</a>, zlib license</li>
67+
<li>FTP, FTPS, SFTP, HTTP, HTTPS (optional): <a href="http://curl.haxx.se/docs/copyright.html">libcurl</a>, MIT license</li>
68+
<li>Base64 (optional): base64 by Bob Withers, public domain</li>
69+
<li>AES (optional): aes by Brian Gladman, BSD-2-Clause license</li>
70+
<li>MD5 (optional): md5 by Colin Plumb, public domain</li>
71+
<li>SHA-1 (optional): sha1 by Brian Gladman, BSD-2-Clause license</li>
72+
<li>SHA-2 (optional): sha2 by Brian Gladman, BSD-2-Clause license</li>
73+
<li>HMAC (optional): hmac by Brian Gladman, BSD-2-Clause license</li>
74+
<li>SQLite (optional): the author disclaims copyright</li>
4875
</ul>
4976

5077
<h2>The Team</h2>
@@ -65,9 +92,12 @@ <h2>The Team</h2>
6592
<li>Tessa Fallon (Archivist): community outreach and standards organization </li>
6693
</ul>
6794

95+
</div>
96+
97+
<hr/>
98+
<div>
6899
<p>This project has received funding from <a href="http://preforma-project.eu">PREFORMA</a>, co-funded by the <a href="http://europa.eu/">European Commission</a> under its <a href="http://ec.europa.eu/research/fp7/index_en.cfm">FP7-ICT</a> Programme </p>
69100

70-
<script src="qrc:/jquery.js"></script>
71-
<script src="qrc:/bootstrap.js"></script>
72-
</body>
101+
</div>
102+
</body>
73103
</html>

‎Project/AppImage/Recipe.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Copyright (c) MediaArea.net SARL. All Rights Reserved.
44
#
5-
# Use of this source code is governed by a GPL v3+ and MPL v2+ license that can
5+
# Use of this source code is governed by a BSD-style license that can
66
# be found in the License.html file in the root of the source tree.
77
#
88

‎Project/GNU/GUI/mediaconch-gui.metainfo.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<component type="desktop">
44
<id type="desktop">mediaconch-gui.desktop</id>
55
<metadata_license>CC-BY-3.0</metadata_license>
6-
<project_license>MPL-2.0 OR GPL-3.0+</project_license>
6+
<project_license>BSD-2-Clause</project_license>
77
<name>MediaConch</name>
88
<summary>Implementation checker, policy checker, reporter, and fixer</summary>
99
<description>

‎Project/GNU/PKGBUILD‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pkgver=17.12
77
pkgrel=1
88
pkgdesc="Implementation checker and policy checker for video and audio files"
99
url="http://MediaArea.net/MediaConch"
10-
license=('custom:MPL2' 'GPL3')
10+
license=('BSD-2-Clause')
1111
source=(${pkgname}_${pkgver}.orig.tar.xz)
1212
md5sums=('00000000000000000000000000000000')
1313
arch=('i686' 'x86_64')
@@ -56,8 +56,6 @@ package_mediaconch() {
5656

5757
cd "${srcdir}"/MediaConch
5858
install -D -m 0644 License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html
59-
install -D -m 0644 License.MPLv2.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.MPLv2.html
60-
install -D -m 0644 License.GPLv3.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.GPLv3.html
6159

6260
install -D -m 0644 History_CLI.txt "${pkgdir}"/usr/share/docs/${pkgname}/History.txt
6361
install -D -m 0644 Release/ReadMe_CLI_Linux.txt "${pkgdir}"/usr/share/docs/${pkgname}/ReadMe.txt
@@ -76,8 +74,6 @@ package_mediaconch-server() {
7674

7775
cd "${srcdir}"/MediaConch
7876
install -D -m 0644 License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html
79-
install -D -m 0644 License.MPLv2.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.MPLv2.html
80-
install -D -m 0644 License.GPLv3.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.GPLv3.html
8177

8278
install -D -m 0644 Documentation/Daemon.md "${pkgdir}"/usr/share/docs/${pkgname}/Daemon.md
8379
install -D -m 0644 Documentation/Config.md "${pkgdir}"/usr/share/docs/${pkgname}/Config.md
@@ -102,8 +98,6 @@ package_mediaconch-gui() {
10298
install -D -m 0644 Project/GNU/GUI/mediaconch-gui.metainfo.xml "${pkgdir}"/usr/share/metainfo/mediaconch-gui.metainfo.xml
10399

104100
install -D -m 0644 License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html
105-
install -D -m 0644 License.MPLv2.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.MPLv2.html
106-
install -D -m 0644 License.GPLv3.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.GPLv3.html
107101

108102
install -D -m 0644 History_GUI.txt "${pkgdir}"/usr/share/docs/${pkgname}/History.txt
109103
install -D -m 0644 Release/ReadMe_GUI_Linux.txt "${pkgdir}"/usr/share/docs/${pkgname}/ReadMe.txt

‎Project/GNU/mediaconch.spec‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Release: 1
2929
Summary: Implementation checker and policy checker for video and audio files (CLI)
3030

3131
Group: Applications/Multimedia
32-
License: MPL-2.0+/GPL-3.0+
32+
License: BSD-2-Clause
3333
URL: http://MediaArea.net/MediaConch
3434
Packager: MediaArea.net SARL <info@mediaarea.net>
3535
Source0: %{name}_%{version}.tar.gz
@@ -354,9 +354,9 @@ fi
354354
%defattr(-,root,root,-)
355355
%doc Release/ReadMe_CLI_Linux.txt History_CLI.txt
356356
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
357-
%license License.html License.GPLv3.html License.MPLv2.html
357+
%license License.html
358358
%else
359-
%doc License.html License.GPLv3.html License.MPLv2.html
359+
%doc License.html
360360
%endif
361361
%{_bindir}/mediaconch
362362

@@ -365,9 +365,9 @@ fi
365365
%defattr(-,root,root,-)
366366
%doc Documentation/Daemon.md Documentation/Config.md Documentation/REST.md
367367
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
368-
%license License.html License.GPLv3.html License.MPLv2.html
368+
%license License.html
369369
%else
370-
%doc License.html License.GPLv3.html License.MPLv2.html
370+
%doc License.html
371371
%endif
372372
%{_bindir}/mediaconchd
373373
%if 0%{?fedora_version}
@@ -381,9 +381,9 @@ fi
381381
%defattr(-,root,root,-)
382382
%doc Release/ReadMe_GUI_Linux.txt History_GUI.txt
383383
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
384-
%license License.html License.GPLv3.html License.MPLv2.html
384+
%license License.html
385385
%else
386-
%doc License.html License.GPLv3.html License.MPLv2.html
386+
%doc License.html
387387
%endif
388388
%{_bindir}/mediaconch-gui
389389
%{_datadir}/applications/*.desktop

‎Project/OBS/deb9.debian/mediaconch.pod‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,10 @@ Apply the display transformation (XSL)
105105

106106
This manual page was written by Chow Loong Jin <hyperair@debian.org> for the
107107
Debian system (but may be used by others). Permissions is granted to copy,
108-
distribute, and/or modify this document under the terms of the GNU General
109-
Public License, Version 3 or any later version published by the Free Software
110-
Foundation, or the Mozilla Public License 2.0.
108+
distribute, and/or modify this document under the terms of the BSD-2-Clause
109+
License.
111110

112-
On Debian systems, the full text of the GNU General Public License, Version 3
113-
can be found in /usr/share/common-licenses/GPL-3.
111+
On Debian systems, the full text of the BSD-2-Clause License
112+
can be found in /usr/share/common-licenses/BSD.
114113

115114
=cut

0 commit comments

Comments
 (0)