Skip to content

Commit 5d1e464

Browse files
GillesDebunnegdebunne
authored andcommitted
Switch to GNU Lesser General Public License v2.1
1 parent ba9a875 commit 5d1e464

17 files changed

Lines changed: 355 additions & 1423 deletions

GPL_EXCEPTION

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

LICENCE

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

LICENSE

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.
166+

QGLViewer/qglviewer.spec

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ Version: %{version_major}.%{version_minor}.%{version_revision}
77
Release: 1
88

99
Summary: Qt based OpenGL generic 3D viewer library.
10-
License: GPL
10+
License: LGPL
1111
Group: Development/C++
1212
Source: %{name}-%{version}.tar.gz
1313
URL: http://www.libqglviewer.com
1414
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
15-
Vendor: Alma
1615
Requires: libqt >= 4.0.0
1716

1817
%description
@@ -92,7 +91,7 @@ ln -s libQGLViewer.so.%{version} $RPM_BUILD_ROOT%{libDir}/libQGLViewer.so
9291
# %{__install} doc/man/man3/QGLViewer.3 $RPM_BUILD_ROOT%{_mandir}/man3/
9392
# %{__install} doc/man/man3/qglviewer_* $RPM_BUILD_ROOT%{_mandir}/man3/
9493
%{__install} --mode=644 doc/*.html doc/*.css $RPM_BUILD_ROOT%{docDir}
95-
%{__install} --mode=644 INSTALL README LICENCE CHANGELOG $RPM_BUILD_ROOT%{docDir}
94+
%{__install} --mode=644 INSTALL README LICENSE CHANGELOG $RPM_BUILD_ROOT%{docDir}
9695
%{__install} --mode=644 doc/refManual/* $RPM_BUILD_ROOT%{docDir}/refManual
9796
%{__install} --mode=644 doc/images/* $RPM_BUILD_ROOT%{docDir}/images
9897
# %{__install} --mode=644 doc/examples/*.html $RPM_BUILD_ROOT%{docDir}/examples
@@ -142,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
142141
%doc %{docDir}/*.html
143142
%doc %{docDir}/*.css
144143
%doc %{docDir}/README
145-
%doc %{docDir}/LICENCE
144+
%doc %{docDir}/LICENSE
146145
%doc %{docDir}/INSTALL
147146
%doc %{docDir}/CHANGELOG
148147
%docdir %{docDir}/refManual

README

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,28 @@
11

22
l i b Q G L V i e w e r
33

4-
Version #VERSION#. Packaged on #DATE#
4+
Version #VERSION#. Packaged on #DATE#
55

66

7-
Copyright (C) 2002-2023 Gilles Debunne. All rights reserved.
8-
#WEBURL#
9-
Send e-mail to contact@libqglviewer.com
7+
Copyright (C) 2002-2023 Gilles Debunne. All rights reserved.
8+
#WEBURL#
9+
Send e-mail to contact@libqglviewer.com
1010

1111

1212
libQGLViewer is a C++ library based on Qt that eases the creation of OpenGL 3D viewers.
1313

14-
It provides some of the typical 3D viewer functionalities, such as the possibility to
15-
move the camera using the mouse, which lacks in most of the other APIs. Other features
16-
include mouse manipulated frames, interpolated keyFrames, object selection, stereo
14+
It provides some of the typical 3D viewer functionalities, such as the possibility to
15+
move the camera using the mouse, which lacks in most of the other APIs. Other features
16+
include mouse manipulated frames, interpolated keyFrames, object selection, stereo
1717
display, screenshot saving and much more. It can be used by OpenGL beginners as well as
1818
to create complex applications, being fully customizable and easy to extend.
1919

20-
Based on the Qt toolkit, it compiles on any architecture (Unix-Linux, Mac, Windows).
21-
Full reference documentation and many examples are provided. libQGLViewer does not
22-
display 3D scenes in various formats, but it can be the base for the coding of such a
20+
Based on the Qt toolkit, it compiles on any architecture (Unix-Linux, Mac, Windows).
21+
Full reference documentation and many examples are provided. libQGLViewer does not
22+
display 3D scenes in various formats, but it can be the base for the coding of such a
2323
viewer.
2424

25-
libQGLViewer uses dual licensing: it is freely available under the terms of the GNU-GPL
26-
license for open source software development, while commercial applications can apply
27-
for a commercial license.
28-
25+
libQGLViewer is freely available under the terms of the GNU-LGPL license.
2926

3027
The library's main functionalities are:
3128

@@ -35,7 +32,7 @@ The library's main functionalities are:
3532
- Definition and replay of keyFrame paths.
3633
- Stereo display (provided that your hardware supports it).
3734
- Clean, well-designed and easily extendable API.
38-
- Many examples and a complete reference documentation.
35+
- Many examples and a complete reference documentation.
3936

4037
See the doc/index.html page for details.
4138

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ libQGLViewer is an open source C++ library based on Qt that eases the creation o
66
libQGLViewer provides some of the typical 3D viewer functionalities, such as the possibility to move the camera using the mouse, which lacks in most of the other APIs. Other features include mouse manipulated frames, interpolated keyFrames, object selection, stereo display, screenshot saving and much more. It can be used by OpenGL beginners as well as to create complex applications, being fully customizable and easy to extend.
77
Based on the Qt toolkit, it compiles on any architecture (Unix-Linux, Mac, Windows). Full reference documentation and many examples are provided. libQGLViewer does not display 3D scenes in various formats, but it can be the base for the coding of such a viewer.
88

9-
libQGLViewer uses dual licensing: it is freely available under the terms of the GNU-GPL license for open source software development, while commercial applications can apply for a commercial license.
9+
libQGLViewer is freely available under the terms of the GNU-LGPL license.
1010

1111
http://www.libqglviewer.com

0 commit comments

Comments
 (0)