diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-06-28 18:00:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-28 18:00:37 -0700 |
| commit | 05e5a491826732dafb65e0e0426e43d2fc884ecc (patch) | |
| tree | cf76720d55d7fc374edae083ec6f40f3c0c5654c | |
| parent | f9a2e13bf8ccfd2a52004fba1cd3bf06bd104f17 (diff) | |
| parent | ff86849a22e852d77781cd50a483ad0e1d3289d3 (diff) | |
| download | vcpkg-05e5a491826732dafb65e0e0426e43d2fc884ecc.tar.gz vcpkg-05e5a491826732dafb65e0e0426e43d2fc884ecc.zip | |
Merge pull request #3814 from LarryIII/RemoveC2039-patch
Update osg version to 3.6.2-rc3 to fix error C2039
| -rw-r--r-- | ports/osg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/osg/fix-C2039.patch | 13 | ||||
| -rw-r--r-- | ports/osg/portfile.cmake | 18 |
3 files changed, 9 insertions, 24 deletions
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 2a2755002..f58156fd0 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,4 +1,4 @@ Source: osg -Version: 3.5.6-3 +Version: 3.6.2-rc3 Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: freetype, jasper, openexr, zlib, gdal, giflib, libjpeg-turbo, libpng, tiff diff --git a/ports/osg/fix-C2039.patch b/ports/osg/fix-C2039.patch deleted file mode 100644 index d5a32f544..000000000 --- a/ports/osg/fix-C2039.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/osgPlugins/osga/OSGA_Archive.cpp b/src/osgPlugins/osga/OSGA_Archive.cpp
-index f96cca3..a80969f 100644
---- a/src/osgPlugins/osga/OSGA_Archive.cpp
-+++ b/src/osgPlugins/osga/OSGA_Archive.cpp
-@@ -71,7 +71,7 @@ inline std::streampos STREAM_POS( const OSGA_Archive::pos_type pos )
- inline OSGA_Archive::pos_type ARCHIVE_POS( const std::streampos & pos )
- {
- #if defined(_CPPLIB_VER)//newer Dinkumware(eg: one included with VC++ 2003,2005)
-- fpos_t position = pos.seekpos();
-+ fpos_t position = pos;
- #else // older Dinkumware (eg: one included in Win Server 2003 Platform SDK )
- fpos_t position = pos.get_fpos_t();
- #endif
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 666883c38..c6eddae40 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -19,11 +19,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openscenegraph/OpenSceneGraph - REF OpenSceneGraph-3.5.6 - SHA512 bfd52115bc1f48dfb6eaeae1d8c62741c6487e6a8933b5ef97c979800b285e3a5300c9d55eb961e1973314c06b2525b547db683b0395c1f44b46d17cded38dba + REF OpenSceneGraph-3.6.2-rc3 + SHA512 369c0790ad990cc0f5403209b6e8afe73069f4a467883f9031ac0539bdd090f2cd71487285e515da39bb5a5f67a15548edd479d489dc57374b481ed32ebed0eb HEAD_REF master - PATCHES - "${CURRENT_PORT_DIR}/fix-C2039.patch" ) vcpkg_configure_cmake( @@ -49,12 +47,12 @@ file(REMOVE_RECURSE ${OSG_TOOLS}) file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(REMOVE_RECURSE ${OSG_TOOLS_DBG}) -file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.5.6/*.dll) -file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.5.6) -file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.5.6/*.dll) -file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.5.6) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.5.6/) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.5.6/) +file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.2/*.dll) +file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.6.2) +file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.2/*.dll) +file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.6.2) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.2/) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.2/) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/osg) |