From 96715ba7b387b476f444032e58159c32cc7f34bd Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Sat, 1 Dec 2018 09:44:19 -0800
Subject: [PATCH 1/2] macOS: Update lensfun version, copy some libs

Copies 2 libs not picked up by the routine and bumps the lensfun dylib version.
---
 tools/osx/macosx_bundle.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index e5c9d0bd3..7dd6f212c 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -152,12 +152,18 @@ done
 ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme
 "${GTK_PREFIX}/bin/gtk-update-icon-cache-3.0" "${RESOURCES}/share/icons/Adwaita"
 
+# Copy libjpeg-turbo into the app bundle
+cp /opt/local/lib/libjpeg.62.dylib "${RESOURCES}/../Frameworks"
+
+# Copy libtiff into the app bundle
+cp /opt/local/lib/libtiff.5.dylib "${RESOURCES}/../Frameworks"
+
 # Copy the Lensfun database into the app bundle
 mkdir -p "${RESOURCES}/share/lensfun"
 cp /opt/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun"
 
 # Copy liblensfun to Frameworks
-cp /opt/local/lib/liblensfun.1.dylib "${RESOURCES}/../Frameworks"
+cp /opt/local/lib/liblensfun.2.dylib "${RESOURCES}/../Frameworks"
 
 # Copy libiomp5 to Frameworks
 cp /opt/local/lib/libomp/libiomp5.dylib "${RESOURCES}/../Frameworks"

From 96c53ca566a8bfffaed5d10bdc5c4856ae517d80 Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Sat, 1 Dec 2018 11:37:59 -0800
Subject: [PATCH 2/2] mac: specify HFS+ filesystem for dmg

Fixes incompatibility between generated dmg on macos 10.14 and trying to open in 10.11.
---
 tools/osx/macosx_bundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index 7dd6f212c..1413b5d76 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -234,7 +234,7 @@ function CreateDmg {
     fi
 
     msg "Creating disk image:"
-    hdiutil create -format UDBZ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg"
+    hdiutil create -format UDBZ -fs HFS+ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg"
 
     # Sign disk image
     codesign --deep --force -v -s "${CODESIGNID}" "${dmg_name}.dmg"