new SDK with exiv2 0.28.3

Author: PeterPetrik

.github/workflows/android.yml

@@ -24,13 +24,13 @@ jobs:
     runs-on: macos-15
     env:
       QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
-      NDK_VERSION: r25
-      NDK_VERSION_FULL: r25b
-      JDK_VERSION: 11
+      NDK_VERSION: 'r26' # '26.1.10909125'
+      NDK_VERSION_FULL: r26b
+      JDK_VERSION: 17
       SDK_PLATFORM: android-34
       SDK_BUILD_TOOLS: 34.0.0
-      INPUT_SDK_VERSION_ARM: arm-android-20250306-234
-      INPUT_SDK_VERSION_ARM64: arm64-android-20250306-234
+      INPUT_SDK_VERSION_ARM: arm-android-20250307-238
+      INPUT_SDK_VERSION_ARM64: arm64-android-20250307-238
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
       CACHE_VERSION: 0

.github/workflows/ios.yml

@@ -19,7 +19,7 @@ env:
   QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
   XC_VERSION: ${{ '16.2' }}
   IOS_CMAKE_TOOLCHAIN_VERSION: "4.4.0" 
-  INPUT_SDK_VERSION: arm64-ios-20250306-192
+  INPUT_SDK_VERSION: arm64-ios-20250307-195
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
   KEYCHAIN: ${{ 'inputapp.keychain' }}
   CCACHE_DIR: /Users/runner/work/ccache

.github/workflows/linux.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   CCACHE_DIR: ~/.ccache
-  INPUT_SDK_VERSION: x64-linux-20250307-191
+  INPUT_SDK_VERSION: x64-linux-20250308-194
   QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
   CMAKE_VERSION: '3.29.0'
   CACHE_VERSION: 0

.github/workflows/macos.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
-  INPUT_SDK_VERSION: x64-osx-20250306-212
+  INPUT_SDK_VERSION: x64-osx-20250307-215
   CCACHE_DIR: /Users/runner/work/ccache
   CACHE_VERSION: 0
   CMAKE_VERSION: '3.29.0'

.github/workflows/macos_arm64.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
-  INPUT_SDK_VERSION: arm64-osx-20250306-11
+  INPUT_SDK_VERSION: arm64-osx-20250307-14
   CCACHE_DIR: /Users/runner/work/ccache
   CACHE_VERSION: 0
   CMAKE_VERSION: '3.29.0'

.github/workflows/win.yml

@@ -26,7 +26,7 @@ jobs:
 
     env:
       QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
-      INPUT_SDK_VERSION: x64-windows-20250307-242
+      INPUT_SDK_VERSION: x64-windows-20250308-245
       CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
       CACHE_VERSION: 0
       VS_VERSION: "2022"
@@ -197,11 +197,11 @@ jobs:
         shell: cmd
         run: |
             makensis.exe input\scripts\input_win.nsi
-            xcopy C:\input-package\inputapp-win-x86_64.exe mergin-maps-input-win64-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.exe* /Y
+            xcopy C:\input-package\inputapp-win-x86_64.exe mergin-maps-mobile-win64-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.exe* /Y
 
       - name: Upload Sdk in Artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: mergin-maps-input-win64-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.exe
+          path: mergin-maps-mobile-win64-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.exe
           if-no-files-found: error
 

CMakeLists.txt

@@ -228,6 +228,7 @@ endif ()
 find_package(ZLIB REQUIRED)
 find_package(Bz2 REQUIRED)
 find_package(Curl REQUIRED)
+find_package(Inih REQUIRED)
 find_package(Exiv2 REQUIRED)
 find_package(Expat REQUIRED)
 find_package(Freexl REQUIRED)

app/CMakeLists.txt

@@ -502,7 +502,8 @@ target_link_libraries(
          Expat::Expat
          Freexl::Freexl
          Exiv2::Exiv2
-         Exiv2::Exiv2-xmp
+         Inih::Inih
+         Inih::Inireader
          Tiff::Tiff
          Sqlite3::Sqlite3
          MiniZip::MiniZip

cmake/FindAbsl.cmake

@@ -221,6 +221,10 @@ foreach (absl_lib IN ITEMS ${absl_libs})
 
 endforeach ()
 
+if (LNX)
+  set(ABSL_TARGETS "${ABSL_TARGETS};${ABSL_TARGETS}")
+endif()
+
 if (TARGET Absl::symbolize)
   set_target_properties(
     Absl::symbolize

cmake/FindExiv2.cmake

@@ -13,15 +13,9 @@ find_library(
   NO_DEFAULT_PATH
 )
 
-find_library(
-  Exiv2_xmp_LIBRARY
-  NAMES exiv2-xmp
-  PATHS "${INPUT_SDK_PATH_MULTI}/lib"
-  NO_DEFAULT_PATH
-)
 
 find_package_handle_standard_args(
-  Exiv2 REQUIRED_VARS Exiv2_LIBRARY Exiv2_xmp_LIBRARY Exiv2_INCLUDE_DIR
+  Exiv2 REQUIRED_VARS Exiv2_LIBRARY Exiv2_INCLUDE_DIR
 )
 
 if (Exiv2_FOUND AND NOT TARGET Exiv2::Exiv2)
@@ -30,12 +24,6 @@ if (Exiv2_FOUND AND NOT TARGET Exiv2::Exiv2)
     Exiv2::Exiv2 PROPERTIES IMPORTED_LOCATION "${Exiv2_LIBRARY}"
                             INTERFACE_INCLUDE_DIRECTORIES "${Exiv2_INCLUDE_DIR}"
   )
-
-  add_library(Exiv2::Exiv2-xmp UNKNOWN IMPORTED)
-  set_target_properties(
-    Exiv2::Exiv2-xmp PROPERTIES IMPORTED_LOCATION "${Exiv2_xmp_LIBRARY}"
-                                INTERFACE_INCLUDE_DIRECTORIES "${Exiv2_INCLUDE_DIR}"
-  )
 endif ()
 
-mark_as_advanced(Exiv2_LIBRARY Exiv2_INCLUDE_DIR Exiv2_xmp_LIBRARY)
+mark_as_advanced(Exiv2_LIBRARY Exiv2_INCLUDE_DIR)