[opencv4] OpenJPEG feature (#34961)

* add [BUILD_|WITH_]OPENJPEG * Add openjpeg feature * format-manifest * bump port version * x-add-version
microsoft · Nov 8, 2023 · 4e5e6b3 · 4e5e6b3
1 parent f03eb46
commit 4e5e6b3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
@@ -68,6 +68,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "gtk"       WITH_GTK
  "halide"    WITH_HALIDE
  "jasper"    WITH_JASPER
+ "openjpeg"  WITH_OPENJPEG
  "jpeg"      WITH_JPEG
  "lapack"    WITH_LAPACK
  "nonfree"   OPENCV_ENABLE_NONFREE
@@ -398,6 +399,7 @@ vcpkg_cmake_configure(
         -Dade_DIR=${ADE_DIR}
         ###### Disable build 3rd party libs
         -DBUILD_JASPER=OFF
+        -DBUILD_OPENJPEG=OFF
         -DBUILD_JPEG=OFF
         -DBUILD_OPENEXR=OFF
         -DBUILD_PNG=OFF
@@ -450,7 +452,6 @@ vcpkg_cmake_configure(
         -DWITH_OPENCLAMDBLAS=OFF
         -DWITH_OPENVINO=${WITH_OPENVINO}
         -DWITH_TBB=${WITH_TBB}
-        -DWITH_OPENJPEG=OFF
         -DWITH_CPUFEATURES=OFF
         ###### BUILD_options (mainly modules which require additional libraries)
         -DBUILD_opencv_ovis=${BUILD_opencv_ovis}

diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.8.0",
-  "port-version": 9,
+  "port-version": 10,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
@@ -207,7 +207,7 @@
       "description": "Enable Intel Integrated Performance Primitives"
     },
     "jasper": {
-      "description": "JPEG 2000 support for opencv",
+      "description": "JPEG 2000 support for opencv (deprecated)",
       "dependencies": [
         "jasper"
       ]
@@ -240,6 +240,12 @@
         "opengl"
       ]
     },
+    "openjpeg": {
+      "description": "JPEG 2000 support for opencv",
+      "dependencies": [
+        "openjpeg"
+      ]
+    },
     "openmp": {
       "description": "Enable openmp support for opencv"
     },

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6198,7 +6198,7 @@
     },
     "opencv4": {
       "baseline": "4.8.0",
-      "port-version": 9
+      "port-version": 10
     },
     "opendnp3": {
       "baseline": "3.1.1",

diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "83f4fcf20bc429d1a01edb9fdf423ef78d18c9b6",
+      "version": "4.8.0",
+      "port-version": 10
+    },
     {
       "git-tree": "7ed8c48a9b2be5df262ccbcfa876f5314f429c10",
       "version": "4.8.0",