From 2f73f701d193991e49a8d346253ebe7d511c710c Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Thu, 5 Dec 2019 14:25:17 +0100 Subject: [PATCH 1/4] [OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES --- ports/openexr/FindOpenEXR.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openexr/FindOpenEXR.cmake b/ports/openexr/FindOpenEXR.cmake index 4b5b280a07..f036c742e1 100644 --- a/ports/openexr/FindOpenEXR.cmake +++ b/ports/openexr/FindOpenEXR.cmake @@ -49,7 +49,7 @@ endif() if(NOT OpenEXR_IEXMATH_LIBRARY) find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX}) - find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}d) + find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}_d) select_library_configurations(OpenEXR_IEXMATH) endif() From 73564f46b3e1ce9e0ade479f67be824c24850b5b Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Tue, 10 Dec 2019 13:37:31 +0100 Subject: [PATCH 2/4] updated CONTROL Version; fix AlembicIlmBase.cmake file error caused by debug lib now being found. --- ports/alembic/CONTROL | 2 +- ports/alembic/fix-find-openexr-ilmbase.patch | 14 +++++++++++++- ports/openexr/CONTROL | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index e95c999d7f..5d9e05635a 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,5 +1,5 @@ Source: alembic -Version: 1.7.11-5 +Version: 1.7.11-6 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. Homepage: https://alembic.io/ diff --git a/ports/alembic/fix-find-openexr-ilmbase.patch b/ports/alembic/fix-find-openexr-ilmbase.patch index fdd24249ad..6a72711f42 100644 --- a/ports/alembic/fix-find-openexr-ilmbase.patch +++ b/ports/alembic/fix-find-openexr-ilmbase.patch @@ -1,5 +1,5 @@ diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake -index cd00d70..a73c8db 100644 +index cd00d70..0e50512 100644 --- a/cmake/AlembicIlmBase.cmake +++ b/cmake/AlembicIlmBase.cmake @@ -33,11 +33,25 @@ @@ -30,6 +30,18 @@ index cd00d70..a73c8db 100644 SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_IMATH_LIB} ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} +@@ -45,9 +59,9 @@ IF (ILMBASE_FOUND) + ${ALEMBIC_ILMBASE_HALF_LIB} + ) + +- if (${ALEMBIC_ILMBASE_IEXMATH_LIB}) ++ if (ALEMBIC_ILMBASE_IEXMATH_LIB) + SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB}) +- endif (${ALEMBIC_ILMBASE_IEXMATH_LIB}) ++ endif (ALEMBIC_ILMBASE_IEXMATH_LIB) + + ELSE() + SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake index 0833b32..a9180cd 100644 --- a/cmake/AlembicOpenEXR.cmake diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL index 5fc8b52d62..7d8759237f 100644 --- a/ports/openexr/CONTROL +++ b/ports/openexr/CONTROL @@ -1,5 +1,5 @@ Source: openexr -Version: 2.3.0-4 +Version: 2.3.0-5 Homepage: https://www.openexr.com/ Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications Build-Depends: zlib From 266622abe6d90b52adfe07d00d64b4d376059489 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Wed, 11 Dec 2019 10:32:12 +0100 Subject: [PATCH 3/4] skip ogre build for all triplets as it conficts with ogre-next --- scripts/ci.baseline.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 94fd57187c..d83a850395 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1153,6 +1153,15 @@ ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip ogdf:x86-windows = skip +# Conflicts with ogre-next +ogre:arm64-windows = skip +ogre:arm-uwp = skip +ogre:x64-osx = skip +ogre:x64-linux = skip +ogre:x64-uwp = skip +ogre:x64-windows = skip +ogre:x64-windows-static = skip +ogre:x86-windows = skip ois:arm64-windows=fail ois:arm-uwp=fail ois:x64-uwp=fail From 23104e2aa49ce85e5d24c27760dadafef048f930 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Mon, 16 Dec 2019 13:32:00 +0100 Subject: [PATCH 4/4] skip ogre-next instead of skipping ogre --- scripts/ci.baseline.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d83a850395..513ba6bbd0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1153,15 +1153,15 @@ ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip ogdf:x86-windows = skip -# Conflicts with ogre-next -ogre:arm64-windows = skip -ogre:arm-uwp = skip -ogre:x64-osx = skip -ogre:x64-linux = skip -ogre:x64-uwp = skip -ogre:x64-windows = skip -ogre:x64-windows-static = skip -ogre:x86-windows = skip +# Conflicts with ogre +ogre-next:arm64-windows = skip +ogre-next:arm-uwp = skip +ogre-next:x64-osx = skip +ogre-next:x64-linux = skip +ogre-next:x64-uwp = skip +ogre-next:x64-windows = skip +ogre-next:x64-windows-static = skip +ogre-next:x86-windows = skip ois:arm64-windows=fail ois:arm-uwp=fail ois:x64-uwp=fail