Xmp toolkit as a submodule

.github/workflows/codeql-analysis.yml

@@ -39,6 +39,8 @@ jobs:
       uses: actions/checkout@v6
       with:
         persist-credentials: false
+    - name: Checkout submodules
+      run: git submodule update --init --depth=1
 
     - name: Install dependencies
       run: |

.github/workflows/nightly_Linux_distributions.yml

@@ -36,6 +36,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
       - name: Install dependencies
         run: ./ci/install_dependencies.sh
       - name: Build and install

.github/workflows/on_PR_linux_fuzz.yml

@@ -28,6 +28,8 @@ jobs:
     - uses: actions/checkout@v6
       with:
         persist-credentials: false
+    - name: Checkout submodules
+      run: git submodule update --init --depth=1
     - name: Install dependencies
       run: |
         sudo ./ci/install_dependencies.sh

.github/workflows/on_PR_linux_matrix.yml

@@ -24,6 +24,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -76,6 +78,9 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        shell: bash
+        run: git submodule update --init --depth=1
       - uses: jirutka/setup-alpine@v1
         with:
           arch: ${{matrix.arch}}

.github/workflows/on_PR_linux_special_builds.yml

@@ -21,6 +21,8 @@ jobs:
           fetch-depth: 2
           persist-credentials: false
           # Trying to deal with warning: ->  Issue detecting commit SHA. Please run actions/checkout with fetch-depth > 1 or set to 0
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -68,6 +70,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -106,6 +110,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -142,6 +148,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -166,6 +174,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |

.github/workflows/on_PR_linux_staticAnalysis.yml

@@ -21,6 +21,8 @@ jobs:
           fetch-depth: 2
           persist-credentials: false
           # Trying to deal with warning: ->  Issue detecting commit SHA. Please run actions/checkout with fetch-depth > 1 or set to 0
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |

.github/workflows/on_PR_mac_matrix.yml

@@ -24,6 +24,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |

.github/workflows/on_PR_mac_special_builds.yml

@@ -19,6 +19,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |

.github/workflows/on_PR_meson.yaml

@@ -18,6 +18,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
       - uses: egor-tensin/setup-gcc@v2
         with:
           version: ${{matrix.cxx}}
@@ -41,6 +43,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
       - uses: egor-tensin/setup-clang@v2
         with:
           version: ${{matrix.cxx}}
@@ -76,6 +80,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install packages
         run: |
@@ -106,6 +112,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install packages
         run: |
@@ -140,6 +148,9 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        shell: bash
+        run: git submodule update --init --depth=1
 
       - uses: msys2/setup-msys2@v2
         with:
@@ -169,6 +180,9 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        shell: bash
+        run: git submodule update --init --depth=1
       - uses: msys2/setup-msys2@v2
         with:
           msystem: 'MSYS'
@@ -193,6 +207,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install packages
         run: |
@@ -210,6 +226,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
       - uses: vmactions/freebsd-vm@v1
         with:
           prepare: |
@@ -224,6 +242,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
       - uses: vmactions/omnios-vm@v1
         with:
           prepare: |
@@ -238,6 +258,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
       - name: Install packages
         run: |
           sudo apt install -y meson

.github/workflows/on_PR_windows_matrix.yml

@@ -32,6 +32,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1
@@ -99,6 +101,9 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        shell: bash
+        run: git submodule update --init --depth=1
 
       - name: Set up MSYS2
         uses: msys2/setup-msys2@v2
@@ -157,6 +162,9 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        shell: bash
+        run: git submodule update --init --depth=1
 
       - name: Set up Cygwin
         uses: cygwin/cygwin-install-action@v6

.github/workflows/on_push_BasicWinLinMac.yml

@@ -23,6 +23,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1
@@ -61,6 +63,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -97,6 +101,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |

.github/workflows/on_push_ExtraJobsForMain.yml

@@ -23,6 +23,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |

.github/workflows/on_push_clang_format.yml

@@ -10,6 +10,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
       - uses: DoozyX/clang-format-lint-action@v0.20
         with:
           source: '.'

.github/workflows/release.yml

@@ -25,6 +25,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -77,6 +79,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Install dependencies
         run: |
@@ -122,6 +126,8 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Checkout submodules
+        run: git submodule update --init --depth=1
 
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "xmpsdk/XMP-Toolkit-SDK"]
+	path = xmpsdk/XMP-Toolkit-SDK
+	url = https://github.com/adobe/XMP-Toolkit-SDK.git

src/CMakeLists.txt

@@ -209,7 +209,9 @@ if(EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP)
 endif()
 
 if(EXIV2_ENABLE_XMP)
-  target_sources(exiv2lib PRIVATE $<TARGET_OBJECTS:exiv2-xmp>)
+#  target_sources(exiv2lib PRIVATE $<TARGET_OBJECTS:exiv2-xmp>)
+  target_link_libraries(exiv2lib PRIVATE exiv2-xmp exiv2-xmp-interface)
+  target_compile_definitions(exiv2lib PUBLIC EXV_ADOBE_XMPSDK=2016)
 elseif(EXIV2_ENABLE_EXTERNAL_XMP)
   target_link_libraries(exiv2lib PUBLIC ${XMPSDK_LIBRARY})
   target_include_directories(exiv2lib PUBLIC ${XMPSDK_INCLUDE_DIR})
@@ -313,7 +315,7 @@ set(requires_private_for_pc_file
 
 write_basic_package_version_file(exiv2-config-version.cmake COMPATIBILITY ExactVersion)
 
-install(TARGETS exiv2lib EXPORT exiv2-targets)
+install(TARGETS exiv2lib exiv2-xmp exiv2-xmp-interface EXPORT exiv2-targets)
 
 include(CMakePackageConfigHelpers)
 configure_package_config_file(

src/convert.cpp

@@ -1257,7 +1257,7 @@ std::string Converter::computeExifDigest(bool tiff) {
         continue;
       DataBuf data(pos->size());
       pos->copy(data.data(), littleEndian /* FIXME ? */);
-      MD5Update(&context, data.c_data(), static_cast<uint32_t>(data.size()));
+      MD5Update(&context, const_cast<XMP_Uns8*>(data.c_data()), static_cast<uint32_t>(data.size()));
     }
   }
   MD5Final(digest, &context);

src/meson.build

@@ -88,12 +88,11 @@ exiv2int_dep = declare_dependency(
 exiv2 = library(
   'exiv2',
   base_lib,
-  xmp_lib,
-  cpp_args: cargs,
+  cpp_args: [cargs, xmp_public_args],
   version: meson.project_version(),
   soversion: sover,
   gnu_symbol_visibility: 'hidden',
-  dependencies: [exiv2int_dep, brotli_dep, curl_dep, expat_dep, iconv_dep, net_dep],
+  dependencies: [exiv2int_dep, xmp_dep, brotli_dep, curl_dep, expat_dep, iconv_dep, net_dep],
   install: true,
 )