[jasper] update to 4.0.0 (#28244)

* [jasper] update to 4.0.0 * remove unused variable * v db * add JAS_STDC_VERSION * v db * fix devil port * v db * patch out the stdc check * v db * adjust patch * v db
microsoft · Dec 12, 2022 · 961d5a8 · 961d5a8
1 parent b12e712
commit 961d5a8
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 14 deletions.
diff --git a/ports/devil/jasper-4.patch b/ports/devil/jasper-4.patch
@@ -0,0 +1,28 @@
+diff --git a/DevIL/src-IL/src/il_jp2.cpp b/DevIL/src-IL/src/il_jp2.cpp
+index a419c1484..7b7e3cb12 100644
+--- a/DevIL/src-IL/src/il_jp2.cpp
++++ b/DevIL/src-IL/src/il_jp2.cpp
+@@ -314,9 +314,9 @@ ILboolean iLoadJp2Internal(jas_stream_t	*Stream, ILimage *Image)
+
+
+ #ifdef __APPLE__
+-static int iJp2_file_read(void *obj, char *buf, unsigned int cnt)
++static ssize_t iJp2_file_read(void *obj, char *buf, size_t cnt)
+ #else
+-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
++static ssize_t iJp2_file_read(jas_stream_obj_t *obj, char *buf, size_t cnt)
+ #endif
+ {
+ 	obj;
+@@ -324,9 +324,9 @@ static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
+ }
+
+ #ifdef __APPLE__
+-static int iJp2_file_write(void *obj, const char *buf, unsigned int cnt)
++static ssize_t iJp2_file_write(void *obj, const char *buf, size_t cnt)
+ #else
+-static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
++static ssize_t iJp2_file_write(jas_stream_obj_t *obj, const char *buf, size_t cnt)
+ #endif
+ {
+ 	obj;
diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
         0004_compatible-jasper-2-0-20.patch
         0005-fix-pkgconfig.patch
         0006-fix-ilut-header.patch
+        jasper-4.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake)

diff --git a/ports/devil/vcpkg.json b/ports/devil/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "devil",
   "version": "1.8.0",
-  "port-version": 8,
+  "port-version": 9,
   "description": "A full featured cross-platform image library",
   "homepage": "https://github.com/DentonW/DevIL",
   "default-features": [

diff --git a/ports/jasper/no_stdc_check.patch b/ports/jasper/no_stdc_check.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 840908739..c485b830c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -414,7 +414,7 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR
+ 	# will need to be set manually from the command line
+ 	# (e.g., using -DJAS_STDC_VERSION=YYYYMML) or by changing the line below.
+ 	set(JAS_STDC_VERSION "0L" CACHE INTERNAL "The value of __STDC_VERSION__.")
+-	if (JAS_STDC_VERSION STREQUAL "0L")
++	if (0)
+ 		message(FATAL_ERROR
+ 		  "The value of __STDC_VERSION__ cannot be automatically determined "
+ 		  "when cross-compiling.  Please set JAS_STDC_VERSION to the value "
+@@ -423,8 +423,9 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR
+ 		  "appropriately.")
+ 	endif()
+ else()
+-	jas_get_stdc_version(status JAS_STDC_VERSION)
+-	if(NOT status)
++	#jas_get_stdc_version(status JAS_STDC_VERSION)
++    set(JAS_STDC_VERSION 0L)
++	if(0)
+ 		message(FATAL_ERROR "Cannot determine the value of __STDC_VERSION__.")
+ 	endif()
+ endif()
diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO mdadams/jasper
-    REF fe00207dc10db1d7cc6f2757961c5c6bdfd10973 # version-2.0.33
-    SHA512 887bb8e6096b41d5b61970d70b0e7b9cc1c31dd63467386aa35003c146d200bbae9ad46825a3313aeed403ac6fb26d504f489386cbc7ca364d95deeb5a94af46
+    REPO jasper-software/jasper
+    REF 402d096b39f4f618ad9e6ff2b4fc1b5eb260a2e4 # version-4.0.0
+    SHA512 b2c2a2514479ec4a3d634d42d0a614951c06f6177e43a80b9a31797b7d4ad248fcdff632596806fcf811c87779990ba7c19aa2f9b91afafbc172dd85f96bb239
     HEAD_REF master
+    PATCHES
+        no_stdc_check.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@@ -15,20 +17,20 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JAS_ENABLE_SHARED)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        opengl    JAS_ENABLE_OPENGL        
+        opengl    JAS_ENABLE_OPENGL
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF
         -DJAS_ENABLE_LIBJPEG=ON
         -DJAS_ENABLE_OPENGL=${JAS_ENABLE_OPENGL}
         -DJAS_ENABLE_DOC=OFF
+        -DJAS_ENABLE_LATEX=OFF
         -DJAS_ENABLE_PROGRAMS=OFF
         -DJAS_ENABLE_SHARED=${JAS_ENABLE_SHARED}
     OPTIONS_DEBUG
-        -DCMAKE_DEBUG_POSTFIX=d # Due to CMakes FindJasper
+        -DCMAKE_DEBUG_POSTFIX=d # Due to CMakes FindJasper; Default for multi config generators.
 )
 
 vcpkg_cmake_install()
@@ -39,4 +41,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "jasper",
-  "version": "2.0.33",
-  "port-version": 6,
+  "version": "4.0.0",
   "description": "Open source implementation of the JPEG-2000 Part-1 standard",
-  "homepage": "https://github.com/mdadams/jasper",
+  "homepage": "https://github.com/jasper-software/jasper",
   "license": null,
   "dependencies": [
     "libjpeg-turbo",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1914,7 +1914,7 @@
     },
     "devil": {
       "baseline": "1.8.0",
-      "port-version": 8
+      "port-version": 9
     },
     "dimcli": {
       "baseline": "5.0.2",
@@ -3177,8 +3177,8 @@
       "port-version": 1
     },
     "jasper": {
-      "baseline": "2.0.33",
-      "port-version": 6
+      "baseline": "4.0.0",
+      "port-version": 0
     },
     "jbig2dec": {
       "baseline": "0.19",

diff --git a/versions/d-/devil.json b/versions/d-/devil.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d964e038164d45273418c1a197e7bd7d08f2f860",
+      "version": "1.8.0",
+      "port-version": 9
+    },
     {
       "git-tree": "28588e0e08e57404b35e35ce1d2a69322a2ee6b8",
       "version": "1.8.0",

diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "93774ef7923c7c1c73c30011afe0105530e71545",
+      "version": "4.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "fb8dca022aa130726431991cc9c70cc3162ea657",
       "version": "2.0.33",