From 2204efd414d1df30d861d19cf52f20e04d299c15 Mon Sep 17 00:00:00 2001
From: David Garcia <48836389+david-antiteum@users.noreply.github.com>
Date: Wed, 22 Jan 2020 21:42:42 +0100
Subject: [PATCH] [jasper] freeglut is not a dependency in macOS (#9680)

* [jasper] freeglut is not a dependency in macOS

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

* ogre fails in macOS
---
 ports/jasper/CONTROL    | 4 ++--
 scripts/ci.baseline.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/jasper/CONTROL b/ports/jasper/CONTROL
index 43c657dd4..df701a052 100644
--- a/ports/jasper/CONTROL
+++ b/ports/jasper/CONTROL
@@ -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)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index af974a83f..85e9d353b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -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