From 9efce31d5758ab5a6fce9f174b80daa22c6e28d2 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Thu, 7 Dec 2017 17:43:22 +0100 Subject: [PATCH] Add licenses of new lib (especially for ogg playing) --- LICENSE.all | 239 +++++++++++++++++++++++++++++++++++ resources/po/de.po | 12 +- resources/po/en_US.po | 8 +- resources/po/fr.po | 12 +- resources/po/it.po | 12 +- resources/po/pl.po | 14 +- resources/po/planetblupi.pot | 8 +- src/event.cxx | 2 + 8 files changed, 292 insertions(+), 15 deletions(-) diff --git a/LICENSE.all b/LICENSE.all index 4f7300a..7c593ef 100644 --- a/LICENSE.all +++ b/LICENSE.all @@ -7,8 +7,11 @@ List of all licenses, concerns Planet Blupi and dependencies * libasound -- https://www.alsa-project.org * libcurl -- https://curl.haxx.se/libcurl/ * GNU/libiconv -- https://www.gnu.org/software/libiconv/ + * libogg -- https://xiph.org/downloads/ * libpng -- http://www.libpng.org/pub/png/libpng.html * libpulse -- https://freedesktop.org/software/pulseaudio/doxygen/ + * libsndfile -- http://www.mega-nerd.com/libsndfile/ + * libvorbis -- https://xiph.org/downloads/ * SDL_kitchensink -- https://github.com/katajakasa/SDL_kitchensink * SDL2 -- https://www.libsdl.org * SDL2_image -- https://www.libsdl.org/projects/SDL_image/ @@ -3117,6 +3120,39 @@ the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . +###################################################################### +# libogg - LICENSE +###################################################################### + +Copyright (c) 2002, Xiph.org Foundation + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ###################################################################### # libpng - LICENSE ###################################################################### @@ -3301,6 +3337,209 @@ While we attempt to provide a summary here, it is the ultimate responsibility of the packager to ensure the components they use in their build of PulseAudio meets their license requirements. +###################################################################### +# libsndfile - LICENSE +###################################################################### + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + +###################################################################### +# libogg - LICENSE +###################################################################### + +Copyright (c) 2002, Xiph.org Foundation + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ###################################################################### # SDL_kitchensink - LICENSE ###################################################################### diff --git a/resources/po/de.po b/resources/po/de.po index c2267a5..ef231f2 100644 --- a/resources/po/de.po +++ b/resources/po/de.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-15 18:34+0200\n" -"PO-Revision-Date: 2017-10-04 23:30+0200\n" +"POT-Creation-Date: 2017-12-07 17:31+0100\n" +"PO-Revision-Date: 2017-12-07 17:36+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid " - FFmpeg (LGPLv2.1)" @@ -39,12 +39,18 @@ msgstr " - libasound (LGPLv2.1)" msgid " - libcurl (MIT/X derivate)" msgstr " - libcurl (MIT/X Derivatlizenz)" +msgid " - libogg and libvorbis (own license)" +msgstr " - libogg and libvorbis (Eigene Lizenz)" + msgid " - libpng (own license)" msgstr " - libpng (Eigene Lizenz)" msgid " - libpulse (LGPLv2.1)" msgstr " - libpulse (LGPLv2.1)" +msgid " - libsndfile (LGPLv3)" +msgstr " - libsndfile (LGPLv3)" + msgid " - zlib (own license)" msgstr " - zlib (Eigene Lizenz)" diff --git a/resources/po/en_US.po b/resources/po/en_US.po index 6c21e84..c6a5d74 100644 --- a/resources/po/en_US.po +++ b/resources/po/en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-15 18:34+0200\n" +"POT-Creation-Date: 2017-12-07 17:31+0100\n" "PO-Revision-Date: 2017-02-27 21:28+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -39,12 +39,18 @@ msgstr "" msgid " - libcurl (MIT/X derivate)" msgstr "" +msgid " - libogg and libvorbis (own license)" +msgstr "" + msgid " - libpng (own license)" msgstr "" msgid " - libpulse (LGPLv2.1)" msgstr "" +msgid " - libsndfile (LGPLv3)" +msgstr "" + msgid " - zlib (own license)" msgstr "" diff --git a/resources/po/fr.po b/resources/po/fr.po index 90b0d59..4406b82 100644 --- a/resources/po/fr.po +++ b/resources/po/fr.po @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-15 18:34+0200\n" -"PO-Revision-Date: 2017-10-04 23:29+0200\n" +"POT-Creation-Date: 2017-12-07 17:31+0100\n" +"PO-Revision-Date: 2017-12-07 17:37+0100\n" "Last-Translator: Mathieu Schroeter \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.5\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid " - FFmpeg (LGPLv2.1)" @@ -38,12 +38,18 @@ msgstr " - libasound (LGPLv2.1)" msgid " - libcurl (MIT/X derivate)" msgstr " - libcurl (dérivée de MIT/X)" +msgid " - libogg and libvorbis (own license)" +msgstr " - libogg and libvorbis (propre licence)" + msgid " - libpng (own license)" msgstr " - libpng (propre licence)" msgid " - libpulse (LGPLv2.1)" msgstr " - libpulse (LGPLv2.1)" +msgid " - libsndfile (LGPLv3)" +msgstr " - libsndfile (LGPLv3)" + msgid " - zlib (own license)" msgstr " - zlib (propre licence)" diff --git a/resources/po/it.po b/resources/po/it.po index 5886215..63d1d19 100644 --- a/resources/po/it.po +++ b/resources/po/it.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-29 10:21+0200\n" -"PO-Revision-Date: 2017-10-04 17:30+0200\n" +"POT-Creation-Date: 2017-12-07 17:31+0100\n" +"PO-Revision-Date: 2017-12-07 17:38+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid " - FFmpeg (LGPLv2.1)" @@ -39,12 +39,18 @@ msgstr " - libasound (LGPLv2.1)" msgid " - libcurl (MIT/X derivate)" msgstr " - libcurl (MIT/X derivata)" +msgid " - libogg and libvorbis (own license)" +msgstr " - libogg and libvorbis (licensa personale)" + msgid " - libpng (own license)" msgstr " - libpng (licensa personale)" msgid " - libpulse (LGPLv2.1)" msgstr " - libpulse (LGPLv2.1)" +msgid " - libsndfile (LGPLv3)" +msgstr " - libsndfile (LGPLv3)" + msgid " - zlib (own license)" msgstr " - zlib (licensa personale)" diff --git a/resources/po/pl.po b/resources/po/pl.po index d5d084e..f237fde 100644 --- a/resources/po/pl.po +++ b/resources/po/pl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-04 07:04+0200\n" -"PO-Revision-Date: 2017-09-12 20:10+0200\n" +"POT-Creation-Date: 2017-12-07 17:31+0100\n" +"PO-Revision-Date: 2017-12-07 17:39+0100\n" "Last-Translator: tomangelo \n" "Language-Team: TerranovaTeam \n" "Language: pl\n" @@ -17,6 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 2.0.5\n" msgid " - FFmpeg (LGPLv2.1)" msgstr " - FFmpeg (LGPLv2.1)" @@ -39,12 +40,18 @@ msgstr " - libasound (LGPLv2.1)" msgid " - libcurl (MIT/X derivate)" msgstr " - libcurl (MIT/X derivate)" +msgid " - libogg and libvorbis (own license)" +msgstr " - libogg and libvorbis (własna licencja)" + msgid " - libpng (own license)" msgstr " - libpng (własna licencja)" msgid " - libpulse (LGPLv2.1)" msgstr " - libpulse (LGPLv2.1)" +msgid " - libsndfile (LGPLv3)" +msgstr " - libsndfile (LGPLv2.1)" + msgid " - zlib (own license)" msgstr " - zlib (własna licencja)" @@ -543,9 +550,8 @@ msgstr "Wybór muzyki" msgid "Music number 1" msgstr "Muzyka numer 1" -#, fuzzy msgid "Music number 10" -msgstr "Muzyka numer 1" +msgstr "Muzyka numer 10" msgid "Music number 2" msgstr "Muzyka numer 2" diff --git a/resources/po/planetblupi.pot b/resources/po/planetblupi.pot index 5b3b444..d90db67 100644 --- a/resources/po/planetblupi.pot +++ b/resources/po/planetblupi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-04 07:04+0200\n" +"POT-Creation-Date: 2017-12-07 17:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -729,12 +729,18 @@ msgstr "" msgid " - libcurl (MIT/X derivate)" msgstr "" +msgid " - libogg and libvorbis (own license)" +msgstr "" + msgid " - libpng (own license)" msgstr "" msgid " - libpulse (LGPLv2.1)" msgstr "" +msgid " - libsndfile (LGPLv3)" +msgstr "" + msgid " - SDL_kitchensink (MIT)" msgstr "" diff --git a/src/event.cxx b/src/event.cxx index 9680eb9..6938ab8 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -2598,8 +2598,10 @@ CEvent::DrawButtons () gettext (" - GNU/gettext and GNU/libiconv (GPLv3)"), gettext (" - libasound (LGPLv2.1)"), gettext (" - libcurl (MIT/X derivate)"), + gettext (" - libogg and libvorbis (own license)"), gettext (" - libpng (own license)"), gettext (" - libpulse (LGPLv2.1)"), + gettext (" - libsndfile (LGPLv3)"), gettext (" - SDL_kitchensink (MIT)"), gettext (" - SDL2, SDL2_image and SDL2_mixer (zlib license)"), gettext (" - zlib (own license)"),