Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[osg] Update to 3.6.5 #12672

Merged
merged 2 commits into from
Aug 12, 2020
Merged

[osg] Update to 3.6.5 #12672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
325e9fe
Update osg to 3.6.5.
aluaces Jul 23, 2020
e4ab8be
Remove port-version
strega-nil Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/osg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: osg
Version: 3.6.4-3
Version: 3.6.5
Homepage: https://github.com/openscenegraph/OpenSceneGraph
Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit.
Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx)
Expand All @@ -24,4 +24,4 @@ Feature: packages
Description: Set to ON to generate CPack configuration files and packaging targets

Feature: docs
Description: Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads
Description: Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads
4 changes: 2 additions & 2 deletions ports/osg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
set(OSG_VER 3.6.4)
set(OSG_VER 3.6.5)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openscenegraph/OpenSceneGraph
REF OpenSceneGraph-${OSG_VER}
SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
HEAD_REF master
PATCHES
collada.patch
Expand Down
9 changes: 0 additions & 9 deletions ports/osg/remove-prefix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ index bb3be63..356edcd 100644
HANDLE_MSVC_DLL()
ENDIF()

@@ -33,7 +33,7 @@ INSTALL(
)

IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
- GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX)
+ set(PREFIX "")
INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS RelWithDebInfo)
INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Debug)
ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt
index 84550bd..0e816f7 100644
--- a/src/OpenThreads/win32/CMakeLists.txt
Expand Down