git » mlt.git » commit 72347b5

Fix installing melt symlink (FS#70722)

author Antonio Rojas
2021-05-06 06:37:02 UTC
committer Antonio Rojas
2021-05-06 06:37:02 UTC
parent b8e3a71a594f3ae3421c812e8bc2f8321ef58239

Fix installing melt symlink (FS#70722)

PKGBUILD +6 -3
mlt-destdir.patch +12 -0

diff --git a/PKGBUILD b/PKGBUILD
index 44caf23..4cf64d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=mlt
 pkgver=7.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc='An open source multimedia framework'
 arch=(x86_64)
 url='https://www.mltframework.org'
@@ -35,12 +35,15 @@ optdepends=('sdl_image: SDL1 plugin'
 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-data-location.patch
+        mlt-destdir.patch)
 sha256sums=('91359ff8b911dbd879c687ed4cda10a6dce07786bfa0b3ba9f385e7a6a7a354b'
-            '335f200de9c767de91ce6941774528b8b0a44e2c370890ce3c53322ce23195b5')
+            '335f200de9c767de91ce6941774528b8b0a44e2c370890ce3c53322ce23195b5'
+            '87a666fd591259c4021f7469be83daf61faaba74d6cf7c13af0f5c964b3ecf29')
 
 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() {
diff --git a/mlt-destdir.patch b/mlt-destdir.patch
new file mode 100644
index 0000000..a66cb19
--- /dev/null
+++ b/mlt-destdir.patch
@@ -0,0 +1,12 @@
+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()