[arch-commits] Commit in mlt/trunk (PKGBUILD mlt-data-location.patch)

[Antonio Rojas]

    Date: Tuesday, May 4, 2021 @ 16:16:14
  Author: arojas
Revision: 414371

Fix data location

Added:
  mlt/trunk/mlt-data-location.patch
Modified:
  mlt/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   12 +++++++++---
 mlt-data-location.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-04 14:30:48 UTC (rev 414370)
+++ PKGBUILD	2021-05-04 16:16:14 UTC (rev 414371)
@@ -8,7 +8,7 @@
 
 pkgname=mlt
 pkgver=7.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='An open source multimedia framework'
 arch=(x86_64)
 url='https://www.mltframework.org'
@@ -34,9 +34,15 @@
             'python: python bindings')
 makedepends=(cmake ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg vid.stab qt5-svg
              jack libexif python swig movit eigen opencv rubberband gdk-pixbuf2 pango rtaudio imagemagick)
-source=(https://github.com/mltframework/mlt/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('91359ff8b911dbd879c687ed4cda10a6dce07786bfa0b3ba9f385e7a6a7a354b')
+source=(https://github.com/mltframework/mlt/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+        mlt-data-location.patch)
+sha256sums=('91359ff8b911dbd879c687ed4cda10a6dce07786bfa0b3ba9f385e7a6a7a354b'
+            '335f200de9c767de91ce6941774528b8b0a44e2c370890ce3c53322ce23195b5')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < mlt-data-location.patch # Fix data location
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \

Added: mlt-data-location.patch
===================================================================
--- mlt-data-location.patch	                        (rev 0)
+++ mlt-data-location.patch	2021-05-04 16:16:14 UTC (rev 414371)
@@ -0,0 +1,27 @@
+From d0ff2b5a6586ddc0a0509c016ae56bdb80741034 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan at dennedy.org>
+Date: Mon, 3 May 2021 15:20:24 -0700
+Subject: [PATCH] fix installed build cannot finds its modules and data
+
+---
+ CMakeLists.txt               | 2 +-
+ Dockerfile                   | 2 --
+ src/framework/CMakeLists.txt | 5 +----
+ 3 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
+index 91e32d45d..7be23640d 100644
+--- a/src/framework/CMakeLists.txt
++++ b/src/framework/CMakeLists.txt
+@@ -101,10 +101,7 @@ if(WIN32)
+ endif()
+ 
+ if(NOT (WIN32 OR (APPLE AND RELOCATABLE)))
+-  target_compile_definitions(mlt PRIVATE
+-    $<BUILD_INTERFACE:PREFIX_DATA="${MLT_DATA_OUTPUT_DIRECTORY}" PREFIX_LIB="${MLT_MODULE_OUTPUT_DIRECTORY}">
+-    $<INSTALL_INTERFACE:PREFIX_DATA="${CMAKE_INSTALL_FULL_DATADIR}/mlt-${MLT_VERSION_MAJOR}" PREFIX_LIB="${CMAKE_INSTALL_FULL_LIBDIR}/mlt-${MLT_VERSION_MAJOR}">
+-  )
++  target_compile_definitions(mlt PRIVATE PREFIX_DATA="${CMAKE_INSTALL_FULL_DATADIR}/mlt-${MLT_VERSION_MAJOR}" PREFIX_LIB="${CMAKE_INSTALL_FULL_LIBDIR}/mlt-${MLT_VERSION_MAJOR}")
+   target_link_options(mlt PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/mlt.vers)
+   set_target_properties(mlt PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/mlt.vers)
+ elseif(APPLE AND RELOCATABLE)