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

[assimp] update to 5.4.3 and fix build error #40894

Merged
merged 11 commits into from
Sep 24, 2024
Merged

[assimp] update to 5.4.3 and fix build error #40894

merged 11 commits into from
Sep 24, 2024

Conversation

JonLiu1993
Copy link
Member

Fixes #40891

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

Tested usage successfully by assimp:x64-windows:

assimp provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(assimp CONFIG REQUIRED)
  target_link_libraries(main PRIVATE assimp::assimp)

assimp provides pkg-config modules:

  # Import various well-known 3D model formats in an uniform manner.
  assimp

@JonLiu1993 JonLiu1993 added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Sep 10, 2024
JonLiu1993
JonLiu1993 commented Sep 10, 2024
View reviewed changes
ports/assimp/fix-incompatible.patch Outdated
endif()
# Source code is encoded in UTF-8
- ADD_COMPILE_OPTIONS(/source-charset:utf-8)
+ #ADD_COMPILE_OPTIONS(/source-charset:utf-8)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix error:

cl : Command line error D8016 : '/utf-8' and '/source-charset:utf-8' command-line options are incompatible

@JonLiu1993 JonLiu1993 marked this pull request as ready for review September 12, 2024 02:20
jimwang118
jimwang118 previously approved these changes Sep 13, 2024
View reviewed changes
Osyotr
Osyotr reviewed Sep 13, 2024
View reviewed changes
Copy link
Contributor

@Osyotr Osyotr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note:
This version adds vendored tinyusdz dependency (assimp/assimp@0cb1693)

ports/assimp/build_fixes.patch Outdated Show resolved Hide resolved
ports/assimp/build_fixes.patch Show resolved Hide resolved
ports/assimp/build_fixes.patch Outdated Show resolved Hide resolved
ports/assimp/build_fixes.patch Outdated Show resolved Hide resolved
Osyotr
Osyotr reviewed Sep 14, 2024
View reviewed changes
ports/assimp/fix-incompatible.patch Outdated Show resolved Hide resolved
ports/assimp/build_fixes.patch Outdated Show resolved Hide resolved
@JonLiu1993
Copy link
Member Author

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Sep 24, 2024
@JavierMatosD JavierMatosD merged commit 9612cfe into microsoft:master Sep 24, 2024
16 checks passed
Osyotr added a commit to Osyotr/vcpkg that referenced this pull request Sep 24, 2024
@Osyotr
Revert "[assimp] update to 5.4.3 and fix build error (microsoft#40894)"
488540f 
This reverts commit 9612cfe.
@JonLiu1993 JonLiu1993 deleted the dev/Jon/assimp branch September 25, 2024 02:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Osyotr Osyotr Osyotr approved these changes

@jimwang118 jimwang118 jimwang118 left review comments

Assignees

@jimwang118 jimwang118

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:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[assimp] update to 5.4.3
4 participants
@JonLiu1993 @Osyotr @jimwang118 @JavierMatosD