3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[jasper] freeglut is not a dependency in macOS (#9680)

Browse Source 
* [jasper] freeglut is not a dependency in macOS

Also remove freeimage:x64-osx from baseline as now compiles

* ogre fails in macOS
This commit is contained in:
David Garcia 2020-01-22 21:42:42 +01:00 committed by Victor Romero
parent 6d8b6b1bbf
commit 2204efd414
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/jasper/CONTROL
View File

@ -1,5 +1,5 @@
Source: jasper
Version: 2.0.16-2
Version: 2.0.16-3
Homepage: https://github.com/mdadams/jasper
Description: Open source implementation of the JPEG-2000 Part-1 standard
Build-Depends: libjpeg-turbo, opengl, freeglut
Build-Depends: libjpeg-turbo, opengl, freeglut (!osx)

2
scripts/ci.baseline.txt
View File

@ -467,7 +467,6 @@ freeglut:arm64-windows=fail
freeglut:arm-uwp=fail
freeglut:x64-uwp=fail
freeglut:x64-osx=fail
freeimage:x64-osx=fail
freerdp:arm64-windows=fail
freerdp:arm-uwp=fail
freerdp:x64-osx=fail
@ -1178,6 +1177,7 @@ ogdf:x64-uwp = skip
ogdf:x64-windows = skip
ogdf:x64-windows-static = skip
ogdf:x86-windows = skip
ogre:x64-osx=fail
# Conflicts with ogre
ogre-next:arm64-windows = skip
ogre-next:arm-uwp = skip