Skip to content

Commit b8b4b42

Browse files
author
Torbjörn Andersson
committed
LEGAL: Add COPYING.BSD file
Reword the disclaimer at the top of COPYING.LGPL, as it sounds a bit awkward to me. Move the BSD-like license to the top of mpeg_player.cpp (it still points out that only parts of the file are under that license) because that's where COPYING.BSD tells the reader to look. svn-id: r51939
1 parent 5611507 commit b8b4b42

File tree

3 files changed

+159
-66
lines changed

3 files changed

+159
-66
lines changed

‎COPYING.BSD

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
NOTE: Only certain parts of the ScummVM project are under the BSD license.
2+
The majority of the files are under the GNU GPL. See the headers of the
3+
individual files to find out the exact license.
4+
5+
The term "BSD license" refers to any BSD-like license, as they are sometimes
6+
hard to tell apart. No slight against other licenses is intended.
7+
8+
9+
Parts of the Nintendo DS port use the following license:
10+
11+
Copyright (c) 2006 Michael "Chishm" Chisholm
12+
13+
Redistribution and use in source and binary forms, with or without
14+
modification, are permitted provided that the following conditions are met:
15+
16+
1. Redistributions of source code must retain the above copyright notice,
17+
this list of conditions and the following disclaimer.
18+
2. Redistributions in binary form must reproduce the above copyright notice,
19+
this list of conditions and the following disclaimer in the documentation
20+
and/or other materials provided with the distribution.
21+
3. The name of the author may not be used to endorse or promote products
22+
derived from this software without specific prior written permission.
23+
24+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
25+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
26+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
27+
EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
29+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
30+
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
31+
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33+
POSSIBILITY OF SUCH DAMAGE.
34+
35+
36+
Parts of the MPEG decoder use the following license:
37+
38+
Copyright (c) 1995 The Regents of the University of California.
39+
All rights reserved.
40+
41+
Permission to use, copy, modify, and distribute this software and its
42+
documentation for any purpose, without fee, and without written agreement is
43+
hereby granted, provided that the above copyright notice and the following
44+
two paragraphs appear in all copies of this software.
45+
46+
IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
47+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
48+
OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
49+
CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
50+
51+
THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
52+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
53+
AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
54+
ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
55+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
56+
57+
Copyright (c) 1995 Erik Corry
58+
All rights reserved.
59+
60+
Permission to use, copy, modify, and distribute this software and its
61+
documentation for any purpose, without fee, and without written agreement is
62+
hereby granted, provided that the above copyright notice and the following
63+
two paragraphs appear in all copies of this software.
64+
65+
IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
66+
SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
67+
THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
68+
OF THE POSSIBILITY OF SUCH DAMAGE.
69+
70+
ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
71+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
72+
PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
73+
BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
74+
UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
75+
76+
Portions of this software Copyright (c) 1995 Brown University.
77+
All rights reserved.
78+
79+
Permission to use, copy, modify, and distribute this software and its
80+
documentation for any purpose, without fee, and without written agreement
81+
is hereby granted, provided that the above copyright notice and the
82+
following two paragraphs appear in all copies of this software.
83+
84+
IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
85+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
86+
OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
87+
UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
88+
89+
BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
90+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
91+
PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
92+
BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
93+
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

‎COPYING.LGPL

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
NOTE: Only several files of ScummVM project are under GNU LGPL.
2-
Majority of files are under GNU GPL. See headers of individual
3-
files to find out the exact license.
1+
NOTE: Only certain parts of the ScummVM project are under the GNU LGPL.
2+
The majority of the files are under the GNU GPL. See the headers of the
3+
individual files to find out the exact license.
44

55

66

‎graphics/video/mpeg_player.cpp

+63-63
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,69 @@
2323
*
2424
*/
2525

26+
// The YUV to RGB conversion code is derived from SDL's YUV overlay code, which
27+
// in turn appears to be derived from mpeg_play. The following copyright
28+
// notices have been included in accordance with the original license. Please
29+
// note that the term "software" in this context only applies to the
30+
// buildLookup() and plotYUV*() functions below.
31+
32+
// Copyright (c) 1995 The Regents of the University of California.
33+
// All rights reserved.
34+
//
35+
// Permission to use, copy, modify, and distribute this software and its
36+
// documentation for any purpose, without fee, and without written agreement is
37+
// hereby granted, provided that the above copyright notice and the following
38+
// two paragraphs appear in all copies of this software.
39+
//
40+
// IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
41+
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
42+
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
43+
// CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
44+
//
45+
// THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
46+
// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
47+
// AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
48+
// ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
49+
// PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
50+
51+
// Copyright (c) 1995 Erik Corry
52+
// All rights reserved.
53+
//
54+
// Permission to use, copy, modify, and distribute this software and its
55+
// documentation for any purpose, without fee, and without written agreement is
56+
// hereby granted, provided that the above copyright notice and the following
57+
// two paragraphs appear in all copies of this software.
58+
//
59+
// IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
60+
// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
61+
// THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
62+
// OF THE POSSIBILITY OF SUCH DAMAGE.
63+
//
64+
// ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
65+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
66+
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
67+
// BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
68+
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
69+
70+
// Portions of this software Copyright (c) 1995 Brown University.
71+
// All rights reserved.
72+
//
73+
// Permission to use, copy, modify, and distribute this software and its
74+
// documentation for any purpose, without fee, and without written agreement
75+
// is hereby granted, provided that the above copyright notice and the
76+
// following two paragraphs appear in all copies of this software.
77+
//
78+
// IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
79+
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
80+
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
81+
// UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
82+
//
83+
// BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
84+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
85+
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
86+
// BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
87+
// SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
88+
2689
#include "graphics/video/mpeg_player.h"
2790
#include "common/file.h"
2891
#include "common/system.h"
@@ -284,69 +347,6 @@ void BaseAnimationState::buildLookup(int p, int lines) {
284347

285348
#else
286349

287-
// The YUV to RGB conversion code is derived from SDL's YUV overlay code, which
288-
// in turn appears to be derived from mpeg_play. The following copyright
289-
// notices have been included in accordance with the original license. Please
290-
// note that the term "software" in this context only applies to the two
291-
// functions buildLookup() and plotYUV() below.
292-
293-
// Copyright (c) 1995 The Regents of the University of California.
294-
// All rights reserved.
295-
//
296-
// Permission to use, copy, modify, and distribute this software and its
297-
// documentation for any purpose, without fee, and without written agreement is
298-
// hereby granted, provided that the above copyright notice and the following
299-
// two paragraphs appear in all copies of this software.
300-
//
301-
// IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
302-
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
303-
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
304-
// CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
305-
//
306-
// THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
307-
// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
308-
// AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
309-
// ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
310-
// PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
311-
312-
// Copyright (c) 1995 Erik Corry
313-
// All rights reserved.
314-
//
315-
// Permission to use, copy, modify, and distribute this software and its
316-
// documentation for any purpose, without fee, and without written agreement is
317-
// hereby granted, provided that the above copyright notice and the following
318-
// two paragraphs appear in all copies of this software.
319-
//
320-
// IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
321-
// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
322-
// THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
323-
// OF THE POSSIBILITY OF SUCH DAMAGE.
324-
//
325-
// ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
326-
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
327-
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
328-
// BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
329-
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
330-
331-
// Portions of this software Copyright (c) 1995 Brown University.
332-
// All rights reserved.
333-
//
334-
// Permission to use, copy, modify, and distribute this software and its
335-
// documentation for any purpose, without fee, and without written agreement
336-
// is hereby granted, provided that the above copyright notice and the
337-
// following two paragraphs appear in all copies of this software.
338-
//
339-
// IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
340-
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
341-
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
342-
// UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
343-
//
344-
// BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
345-
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
346-
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
347-
// BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
348-
// SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
349-
350350
void BaseAnimationState::buildLookup() {
351351
// Do we already have lookup tables for this bit format?
352352
Graphics::PixelFormat format = _sys->getOverlayFormat();

0 commit comments

Comments
 (0)