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

Jump to bottom

[osgearth] Fix undefined references due to openjp2 and xml2 #17993

Merged
merged 3 commits into from
Jun 9, 2021
Merged

[osgearth] Fix undefined references due to openjp2 and xml2 #17993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76d36db
Fix osgearth
ankurvdev Apr 16, 2021
1482755
Fix linking
May 16, 2021
7e49efe
Update version files
May 19, 2021
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
2 changes: 1 addition & 1 deletion ports/osgearth/fix-dependency-osg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ index b7dff11..d1ec2ff 100644
+ if (UNIX)
+ list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread)
+ # Due to Linux Linker dependency issues these need to included again
+ set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio)
+ set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio openjp2 xml2)
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
+ else(UNIX)
+ set(DEPEND_LIB_LIST cfitsio)
+ endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/osgearth/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "osgearth",
"version": "3.1",
"port-version": 3,
"port-version": 4,
"description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.",
"homepage": "https://github.com/gwaldron/osgearth",
"supports": "!(x86 | wasm32)",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4622,7 +4622,7 @@
},
"osgearth": {
"baseline": "3.1",
"port-version": 3
"port-version": 4
},
"osi": {
"baseline": "0.108.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/osgearth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d12ff3ef1419ab8813b430101fb6dbcc96861671",
"version": "3.1",
"port-version": 4
},
{
"git-tree": "d2483eb1bb083bdcf0b4de24f0f8c0d77825dc56",
"version": "3.1",
Expand Down