Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-2.8.3-cmake.patch
Date: Wed, 30 Jun 2010 00:52:16
Message-Id: 20100630005212.70A492C621@corvid.gentoo.org
1 reavertm 10/06/30 00:52:12
2
3 Modified: openscenegraph-2.8.3-cmake.patch
4 Log:
5 Include COPYING-CMAKE-SCRIPTS
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch?r1=1.1&r2=1.2
14
15 Index: openscenegraph-2.8.3-cmake.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- openscenegraph-2.8.3-cmake.patch 28 Jun 2010 19:57:46 -0000 1.1
22 +++ openscenegraph-2.8.3-cmake.patch 30 Jun 2010 00:52:12 -0000 1.2
23 @@ -1,6 +1,6 @@
24 diff -ruN ../OpenSceneGraph-2.8.3/CMakeLists.txt ./CMakeLists.txt
25 --- ../OpenSceneGraph-2.8.3/CMakeLists.txt 2010-04-01 11:02:54.000000000 +0200
26 -+++ ./CMakeLists.txt 2010-06-25 17:28:40.905021853 +0200
27 ++++ ./CMakeLists.txt 2010-06-30 02:37:36.491242970 +0200
28 @@ -27,6 +27,7 @@
29 endif(COMMAND cmake_policy)
30
31 @@ -159,6 +159,32 @@
32
33 # Process our other doxyfiles but don't create targets for these
34 CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
35 +diff -ruN ../OpenSceneGraph-2.8.3/CMakeModules/COPYING-CMAKE-SCRIPTS ./CMakeModules/COPYING-CMAKE-SCRIPTS
36 +--- ../OpenSceneGraph-2.8.3/CMakeModules/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100
37 ++++ ./CMakeModules/COPYING-CMAKE-SCRIPTS 2010-01-11 06:29:35.000000000 +0100
38 +@@ -0,0 +1,22 @@
39 ++Redistribution and use in source and binary forms, with or without
40 ++modification, are permitted provided that the following conditions
41 ++are met:
42 ++
43 ++1. Redistributions of source code must retain the copyright
44 ++ notice, this list of conditions and the following disclaimer.
45 ++2. Redistributions in binary form must reproduce the copyright
46 ++ notice, this list of conditions and the following disclaimer in the
47 ++ documentation and/or other materials provided with the distribution.
48 ++3. The name of the author may not be used to endorse or promote products
49 ++ derived from this software without specific prior written permission.
50 ++
51 ++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
52 ++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
53 ++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
54 ++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
55 ++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
56 ++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
57 ++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
58 ++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
59 ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
60 ++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
61 diff -ruN ../OpenSceneGraph-2.8.3/CMakeModules/FindFLTK.cmake ./CMakeModules/FindFLTK.cmake
62 --- ../OpenSceneGraph-2.8.3/CMakeModules/FindFLTK.cmake 2010-03-13 11:40:00.000000000 +0100
63 +++ ./CMakeModules/FindFLTK.cmake 1970-01-01 01:00:00.000000000 +0100
64 @@ -225,7 +251,7 @@
65 -ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
66 diff -ruN ../OpenSceneGraph-2.8.3/CMakeModules/MacroOptionalFindPackage.cmake ./CMakeModules/MacroOptionalFindPackage.cmake
67 --- ../OpenSceneGraph-2.8.3/CMakeModules/MacroOptionalFindPackage.cmake 1970-01-01 01:00:00.000000000 +0100
68 -+++ ./CMakeModules/MacroOptionalFindPackage.cmake 2010-06-16 14:27:36.000000000 +0200
69 ++++ ./CMakeModules/MacroOptionalFindPackage.cmake 2010-06-30 02:37:36.494250349 +0200
70 @@ -0,0 +1,28 @@
71 +# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
72 +# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
73 @@ -257,7 +283,7 @@
74 +
75 diff -ruN ../OpenSceneGraph-2.8.3/CMakeModules/OsgMacroUtils.cmake ./CMakeModules/OsgMacroUtils.cmake
76 --- ../OpenSceneGraph-2.8.3/CMakeModules/OsgMacroUtils.cmake 2010-03-13 11:40:02.000000000 +0100
77 -+++ ./CMakeModules/OsgMacroUtils.cmake 2010-06-25 09:03:22.295913047 +0200
78 ++++ ./CMakeModules/OsgMacroUtils.cmake 2010-06-30 02:37:36.523281953 +0200
79 @@ -305,9 +305,9 @@
80 SETUP_EXE(${IS_COMMANDLINE_APP})
81
82 @@ -272,7 +298,7 @@
83 ENDMACRO(SETUP_EXAMPLE)
84 diff -ruN ../OpenSceneGraph-2.8.3/examples/osgviewerFLTK/CMakeLists.txt ./examples/osgviewerFLTK/CMakeLists.txt
85 --- ../OpenSceneGraph-2.8.3/examples/osgviewerFLTK/CMakeLists.txt 2010-03-13 11:40:18.000000000 +0100
86 -+++ ./examples/osgviewerFLTK/CMakeLists.txt 2010-06-25 16:39:50.863920026 +0200
87 ++++ ./examples/osgviewerFLTK/CMakeLists.txt 2010-06-30 02:37:36.524321902 +0200
88 @@ -1,6 +1,6 @@
89 SET(TARGET_SRC osgviewerFLTK.cpp )