kdenlive: Update to 25.04.0 (#24206)

2025-05-08 13:53:08 -07:00 · 2025-05-08 13:53:08 -07:00 · 71e1110e74
commit 71e1110e74
parent 02e2302b8b
3 changed files with 164 additions and 3 deletions
--- a/mingw-w64-kdenlive/PKGBUILD
+++ b/mingw-w64-kdenlive/PKGBUILD
@ -2,7 +2,7 @@
 _realname=kdenlive
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=24.12.3
+pkgver=25.04.0
 pkgrel=1
 pkgdesc="A non-linear video editor for Linux using the MLT video framework (mingw-w64)"
 arch=('any')
@ -44,6 +44,7 @@ depends=(
  "${MINGW_PACKAGE_PREFIX}-kwidgetsaddons"
  "${MINGW_PACKAGE_PREFIX}-kxmlgui"
  "${MINGW_PACKAGE_PREFIX}-mlt"
+  "${MINGW_PACKAGE_PREFIX}-opentimelineio"
  "${MINGW_PACKAGE_PREFIX}-purpose"
  "${MINGW_PACKAGE_PREFIX}-shared-mime-info"
  "${MINGW_PACKAGE_PREFIX}-qqc2-desktop-style"
@ -60,7 +61,7 @@ optdepends=(
  "${MINGW_PACKAGE_PREFIX}-opencv: For motion tracking"
 )
 source=("https://download.kde.org/stable/release-service/${pkgver}/src/${_realname}-$pkgver.tar.xz"{,.sig})
-sha256sums=('449c7e53d9501f434b955f228dcb29f3cb42642c41b053dd8e4cd30b8861843e'
+sha256sums=('3f07e23e5e58441acd02b89d969b33940994d9d1a8a8006b15e61eb575abd519'
            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
@ -93,7 +94,8 @@ build() {
    -DBUILD_TESTING="OFF" \
    -DBUILD_QCH="OFF" \
    -DKDE_INSTALL_USE_QT_SYS_PATHS="OFF" \
-    -DNODBUS="ON" \
+    -DFETCH_OTIO="OFF" \
+    -DUSE_DBUS="OFF" \
    ../${_realname}-${pkgver}

  ${MINGW_PREFIX}/bin/cmake --build .
--- a/mingw-w64-opentimelineio/001-cmake-target-paths.patch
+++ b/mingw-w64-opentimelineio/001-cmake-target-paths.patch
@ -0,0 +1,79 @@
+diff -bur OpenTimelineIO-0.17.0-o/src/opentime/CMakeLists.txt OpenTimelineIO-0.17.0/src/opentime/CMakeLists.txt
+--- OpenTimelineIO-0.17.0-o/src/opentime/CMakeLists.txt	2025-05-07 20:02:24.561015100 -0600
+++ OpenTimelineIO-0.17.0/src/opentime/CMakeLists.txt	2025-05-07 20:04:04.016323600 -0600
+@@ -39,25 +39,24 @@
+ 
+ if(OTIO_CXX_INSTALL)
+     install(FILES ${OPENTIME_HEADER_FILES} 
+-            DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentime")
+            DESTINATION "include/opentime")
+ 
+     install(TARGETS opentime
+             EXPORT OpenTimeTargets
+-            INCLUDES DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include"
+-            ARCHIVE DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
+-            LIBRARY DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
+-            RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
+            INCLUDES DESTINATION "include"
+            ARCHIVE DESTINATION "lib"
+            LIBRARY DESTINATION "lib"
+            RUNTIME DESTINATION "bin")
+ 
+     install(EXPORT OpenTimeTargets
+-            DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime"
+            DESTINATION "share/opentime"
+             NAMESPACE OTIO:: )
+ 
+     include(CMakePackageConfigHelpers)
+     configure_package_config_file(
+         ${CMAKE_CURRENT_SOURCE_DIR}/OpenTimeConfig.cmake.in
+         ${CMAKE_CURRENT_BINARY_DIR}/OpenTimeConfig.cmake
+-        INSTALL_DESTINATION
+-            ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime
+        INSTALL_DESTINATION "share/opentime"
+         NO_SET_AND_CHECK_MACRO
+         NO_CHECK_REQUIRED_COMPONENTS_MACRO
+     )
+diff -bur OpenTimelineIO-0.17.0-o/src/opentimelineio/CMakeLists.txt OpenTimelineIO-0.17.0/src/opentimelineio/CMakeLists.txt
+--- OpenTimelineIO-0.17.0-o/src/opentimelineio/CMakeLists.txt	2025-05-07 20:02:24.588161100 -0600
+++ OpenTimelineIO-0.17.0/src/opentimelineio/CMakeLists.txt	2025-05-07 20:04:49.208710600 -0600
+@@ -109,30 +109,29 @@
+ 
+ if(OTIO_CXX_INSTALL)
+     install(FILES ${OPENTIMELINEIO_HEADER_FILES} 
+-            DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio")
+            DESTINATION "include/opentimelineio")
+ 
+-    set(OPENTIMELINEIO_INCLUDES ${OTIO_RESOLVED_CXX_INSTALL_DIR}/include)
+    set(OPENTIMELINEIO_INCLUDES include)
+     if(OTIO_DEPENDENCIES_INSTALL)
+-        list(APPEND OPENTIMELINEIO_INCLUDES ${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio/deps)
+        list(APPEND OPENTIMELINEIO_INCLUDES include/opentimelineio/deps)
+     endif()
+ 
+     install(TARGETS opentimelineio
+            EXPORT OpenTimelineIOTargets
+-           INCLUDES DESTINATION "${OPENTIMELINEIO_INCLUDES}"
+-           ARCHIVE DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
+-           LIBRARY DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
+-           RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
+           INCLUDES DESTINATION "include"
+           ARCHIVE DESTINATION "lib"
+           LIBRARY DESTINATION "lib"
+           RUNTIME DESTINATION "bin")
+ 
+     install(EXPORT OpenTimelineIOTargets
+-           DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio"
+           DESTINATION "share/opentimelineio"
+            NAMESPACE OTIO:: )
+ 
+     include(CMakePackageConfigHelpers)
+     configure_package_config_file(
+         ${CMAKE_CURRENT_SOURCE_DIR}/OpenTimelineIOConfig.cmake.in
+         ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIOConfig.cmake
+-        INSTALL_DESTINATION
+-            ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio
+        INSTALL_DESTINATION "share/opentimelineio"
+         NO_SET_AND_CHECK_MACRO
+         NO_CHECK_REQUIRED_COMPONENTS_MACRO
+     )
--- a/mingw-w64-opentimelineio/PKGBUILD
+++ b/mingw-w64-opentimelineio/PKGBUILD
@ -0,0 +1,80 @@
+
+_realname=opentimelineio
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=0.17.0
+pkgrel=1
+pkgdesc="Open Source API and interchange format for editorial timeline information (mingw-w64)"
+arch=('any')
+mingw_arch=('ucrt64' 'clang64' 'clangarm64')
+msys2_references=(
+  'archlinux: opentimelineio'
+)
+msys2_repository_url='https://github.com/AcademySoftwareFoundation/OpenTimelineIO'
+url="http://opentimeline.io/"
+license=("spdx:Apache-2.0")
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-cc"
+  "${MINGW_PACKAGE_PREFIX}-cmake"
+  "${MINGW_PACKAGE_PREFIX}-imath"
+  "git"
+)
+depends=(
+  "${MINGW_PACKAGE_PREFIX}-gcc-libs"
+)
+source=("https://github.com/AcademySoftwareFoundation/OpenTimelineIO/archive/refs/tags/v${pkgver}.tar.gz"
+        "rapidjson::git+https://github.com/Tencent/rapidjson"
+        "001-cmake-target-paths.patch")
+sha256sums=('cdf8281c6091a18a4147295b660e13b610a6d58919a79608bf03e5359c1c2d24'
+            'SKIP'
+            'bab20bf5087b6f5e4263c41af094ab22b0a4584cd615a2ae6423d383ee499229')
+
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying $_patch"
+    patch -Nbp1 -i "${srcdir}/$_patch"
+  done
+}
+
+prepare() {
+  cd "${srcdir}"/${_realname}-${pkgver}
+
+  apply_patch_with_msg \
+    001-cmake-target-paths.patch
+
+  mv -f "${srcdir}/rapidjson" "${srcdir}/${_realname}-${pkgver}/src/deps"
+}
+
+build() {
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  ${MINGW_PREFIX}/bin/cmake \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -GNinja \
+    -DOTIO_FIND_IMATH=ON \
+    -DOTIO_AUTOMATIC_SUBMODULES=OFF \
+    -DOTIO_DEPENDENCIES_INSTALL=OFF \
+    -DOTIO_PYTHON_INSTALL=OFF \
+    "${_extra_config[@]}" \
+    ../${_realname}-${pkgver}
+
+  ${MINGW_PREFIX}/bin/cmake --build .
+
+}
+
+package() {
+  cd "${srcdir}/build-${MSYSTEM}"
+
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
+
+  install -vDm 644 "${srcdir}"/${_realname}-${pkgver}/LICENSE.txt -t "${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/"
+}