diff options
| -rw-r--r-- | ports/openjpeg/CONTROL | 17 | ||||
| -rw-r--r-- | ports/openjpeg/fix-lrintf-to-opj_lrintf.patch | 13 | ||||
| -rw-r--r-- | ports/openjpeg/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/openjpeg/vcpkg.json | 21 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/openjpeg.json | 5 |
6 files changed, 43 insertions, 19 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 diff --git a/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch b/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch new file mode 100644 index 000000000..1d79d6332 --- /dev/null +++ b/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/openmj2/opj_includes.h b/src/lib/openmj2/opj_includes.h +index 340e8a9..11bb0e4 100644 +--- a/src/lib/openmj2/opj_includes.h ++++ b/src/lib/openmj2/opj_includes.h +@@ -93,7 +93,7 @@ Most compilers implement their own version of this keyword ... + + /* MSVC and Borland C do not have lrintf */ + #if defined(_MSC_VER) || defined(__BORLANDC__) +-static INLINE long lrintf(float f) ++static INLINE long opj_lrintf(float f) + { + #ifdef _M_X64 + return (long)((f > 0.0f) ? (f + 0.5f) : (f - 0.5f)); diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index c6d854490..6885513ba 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF v2.3.1 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 HEAD_REF master - PATCHES dll.location.patch + PATCHES + dll.location.patch + fix-lrintf-to-opj_lrintf.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/openjpeg/vcpkg.json b/ports/openjpeg/vcpkg.json new file mode 100644 index 000000000..d54e271dc --- /dev/null +++ b/ports/openjpeg/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "openjpeg", + "version-semver": "2.3.1", + "port-version": 3, + "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.", + "homepage": "https://github.com/uclouvain/openjpeg", + "features": { + "jp3d": { + "description": "Build optional component jp3d" + }, + "jpip": { + "description": "Build optional component jpip" + }, + "jpwl": { + "description": "Build optional component jpwl" + }, + "mj2": { + "description": "Build optional component mj2" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 77d4dda6c..974ad9f06 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4358,7 +4358,7 @@ }, "openjpeg": { "baseline": "2.3.1", - "port-version": 2 + "port-version": 3 }, "openmama": { "baseline": "6.3.1", diff --git a/versions/o-/openjpeg.json b/versions/o-/openjpeg.json index 85dc24698..a556f81fc 100644 --- a/versions/o-/openjpeg.json +++ b/versions/o-/openjpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "55220d839365c2134574acc4e9b43b8adc2e20ab", + "version-semver": "2.3.1", + "port-version": 3 + }, + { "git-tree": "06e54db04d7adacfd612bbaf233f6f790599b9c1", "version-string": "2.3.1", "port-version": 2 |