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.

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] Cleanup, export unofficial config #24720

Merged
merged 44 commits into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9bd9733
Revise portfile
dg0yt May 15, 2022
a7a4789
Plugins are a default feature; fix disabling
dg0yt May 15, 2022
6e119b5
Remove line continuations from pc file
dg0yt May 15, 2022
b8a1133
Control nvtt plugin via feature
dg0yt May 15, 2022
831248c
Control dae plugin, not find_package
dg0yt May 15, 2022
13e078d
Control fontconfig via feature
dg0yt May 15, 2022
3de62b2
Control freetype via feature
dg0yt Jun 4, 2022
c7970c1
Control RestHttpDevice via feature
dg0yt May 15, 2022
235a95c
Drop unused liblas dependency
dg0yt Jun 2, 2022
3da58a9
Drop unused coin dependency
dg0yt Jun 2, 2022
3834a6e
Control sdl1 via feature
dg0yt May 15, 2022
7b561aa
Enable apps on linux
dg0yt May 15, 2022
cb89997
Disable apps and docs for debug
dg0yt May 15, 2022
72df5e8
Drop example application patch
dg0yt Jun 2, 2022
e146826
Use option, not patch, to disable DLL versioning
dg0yt May 16, 2022
4ee2c6b
Fix osg plugin PDB installation
dg0yt May 16, 2022
4d2adba
Prefer <Pkg>_LIBRARIES for linking
dg0yt Jun 2, 2022
d4cd9c9
Curl patches are obsolete now.
dg0yt May 15, 2022
4e1fb8b
Add unofficial config export
dg0yt May 15, 2022
7d38e12
Use toolchain's windows version
dg0yt Jun 2, 2022
66f7b2a
Avoid extra dependency lookups
dg0yt Jun 2, 2022
60338fc
Silence warnings about plugin control variables
dg0yt Jun 2, 2022
7bd7cf1
Define OSG_LIBRARY_STATIC
dg0yt Jun 2, 2022
b98f9c9
Revise copying of plugins
dg0yt Jun 5, 2022
4d716e6
Control OpenEXR via feature
dg0yt Jun 5, 2022
9ea9398
Allow jasper without opengl
dg0yt Jun 5, 2022
bb8c917
[osgearth] Remove obsolete geos patching
dg0yt May 25, 2022
13aedac
[osgearth] Serialize linking to avoid OOM errors
dg0yt May 25, 2022
05eebd8
[osgearth] Fix minor portfile issues
dg0yt May 25, 2022
9e81114
[osgearth] Prefer <Pkg>_LIBRARIES for linking
dg0yt Jun 3, 2022
4db7027
[osgearth] Use unofficial osg config
dg0yt Jun 3, 2022
5f43786
[osgearth] Fix lib installation dir
dg0yt Jun 3, 2022
85bef56
[osgearth] Revise OSGEARTH_LIBRARY_STATIC
dg0yt Jun 4, 2022
2b5ba1b
[osgearth] Revise find_package patching
dg0yt Jun 4, 2022
ee245f2
[osgearth] Revise copying of plugins
dg0yt Jun 5, 2022
c83cbf5
[osgearth] Disable tools for debug variant
dg0yt Jun 5, 2022
d255816
[osgearth] Control Blend2D via feature
dg0yt Jun 5, 2022
66c2bc1
Update versions
dg0yt Jun 5, 2022
4fcc28b
Fix plugin lookup
dg0yt Jun 6, 2022
b87e797
Update versions
dg0yt Jun 6, 2022
5cd12a9
CR request
dg0yt Jun 12, 2022
93a9877
Update versions
dg0yt Jun 12, 2022
1e0c0d2
[osgearth] Remove tools from default features
dg0yt Jun 17, 2022
f581922
Update versions
dg0yt Jun 17, 2022
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
36 changes: 0 additions & 36 deletions ports/osg/disable-present3d-staticview-in-linux.patch

This file was deleted.

18 changes: 0 additions & 18 deletions ports/osg/fix-curl.patch

This file was deleted.

29 changes: 0 additions & 29 deletions ports/osg/fix-dependency-coin.patch

This file was deleted.

34 changes: 0 additions & 34 deletions ports/osg/fix-example-application.patch

This file was deleted.

16 changes: 0 additions & 16 deletions ports/osg/fix-liblas.patch

This file was deleted.

22 changes: 22 additions & 0 deletions ports/osg/fix-nvtt-squish.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/CMakeModules/FindNVTT.cmake b/CMakeModules/FindNVTT.cmake
index d0e7414..f6fb761 100644
--- a/CMakeModules/FindNVTT.cmake
+++ b/CMakeModules/FindNVTT.cmake
@@ -120,7 +120,7 @@ FIND_LIBRARY(NVTHREAD_LIBRARY_DEBUG

# SQUISH
FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE
- NAMES squish
+ NAMES nvsquish NAMES_PER_DIR
PATHS
/usr/local
/usr
@@ -129,7 +129,7 @@ FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE
PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
)
FIND_LIBRARY(NVSQUISH_LIBRARY_DEBUG
- NAMES squish_d
+ NAMES nvsquish_d NAMES_PER_DIR
PATHS
/usr/local
/usr
14 changes: 0 additions & 14 deletions ports/osg/fix-nvtt.patch

This file was deleted.

18 changes: 4 additions & 14 deletions ports/osg/fix-sdl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81328ea..c735419 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -755,8 +755,6 @@ ELSE()
@@ -755,7 +755,8 @@ ELSE()
FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
FIND_PACKAGE(GLIB COMPONENTS gobject)
FIND_PACKAGE(DirectShow)
- FIND_PACKAGE(SDL2)
- FIND_PACKAGE(SDL)
FIND_PACKAGE(Poppler-glib)
FIND_PACKAGE(RSVG)
FIND_PACKAGE(GtkGl)
@@ -775,6 +773,10 @@ ELSE()
FIND_PACKAGE(Lua51)
ENDIF()
ENDIF()
+
+ find_package(SDL)
+ find_package(SDL2 CONFIG)
+ set(SDL2_LIBRARY SDL2::SDL2 SDL2::SDL2main)

# V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this.
# FIND_PACKAGE(V8)
FIND_PACKAGE(SDL)
FIND_PACKAGE(Poppler-glib)
FIND_PACKAGE(RSVG)
diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp
index 9de15b1..ae96e11 100644
--- a/examples/osgmovie/osgmovie.cpp
Expand Down
16 changes: 16 additions & 0 deletions ports/osg/link-libraries.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index ce55be0..9b7107c 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -37,6 +37,11 @@ SET(VALID_BUILDER_VERSION OFF)

MACRO(LINK_WITH_VARIABLES TRGTNAME)
FOREACH(varname ${ARGN})
+ string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}")
+ if(DEFINED ${lwv_libraries})
+ TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}})
+ continue()
+ endif()
IF(${varname}_DEBUG)
IF(${varname}_RELEASE)
TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}")
13 changes: 13 additions & 0 deletions ports/osg/plugin-pdb-install.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index a12fcf1..ce55be0 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -351,7 +351,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS RelWithDebInfo)
- INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug)
+ INSTALL(FILES $<TARGET_PDB_FILE:${TARGET_TARGETNAME}> DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug)
ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
ELSE(WIN32)
INSTALL(TARGETS ${TARGET_TARGETNAME}
Loading