Skip to content

Commit

Permalink
[jasper] freeglut is not a dependency in macOS (microsoft#9680)
Browse files Browse the repository at this point in the history
* [jasper] freeglut is not a dependency in macOS

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

* ogre fails in macOS
  • Loading branch information
david-antiteum authored and vicroms committed Jan 22, 2020
1 parent 6d8b6b1 commit 2204efd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ports/jasper/CONTROL
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2204efd

Please sign in to comment.