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

[otl] Update to version 4.0.451 #9552

Merged

Conversation

c72578
Copy link
Contributor

@c72578 c72578 commented Jan 4, 2020

The current version of otl is now also available with a filename including the version, e.g. otlv4_40451.zip [1, 2]

  • Use variable OTL_VERSION in portfile
  • Rename header file to otlv4.h
    This is the current default name of the header file and typically included using:
    #include "otlv4.h" or #include <otlv4.h>

[1] https://sourceforge.net/p/otl/discussion/208859/thread/fdb9d3bacc/#45bf
[2] https://otl.sourceforge.net/otl3_down.htm

Describe the pull request

  • What does your PR fix? Fixes issue #
    Update otl to the current version 4.0.451
    Simplify portfile by using a variable for the version
  • Which triplets are supported/not supported? Have you updated the CI baseline?
    All triplets are supported. CI-baseline: NA
  • Does your PR follow the maintainer guide?
    Yes

@JackBoosY JackBoosY self-requested a review January 6, 2020 02:35
@JackBoosY JackBoosY self-assigned this Jan 6, 2020
@JackBoosY
Copy link
Contributor

JackBoosY commented Jan 6, 2020

2020-01-04T12:18:04.9047756Z The following files are already installed in C:/vsts/_work/3/s/installed/x86-windows and are in conflict with stb:x86-windows
2020-01-04T12:18:04.9049652Z 
2020-01-04T12:18:04.9051732Z Installed by nanovg:x86-windows
2020-01-04T12:18:04.9053626Z     include/stb_image.h

Could you add stb:x86-windows=skip to VCPKG_PATH/scripts/ci.baseline.txt ?
Nope, I will open a PR to fix this issue.

Thanks.

ports/otl/portfile.cmake Outdated Show resolved Hide resolved
ports/otl/portfile.cmake Outdated Show resolved Hide resolved
@c72578 c72578 force-pushed the 2020-01-04_otl_Update_to_version_4.0.451 branch from 2ad6f0c to a2d53a3 Compare January 6, 2020 12:34
@c72578 c72578 requested a review from JackBoosY January 6, 2020 12:45
@JackBoosY
Copy link
Contributor

Could you please resolve theses conflicts?

Thanks,

@c72578 c72578 force-pushed the 2020-01-04_otl_Update_to_version_4.0.451 branch 3 times, most recently from 542d604 to 4a34d15 Compare January 7, 2020 07:42
@c72578
Copy link
Contributor Author

c72578 commented Jan 7, 2020

OK, I have resolved the conflicts now.
Background info:
In the meantime, otl has been partly updated in master.
See: 9c86098 and PR: #9107
The following changes of this PR are already in master now and have been removed from the commit message here:

  • Use variable OTL_VERSION in portfile
  • Rename header file to otlv4.h

@c72578 c72578 force-pushed the 2020-01-04_otl_Update_to_version_4.0.451 branch from 4a34d15 to 0104bea Compare January 7, 2020 07:49
@c72578 c72578 force-pushed the 2020-01-04_otl_Update_to_version_4.0.451 branch from 0104bea to de55cf5 Compare January 7, 2020 08:04
@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Jan 10, 2020
@dan-shaw dan-shaw merged commit 05069fe into microsoft:master Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants