Commit 9222a7c7 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents faf77816 073e6678
Pipeline #58279 passed with stage
in 8 minutes and 34 seconds
...@@ -2,8 +2,9 @@ ExternalProject_Add( ...@@ -2,8 +2,9 @@ ExternalProject_Add(
ext_mlt ext_mlt
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
GIT_REPOSITORY https://github.com/mltframework/mlt.git GIT_REPOSITORY https://github.com/mltframework/mlt.git
GIT_TAG v6.26.1
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} ${AT_SHARED_ONLY} --enable-gpl --enable-gpl3 --enable-opencv --enable-opengl --enable-lumas --avformat-swscale CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} ${AT_SHARED_ONLY} --enable-gpl --enable-gpl3 --enable-opencv --enable-opengl
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_ALWAYS TRUE BUILD_ALWAYS TRUE
BUILD_COMMAND $(MAKE) clean BUILD_COMMAND $(MAKE) clean
......
...@@ -565,7 +565,8 @@ ...@@ -565,7 +565,8 @@
{ {
"type": "git", "type": "git",
"url": "https://github.com/mltframework/mlt.git", "url": "https://github.com/mltframework/mlt.git",
"branch": "master" "commit": "531aa1a19df55cc378c9c79b86c7cbb187487f37",
"tag": "v6.26.1"
} }
] ]
}, },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment