[jasper]: Move opengl & freeglut dependencies under default-features …

…in order to enable flexibility to not require any of those when importing jasper package (via default-features=false). (#22895) * [jasper]: Move opengl & freeglut dependencies under default-features in order to enable flexibility to not require any of those when importing jasper package (via default-features=false). * [jasper]: Move opengl & freeglut dependencies under default-features in order to enable flexibility to not require any of those when importing jasper package (via default-features=false). * [x264]: enable cross-compilation for linux arm64 target. * [x264]: enable cross-compilation for linux arm64 target. * Revert "[x264]: enable cross-compilation for linux arm64 target." This reverts commit 8d60d79. Revert "[x264]: enable cross-compilation for linux arm64 target." This reverts commit f828a42. * Update ports/jasper/vcpkg.json Co-authored-by: nicole mazzuca <[email protected]> * Remove moot freeglut platform constraint. * Update jasper port hash. Co-authored-by: nicole mazzuca <[email protected]>
microsoft · Feb 9, 2022 · 5434c95 · 5434c95
1 parent dd4c769
commit 5434c95
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake
@@ -13,11 +13,17 @@ endif()
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JAS_ENABLE_SHARED)
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        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_PROGRAMS=OFF
         -DJAS_ENABLE_SHARED=${JAS_ENABLE_SHARED}

diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json
@@ -1,16 +1,11 @@
 {
   "name": "jasper",
   "version": "2.0.33",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Open source implementation of the JPEG-2000 Part-1 standard",
   "homepage": "https://github.com/mdadams/jasper",
   "dependencies": [
-    {
-      "name": "freeglut",
-      "platform": "!osx"
-    },
     "libjpeg-turbo",
-    "opengl",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -19,5 +14,17 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    "opengl"
+  ],
+  "features": {
+    "opengl": {
+      "description": "Enable the use of the OpenGL/GLUT Library",
+      "dependencies": [
+        "freeglut",
+        "opengl"
+      ]
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2962,7 +2962,7 @@
     },
     "jasper": {
       "baseline": "2.0.33",
-      "port-version": 1
+      "port-version": 2
     },
     "jbig2dec": {
       "baseline": "0.19",

diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "59d44227795e2e5e31a0f3e327832e4013b1e255",
+      "version": "2.0.33",
+      "port-version": 2
+    },
     {
       "git-tree": "6fc7475e9c22dafb473c98e00136e89c03ad8f5b",
       "version": "2.0.33",