diff options
| author | General Jack O'Neill <68293825+StarGate-One@users.noreply.github.com> | 2021-03-15 18:21:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 15:21:09 -0700 |
| commit | 5f3249e50ef94ad8b281053fd71453b58b7f4c3b (patch) | |
| tree | 84bb957a766c6185f2c0f0839033eca1461237b6 /ports/openjpeg/CONTROL | |
| parent | b6b16270d2d446becbea99f45cc1d5f59e63ec5d (diff) | |
| download | vcpkg-5f3249e50ef94ad8b281053fd71453b58b7f4c3b.tar.gz vcpkg-5f3249e50ef94ad8b281053fd71453b58b7f4c3b.zip | |
[openjpeg] 16645 Fix compile w/features jp3d,jpip,jpwl,mj2 triplet x64-windows VS 2019 ver 16.9.1 (#16661)
* Fix for openjpeg issue 16645 compile with VS2019 16.9.1
- 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]
* Update json file
* Reformat vcpkg.json file
* Update port version
* Update json file
* Update ports/openjpeg/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update ports/openjpeg/vcpkg.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/baseline.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/o-/openjpeg.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update json file
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/openjpeg/CONTROL')
| -rw-r--r-- | ports/openjpeg/CONTROL | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/ports/openjpeg/CONTROL b/ports/openjpeg/CONTROL deleted file mode 100644 index 07afd75f1..000000000 --- a/ports/openjpeg/CONTROL +++ /dev/null @@ -1,17 +0,0 @@ -Source: openjpeg -Version: 2.3.1 -Port-Version: 2 -Homepage: https://github.com/uclouvain/openjpeg -Description: JPEG 2000 image library - -Feature: jpwl -Description: Build optional component jpwl - -Feature: mj2 -Description: Build optional component mj2 - -Feature: jpip -Description: Build optional component jpip - -Feature: jp3d -Description: Build optional component jp3d |