Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in licenses: fmod
Date: Sun, 20 Nov 2011 04:47:55
Message-Id: 20111120044745.1D3D12004B@flycatcher.gentoo.org
1 ssuominen 11/11/20 04:47:45
2
3 Modified: fmod
4 Log:
5 Update fmod license
6
7 Revision Changes Path
8 1.4 licenses/fmod
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/fmod?rev=1.4&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/fmod?rev=1.4&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/fmod?r1=1.3&r2=1.4
13
14 Index: fmod
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/licenses/fmod,v
17 retrieving revision 1.3
18 retrieving revision 1.4
19 diff -u -r1.3 -r1.4
20 --- fmod 5 Nov 2011 02:29:56 -0000 1.3
21 +++ fmod 20 Nov 2011 04:47:45 -0000 1.4
22 @@ -1,3 +1,5 @@
23 +Note: This license is from documentation/LICENSE.txt included in fmodapi43802linux.tar.gz with BSD and BSD-2 stripped out from it
24 +
25 FMOD Ex SoundSystem Copyright © 2005-2011 Firelight Technologies Pty, Ltd.
26
27 FMOD NON-COMMERCIAL LICENSE
28 @@ -24,62 +26,3 @@
29
30 NOTE THIS IN ADVANCE, AS IT MUST BE DONE BEFORE SHIPPING YOUR
31 PRODUCT WITH FMOD.
32 -
33 -Uses Ogg Vorbis codec. BSD license.
34 -------------------------------------
35 -Copyright (c) 2002, Xiph.org Foundation
36 -
37 -Redistribution and use in source and binary forms, with or without
38 -modification, are permitted provided that the following conditions
39 -are met:
40 -
41 -- Redistributions of source code must retain the above copyright
42 -notice, this list of conditions and the following disclaimer.
43 -
44 -- Redistributions in binary form must reproduce the above copyright
45 -notice, this list of conditions and the following disclaimer in the
46 -documentation and/or other materials provided with the distribution.
47 -
48 -- Neither the name of the Xiph.org Foundation nor the names of its
49 -contributors may be used to endorse or promote products derived from
50 -this software without specific prior written permission.
51 -
52 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
53 -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
54 -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
55 -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
56 -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
57 -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
58 -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
59 -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
60 -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
61 -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
62 -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
63 -
64 -For Android platform code.
65 ---------------------------
66 -Copyright (C) 2010 The Android Open Source Project
67 -All rights reserved.
68 -
69 -Redistribution and use in source and binary forms, with or without
70 -modification, are permitted provided that the following conditions
71 -are met:
72 - * Redistributions of source code must retain the above copyright
73 - notice, this list of conditions and the following disclaimer.
74 - * Redistributions in binary form must reproduce the above copyright
75 - notice, this list of conditions and the following disclaimer in
76 - the documentation and/or other materials provided with the
77 - distribution.
78 -
79 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
80 -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
81 -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
82 -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
83 -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
84 -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
85 -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
86 -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
87 -AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
88 -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
89 -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
90 -SUCH DAMAGE.