Date: Sunday, May 16, 2021 @ 08:55:55 Author: arojas Revision: 415580
Update to 7.0.1 Modified: mlt/trunk/PKGBUILD Deleted: mlt/trunk/mlt-data-location.patch mlt/trunk/mlt-destdir.patch -------------------------+ PKGBUILD | 17 ++++------------- mlt-data-location.patch | 27 --------------------------- mlt-destdir.patch | 12 ------------ 3 files changed, 4 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-16 02:04:25 UTC (rev 415579) +++ PKGBUILD 2021-05-16 08:55:55 UTC (rev 415580) @@ -7,8 +7,8 @@ # Contributor: Gustavo Alvarez <sl1pk...@gmail.com> pkgname=mlt -pkgver=7.0.0 -pkgrel=4 +pkgver=7.0.1 +pkgrel=1 pkgdesc='An open source multimedia framework' arch=(x86_64) url='https://www.mltframework.org' @@ -34,18 +34,9 @@ '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 - mlt-data-location.patch - mlt-destdir.patch) -sha256sums=('91359ff8b911dbd879c687ed4cda10a6dce07786bfa0b3ba9f385e7a6a7a354b' - '335f200de9c767de91ce6941774528b8b0a44e2c370890ce3c53322ce23195b5' - '87a666fd591259c4021f7469be83daf61faaba74d6cf7c13af0f5c964b3ecf29') +source=(https://github.com/mltframework/mlt/archive/v$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('b68c88d9ad91889838186188cce938feee8b63e3755a3b6fb45dc9c2ae0c5ecd') -prepare() { - patch -d $pkgname-$pkgver -p1 < mlt-data-location.patch # Fix data location - patch -d $pkgname-$pkgver -p1 < mlt-destdir.patch # Fix creating melt symlink -} - build() { cmake -B build -S $pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ Deleted: mlt-data-location.patch =================================================================== --- mlt-data-location.patch 2021-05-16 02:04:25 UTC (rev 415579) +++ mlt-data-location.patch 2021-05-16 08:55:55 UTC (rev 415580) @@ -1,27 +0,0 @@ -From d0ff2b5a6586ddc0a0509c016ae56bdb80741034 Mon Sep 17 00:00:00 2001 -From: Dan Dennedy <d...@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) Deleted: mlt-destdir.patch =================================================================== --- mlt-destdir.patch 2021-05-16 02:04:25 UTC (rev 415579) +++ mlt-destdir.patch 2021-05-16 08:55:55 UTC (rev 415580) @@ -1,12 +0,0 @@ -diff --git a/src/melt/CMakeLists.txt b/src/melt/CMakeLists.txt -index 921edd06..bb7969d7 100644 ---- a/src/melt/CMakeLists.txt -+++ b/src/melt/CMakeLists.txt -@@ -23,6 +23,6 @@ if(WIN32 OR APPLE) - else() - install(PROGRAMS "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/melt" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME melt-${MLT_VERSION_MAJOR}) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink melt-${MLT_VERSION_MAJOR} melt \ -- WORKING_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR})" -+ WORKING_DIRECTORY \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR})" - ) - endif()