Skip to content

[osgearth/rocksdb] Update to latest release#14976

Merged
BillyONeal merged 7 commits intomicrosoft:masterfrom
NancyLi1013:dev/NancyLi/update-osgearth
Dec 17, 2020
Merged

[osgearth/rocksdb] Update to latest release#14976
BillyONeal merged 7 commits intomicrosoft:masterfrom
NancyLi1013:dev/NancyLi/update-osgearth

Conversation

@NancyLi1013
Copy link
Copy Markdown
Contributor

@NancyLi1013 NancyLi1013 commented Dec 7, 2020 •
edited
Loading

Describe the pull request

  1. Update osgearth to the latest version 3.1

    Add new options

    Remove rocksdb patch (Fix on rocksdb sides)

  2. Update rocksdb to the latest version 6.14.6

    Update patches

    Remove 0001-disable-gtest.patch (Both WITH_TESTS and WITH_BENCHMARK_TOOLS have been set as OFF)

    Remove vpkg-cmake-wrapper.cmake (Currently, rocksdb only supports static library, it's unnecessary to use this file)

Note: All features have passed with the following triplets:

  • x86-windows
  • x64-windows
  • x64-windows-static

@NancyLi1013 NancyLi1013 added category:port-bug The issue is with a library, which is something the port should already support info:internal category:port-update The issue is with a library, which is requesting update new revision labels Dec 7, 2020
NancyLi1013 added 2 commits December 8, 2020 22:28
Update rocksdb to 6.14.6
a949a0d 
Change the dependency of osgearth to test
Add patch for rocksdb
013304a
@NancyLi1013 NancyLi1013 changed the title [osgearth] Update to 3.1 [osgearth/rocksdb] Update to latest release Dec 9, 2020
@NancyLi1013 NancyLi1013 marked this pull request as ready for review December 10, 2020 08:15
@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Dec 10, 2020
@NancyLi1013 NancyLi1013 mentioned this pull request Dec 10, 2020
Closed
BillyONeal
BillyONeal reviewed Dec 10, 2020
View reviewed changes
@BillyONeal BillyONeal added requires:discussion and removed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. labels Dec 11, 2020
@NancyLi1013
Copy link
Copy Markdown
Contributor Author

NancyLi1013 commented Dec 16, 2020

@BillyONeal

It should be ok now. I have updated to use the variable ${OSG_PLUGINS_SUBDIR} instead of the specific version.

@BillyONeal BillyONeal added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:discussion labels Dec 17, 2020
@BillyONeal BillyONeal merged commit ce5d30c into microsoft:master Dec 17, 2020
@BillyONeal
Copy link
Copy Markdown
Member

BillyONeal commented Dec 17, 2020

Thanks!

ryukw7 pushed a commit to ryukw7/vcpkg that referenced this pull request Dec 24, 2020
@NancyLi1013
[osgearth/rocksdb] Update to latest release (microsoft#14976)
5cef14e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BillyONeal BillyONeal BillyONeal approved these changes

+2 more reviewers

@gwaldron gwaldron gwaldron left review comments

@JackBoosY JackBoosY JackBoosY approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@JackBoosY JackBoosY

Labels

category:port-bug The issue is with a library, which is something the port should already support category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

osgearth:x64-windows build failure

4 participants

@NancyLi1013 @BillyONeal @gwaldron @JackBoosY