-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[openjpeg] 16645 Fix compile w/features jp3d,jpip,jpwl,mj2 triplet x64-windows VS 2019 ver 16.9.1 #16661
Conversation
- Modified portfile.cmake to apply patch fix-lrintf-to-opj_lrintf.patch - Added patch to change /src/lib/openmj2/opj_includes.h From: static INLINE long lrintf(float f) To: static INLINE long opj_lrintf(float f) - Converted CONTROL file to vcpkg.json file - Fix was tested locally on triplet x64-windows with Microsoft Windows x64 Professional 20H2 [Version 10.0.19042.867] Windows Feature Experience Pack 120.2212.551.0 Windows SDK [Version 10.0.19041.0] VS 2017: Visual Studio 2017 Community Edition [Version 15.9.34] Visual Studio Toolset [Version 14.16.27023] Microsoft (R) C/C++ Optimizing Compiler [Version 19.16.27045 for x64] VS 2019: Visual Studio 2019 Community Edition [Version 16.9.1] Visual Studio Toolset [Version 14.28.29910] Microsoft (R) C/C++ Optimizing Compiler [Version 19.28.29912 for x64]
Thanks for fixing this issue. Since upstream suggests vcpkg to only support So for other features in vcpkg, I'm not sure if it's necessary to add them now. We have known the way to fix the problem, I think upstream also have known this. But why do they not support other features? What's your opinion? |
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Hi @NancyLi1013
Thank you for your assistance/help.
Have a super wonderful weekend!!! 😊✨👏👍 |
For the failure on x86-windows:
You can run |
Thanks for your instant response @StarGate-One. You have done great work now. 😊 Also you can update the format in portfile.cmake if you have enough time to do this work. Since I cannot review them directly via suggested change. Of course, this is not related with your changes, just for looking more clear or tidy. |
LGTM, thanks for the fix! I agree that given upstream's position we should probably not offer the extra features. |
Describe the pull request
fix-lrintf-to-opj_lrintf.patch
to change/src/lib/openmj2/opj_includes.h
line96
:static INLINE long lrintf(float f)
static INLINE long opj_lrintf(float f)
portfile.cmake
to apply patchCONTROL
file tovcpkg.json
file3
vcpkg x-add-version openjpeg
toUpdate json file
4
What does your PR fix? Fixes [openjpeg] build failure x64-windows with features (jp3d,jpip,jpwl,mj2) on VS 2019 latest update 16.9.1 #16645
Which triplets are supported/not supported? No changes should effect supported/not supported triplets.
Have you updated the CI baseline? No changes should effect CI baseline.
Does your PR follow the maintainer guide? Yes I believe so.