diff --git a/AUTHORS b/AUTHORS index bf58ea89f..39bcf9045 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,43 +3,37 @@ Lumiera Authors and Credits :Date: 11/2025 -|========================================== -|*Architecture* | -| | HERMANN VOSSELER -| | CHRISTIAN THÄTER -| | JOEL HOLDSWORTH +Architecture:: +- Hermann Voßeler +- Christian Thäter +- Joel Holdsworth -|*Workflow Concept*| -| | HERMANN VOSSELER -| | WOUTER VERWIJLEN -| | CHRISTOPH VARGA -| | BRIAN RYTEL -| | CLAY BARNES +Workflow Concept:: +- Hermann Voßeler +- Wouter Verwijlen +- Christoph Varga +- Brian Rytel +- Clay Barnes -| | -| | -|*Core Developers* | -| | HERMANN VOSSELER -| | JOEL HOLDSWORTH -| | CHRISTIAN THÄTER -|*Programming* | -| | MICHAEL PLOUJNIKOV -| | STEFAN KANGAS -| | MICHAEL FISHER -| | SIMEON VÖLKEL +Core Developers:: +- Hermann Voßeler +- Joel Holdsworth +- Christian Thäter +Programming:: +- Michael Ploujnikov +- Stefan Kangas +- Michael Fisher +- Simeon Völkel -| | -| | -|*Documentation* | -| | HERMANN VOSSELER -| | CHRISTIAN THÄTER -| | ODIN HØRTHE OMDAL -| | SIMEON VÖLKEL -| | MANO STIENEN -| | HENDRIK BOOM -| | BENNY LYONS -|========================================== +Documentation:: +- Hermann Vosseler +- Christian Thäter +- Odin Hørthe Omdal +- Simeon Völkel +- Mano Stienen +- Hendrik Boom +- Benny Lyons @@ -61,7 +55,7 @@ The Lumiera project feels especially obliged to:: Further Credits --------------- -- inspirations and some UI components were taken from http://Ardour.org[Ardour] +- inspirations and some UI components were taken from https://ardour.org/[Ardour] - https://github.com/x42/xjadeo[xjadeo] by Robin Gareus was very helpful for learning how to output raw video from a desktop application diff --git a/COPYING b/COPYING index eeb586b39..227b449d5 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 19yy + Copyright (C) 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 @@ -303,17 +303,15 @@ the "copyright" line and a pointer to where the full notice is found. 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 - + You should have received a copy of the GNU General Public License along + with this program; if not, see . Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -330,11 +328,12 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - , 1 April 1989 - Ty Coon, President of Vice + , 1 April 1989 + Moe Ghoul, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + diff --git a/LICENSE b/LICENSE index aa23fae45..6c52ed1b9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,15 @@ - the *Lumiera* source code is (C) by the original authors (see `AUTHORS`) + ----------------------------------------------------------------------------- -Lumiera is free software -- you may use and redistribute it under the -Terms and conditions of the GNU GENERAL PUBLIC LICENSE (GPL); -either version 2 of the License, or (at your option) any later version. +Lumiera 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. For a copy of the GPL Version 2 see the file COPYING ----------------------------------------------------------------------------- @@ -11,14 +17,14 @@ For a copy of the GPL Version 2 see the file COPYING - Website, design documents and accompanying materials are covered by - the same license as the source code, + - in addition they are also dual-licensed under *CC-By-SA 3* + the same license as the source code (GPL2+), + + in addition they are also dual-licensed under *CC-By-SA 4* -- at various places, the implementation draws on solutions - and comments published at http://Stackoverflow.com[Stackoverflow] -- - according to the http://stackexchange.com/legal[License Agreement] page, - any ``subscriber content'' on that site is provided under *CC-By-SA 3*.. +- at various places, the implementation draws on solutions and comments + published at http://Stackoverflow.com[Stackoverflow] -- according to the + https://stackoverflow.com/legal/terms-of-service/public#licensing[License Agreement], + any ``subscriber content'' on that site is provided under *CC-By-SA 4*. We attribute significant usages of solutions published this way in the doxygen comments of the relevant source code entities. @@ -27,7 +33,7 @@ For a copy of the GPL Version 2 see the file COPYING *The Loki Library* (C) 2001 by *Andrei Alexandrescu* + ----------------------------------------------------------------------------- -Loki is governed by a MIT-License. See: http://loki-lib.sourceforge.net +Loki is governed by a MIT-License. See: https://sourceforge.net/projects/loki-lib/ Permission to use, copy, modify, distribute and sell this software for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this diff --git a/NEWS b/NEWS index b083567c4..c987e0570 100644 --- a/NEWS +++ b/NEWS @@ -31,8 +31,8 @@ the Render Engine, but the connection to the player and UI for output is yet unfinished. As of _11/2015_ (0.pre.03):: -A lot of long standing maintenance work has been done. The Project upgraded -to C++11 and in the end even to C++14 and Debian/Jessie as reference platform, +A lot of long standing maintenance work has been done. +The Project upgraded to C++14 and Debian/Jessie as reference platform, followed by clean-up of workarounds now obsoleted. On the GUI side, we largely made the transition to GTK-3, which leads to a rework of our timeline widget, which is in progress but not finished yet. This work also spurred an effort diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index ac0620652..dc16e97f3 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -169932,9 +169932,9 @@ that situation will improve in forseeable future. - - - + + + @@ -170022,11 +170022,30 @@ that situation will improve in forseeable future. - - + + - - + + + + + + + + + + + + + + + +

+ Das hab ich neulich schon im Rahmen der Website überlegt und so beschlossen; ich kann das Aggregat re-lizensieren unter einer kompatiblen Lizenz (eigentlich könnte man das auch für GPL2+ ⟶ GPL3+ so machen). Auch Stackoverfow hat seine Lizenz für »Subscriber Content« auf CC-By-SA 4.0 gehoben +

+ + + @@ -181267,8 +181286,8 @@ Since then others have made contributions, see the log for the history. - - + + @@ -181674,7 +181693,7 @@ Since then others have made contributions, see the log for the history. - +