diff options
| author |   Christian Schmitt <chris@ilovelinux.de> | 2013-02-22 10:37:54 +0100 |
|---|---|---|
| committer | Christian Schmitt <chris@ilovelinux.de> | 2013-02-22 10:38:39 +0100 |
| commit | 1e5e909c1ffb3c339f1960797061760875fe915b (patch) | |
| tree | aace60e17e5ee7433d0b52055a38cb2091628669 /dev-games | |
| parent | [games-util/steam*] new steam-base versions (diff) | |
| download | gamerlay-1e5e909c1ffb3c339f1960797061760875fe915b.tar.gz gamerlay-1e5e909c1ffb3c339f1960797061760875fe915b.tar.bz2 gamerlay-1e5e909c1ffb3c339f1960797061760875fe915b.zip | |
[dev-games/openscenegraph-3.1.4] bump version
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/openscenegraph/Manifest | 2 | ||||
| -rw-r--r-- | dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch (renamed from dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch) | 31 | ||||
| -rw-r--r-- | dev-games/openscenegraph/openscenegraph-3.1.4.ebuild (renamed from dev-games/openscenegraph/openscenegraph-3.1.3.ebuild) | 2 |
3 files changed, 20 insertions, 15 deletions
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index 5628fd6..b010a0a 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -1 +1 @@ -DIST OpenSceneGraph-3.1.3.zip 7218005 SHA256 59a5fecd19aa3c642309363a6c355bc6984615f3b1eb1a1545bfb14cc22f9de9 SHA512 aadd0ac0c0eec89704e148c8e663de89eccfe2f74431361eb06bd3a5ba895e31d7cabbb360a86280c1d3501aab65f2d7db5a559ba1d63a261cbe1d52af5947e9 WHIRLPOOL cdbe1bb773d15e590a47f0d0e2c9a9b5b60ef148c33a950cbd03f6e8a663f561d60c384ef2e7cf42ed2400604598ebfa20af941b6330a3b12cb0cec7c8045654 +DIST OpenSceneGraph-3.1.4.zip 7468665 SHA256 f662b5164afc3a07d2f17259ad971e733f31fb53f256c69175afde8b99f9a394 SHA512 550b4ccffcc84650efbeb5f557ddf2bfa2f45192e573ed929a340eb6e81ea4acbbcb2a202e6350169fa29d5ed6d4de01a1dfe8d85e0620823c946106a29661a4 WHIRLPOOL 88e290b8a90a762e7716e4d87b2f1e70c18c138c96b3393511bad8449633abe146ee4ada1d19325c69bbfb124e78b57c7a040a3f900367d61acc0cd28d5e69d7 diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch index 17e95ce..307a8e3 100644 --- a/dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch +++ b/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b436726..7e57f0d 100644 +index b6007f9..6d32675 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -432,6 +432,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in" +@@ -463,6 +463,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in" # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") @@ -10,7 +10,7 @@ index b436726..7e57f0d 100644 ################################################################################ # Set Version Info resource file -@@ -461,34 +462,31 @@ IF(ANDROID) +@@ -492,36 +493,36 @@ IF(ANDROID) ANDROID_3RD_PARTY() ELSE() # Common to all platforms except android: @@ -59,16 +59,20 @@ index b436726..7e57f0d 100644 +MACRO_OPTIONAL_FIND_PACKAGE(GtkGl) FIND_PACKAGE(DirectInput) - FIND_PACKAGE(NVTT) --ENDIF() -- --IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) -- FIND_PACKAGE(ITK) +- FIND_PACKAGE(Asio) +- FIND_PACKAGE(ZeroConf) +MACRO_OPTIONAL_FIND_PACKAGE(NVTT) ++MACRO_OPTIONAL_FIND_PACKAGE(Asio) ++MACRO_OPTIONAL_FIND_PACKAGE(ZeroConf) + ENDIF() + + IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) +- FIND_PACKAGE(ITK) +MACRO_OPTIONAL_FIND_PACKAGE(ITK) ENDIF() # Include macro utilities here -@@ -502,17 +500,17 @@ IF(OSG_USE_QT AND NOT ANDROID) +@@ -535,17 +536,17 @@ IF(OSG_USE_QT AND NOT ANDROID) IF (DESIRED_QT_VERSION) IF (DESIRED_QT_VERSION MATCHES 4) @@ -90,7 +94,7 @@ index b436726..7e57f0d 100644 ENDIF() ENDIF() -@@ -522,12 +520,12 @@ ENDIF() +@@ -555,12 +556,12 @@ ENDIF() IF (BUILD_OSG_EXAMPLES AND NOT ANDROID) @@ -107,7 +111,7 @@ index b436726..7e57f0d 100644 ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) -@@ -548,10 +546,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) +@@ -581,10 +582,11 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) # can use Quicktime. IF(NOT ANDROID) IF(NOT APPLE) @@ -119,10 +123,11 @@ index b436726..7e57f0d 100644 + MACRO_OPTIONAL_FIND_PACKAGE(JPEG) + MACRO_OPTIONAL_FIND_PACKAGE(PNG) + MACRO_OPTIONAL_FIND_PACKAGE(TIFF) - ++ # QuickTime is required for OS X, but optional for Windows. IF(WIN32) -@@ -903,7 +901,7 @@ IF(BUILD_DOCUMENTATION) + FIND_PACKAGE(QuickTime) +@@ -943,7 +945,7 @@ IF(BUILD_DOCUMENTATION) ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY ) #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) @@ -131,7 +136,7 @@ index b436726..7e57f0d 100644 # now set up openthreads documentation generation IF(BUILD_REF_DOCS_TAGFILE) -@@ -919,7 +917,7 @@ IF(BUILD_DOCUMENTATION) +@@ -959,7 +961,7 @@ IF(BUILD_DOCUMENTATION) ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY ) #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) diff --git a/dev-games/openscenegraph/openscenegraph-3.1.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild index 8135da7..2ca2d5c 100644 --- a/dev-games/openscenegraph/openscenegraph-3.1.3.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild @@ -83,7 +83,7 @@ S=${WORKDIR}/${MY_P} DOCS=(AUTHORS.txt ChangeLog NEWS.txt) PATCHES=( - "${FILESDIR}"/${PN}-3.1.3-cmake.patch + "${FILESDIR}"/${PN}-3.1.4-cmake.patch "${FILESDIR}"/${PN}-3.1.3-libav-0.7.patch ) |