Skip to content

Commit b7461b2

Browse files
authored
[jasper] Remove unused opengl deps (microsoft#44375)
1 parent da6fc34 commit b7461b2

File tree

4 files changed

+9
-29
lines changed

4 files changed

+9
-29
lines changed

ports/jasper/portfile.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ endif()
1616

1717
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JAS_ENABLE_SHARED)
1818

19-
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
20-
FEATURES
21-
opengl JAS_ENABLE_OPENGL
22-
)
23-
2419
vcpkg_cmake_configure(
2520
SOURCE_PATH "${SOURCE_PATH}"
2621
OPTIONS
@@ -29,6 +24,7 @@ vcpkg_cmake_configure(
2924
-DJAS_ENABLE_LIBJPEG=ON
3025
-DJAS_ENABLE_DOC=OFF
3126
-DJAS_ENABLE_LATEX=OFF
27+
-DJAS_ENABLE_OPENGL=OFF # only used by programs, which are turned off
3228
-DJAS_ENABLE_PROGRAMS=OFF
3329
-DJAS_ENABLE_SHARED=${JAS_ENABLE_SHARED}
3430
OPTIONS_DEBUG

ports/jasper/vcpkg.json

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jasper",
33
"version": "4.2.4",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "Open source implementation of the JPEG-2000 Part-1 standard",
66
"homepage": "https://github.com/jasper-software/jasper",
77
"license": null,
@@ -15,26 +15,5 @@
1515
"name": "vcpkg-cmake-config",
1616
"host": true
1717
}
18-
],
19-
"default-features": [
20-
{
21-
"name": "opengl",
22-
"platform": "!(windows & arm) & !uwp & !ios"
23-
}
24-
],
25-
"features": {
26-
"opengl": {
27-
"description": "Enable the use of the OpenGL/GLUT Library",
28-
"dependencies": [
29-
{
30-
"name": "freeglut",
31-
"platform": "!osx & !(windows & arm) & !uwp"
32-
},
33-
{
34-
"name": "opengl",
35-
"platform": "!(windows & arm) & !uwp"
36-
}
37-
]
38-
}
39-
}
18+
]
4019
}

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3850,7 +3850,7 @@
38503850
},
38513851
"jasper": {
38523852
"baseline": "4.2.4",
3853-
"port-version": 1
3853+
"port-version": 2
38543854
},
38553855
"jbig2dec": {
38563856
"baseline": "0.20",

versions/j-/jasper.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "cf0e87a04297d4721c69efc07e8a1d5930bb8458",
5+
"version": "4.2.4",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "37fe79b367720f8ae648cb3fd2e9a67be323dd70",
510
"version": "4.2.4",

0 commit comments

Comments
 (0)