mlt: => 7.0.1

7 files changed, 36 insertions, 78 deletions

diff --git a/video/mlt/BUILD b/video/mlt/BUILD
index 01ca5e8f92..ebe57e04b1 100755
--- a/video/mlt/BUILD
+++ b/video/mlt/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OPTS --enable-gpl --enable-gpl3 --disable-debug $MLT_KDEN $MLT_KINO $MLT_SCALE"  &&        
+OPTS+=" $MLT_KDEN" &&
 default_build
diff --git a/video/mlt/CONFIGURE b/video/mlt/CONFIGURE
index 48e37b346d..2274bb8113 100755
--- a/video/mlt/CONFIGURE
+++ b/video/mlt/CONFIGURE
@@ -1,3 +1,4 @@
-config_query_option MLT_KINO "support kino?" n "" "--disable-kino" 
-config_query_option MLT_KDEN "support kdenlive" n "" "--disable-kdenlive"
-config_query_option MLT_SCALE "software scaling?" y "--avformat-swscale" ""
+persistent_remove MLT_KINO
+persistent_remove MLT_SCALE
+. $GRIMOIRE/CMAKE_CONFIGURE
+config_query_option MLT_KDEN "support kdenlive" n -DMOD_KDENLIVE={on,off}
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index 3811e49572..752b21bd39 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -1,76 +1,27 @@
+. $GRIMOIRE/CMAKE_DEPENDS 
 if [[ $VERSION == git ]] ;then
 depends git
 fi  &&
 depends -sub CXX gcc &&
 depends libebur128   &&
-optional_depends  LIBAVCODEC                              \
-                  "--avformat-shared --avformat-ldextra"  \
-                  "--disable-avformat"                    \
-                  "Enable avformat module"                &&
-
-optional_depends  libdv               \
-                  "--enable-dv"       \
-                  "--disable-dv"      \
-                  "Enable DV module"  &&
-
-optional_depends  gtk+2                  \
-                  "--enable-gtk2"        \
-                  "--disable-gtk2"       \
-                  "Enable gtk+2 module"  &&
-
-optional_depends  normalize                  \
-                  "--enable-normalize"       \
-                  "--disable-normalize"      \
-                  "Enable normalize module"  &&
-
-optional_depends  libsamplerate             \
-                  "--enable-resample"       \
-                  "--disable-resample"      \
-                  "Enable resample module"  &&
-
-optional_depends  sdl                  \
-                  "--enable-sdl"       \
-                  "--disable-sdl"      \
-                  "Enable SDL module"  &&
-
-optional_depends  sdl2                 \
-                  "--enable-sdl2"      \
-                  "--disable-sdl2"     \
-                  "Enable SDL module"  &&
-
-optional_depends  sox                  \
-                  "--enable-sox"       \
-                  "--disable-sox"      \
-                  "Enable sox module"  &&
-
-optional_depends  libvorbis                   \
-                  "--enable-vorbis"           \
-                  "--disable-vorbis"          \
-                  "Enable ogg/vorbis module"  &&
-
-optional_depends  libxml2  \
-                  '--enable-xml' \
-                  '--disable-xml' \
-                  "Enable xml Module"  &&
-
-optional_depends  xine-lib              \
-                  "--enable-xine"       \
-                  "--disable-xine"      \
-                  "Enable Xine Module"  &&
-
-optional_depends  frei0r-plugins               \
-                  "--enable-frei0r"            \
-                  "--disable-frei0r"           \
-                  "Enable the frei0r module?"  &&
-
-
-optional_depends  qtbase  '--enable-qt' '--disable-qt' 'QT5 support' &&
-optional_depends  libexif '' '' 'enable auto rotate' &&
-
-optional_depends  python                                                 \
-                  "--swig-languages=python"                              \
-                  ""                                                     \
-                  "Python language bindings" &&
-
-optional_depends  pulseaudio '--enable-rtaudio' '--disable-rtaudio' 'RT Audio support' &&
-optional_depends OPENCV '--enable-opencv' '--disable-opencv' 'OpenCV support'
+optional_depends LIBAVCODEC  -DMOD_AVFORMAT={on,off} 'Enable avformat module' &&
+optional_depends OPENGL -DMOD_MOVIT={on,off} 'Enable OpenGL module' &&
+#optional_depend libexif 'enable auto rotate' &&
+optional_depends libsamplerate -DMOD_RESAMPLE={on,off} 'Enable resample module'  &&
+optional_depends libvorbis -DMOD_VORBIS={on,off}  'Enable ogg/vorbis module'  &&
+optional_depends libxml2 -DMOD_XML={on,off} 'Enable xml Module'  &&
+optional_depends normalize -DMOD_NORMALIZE={on,off} 'Enable normalize module'  &&
+optional_depends qtbase  -DMOD_QT={on,off} 'QT5 support' &&
+
+optional_depends sdl  -DMOD_SDL1={on,off}  'Enable SDL module'  &&
+optional_depends sdl2 -DMOD_SDL2={on,off}  'Enable SDL2 module'  &&
+optional_depends sox  -DMOD_SOX={on,off}   'Enable SoX module'  &&
+optional_depends xine-lib -DMOD_XINE={on,off} 'Enable Xine Module'  &&
+optional_depends frei0r-plugins -DMOD_FREI0R={on,off} 'Enable the frei0r module?'  &&
+optional_depends pulseaudio -DMOD_RTAUDIO={on,off} 'RT Audio support' &&
+optional_depends OPENCV -DMOD_OPENCV={on,off} 'OpenCV support' &&
+
+optional_depends swig '' '' 'various language bindings' &&
+if is_depends_enabled $SPELL swig;then
+  optional_depends python3  -DSWIG_PYTHON={on,off} 'Python language bindings'
+fi
diff --git a/video/mlt/DETAILS b/video/mlt/DETAILS
index 55984e6483..ed880afec2 100755
--- a/video/mlt/DETAILS
+++ b/video/mlt/DETAILS
@@ -1,3 +1,4 @@
+. $GRIMOIRE/CMAKE_FUNCTIONS
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=mlt
 if [[ $MLT_BRANCH == scm ]];then
@@ -8,8 +9,8 @@ if [[ $MLT_BRANCH == scm ]];then
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
   FORCE_DOWNLOAD=on
 else
-         VERSION=6.26.1
-     SOURCE_HASH=sha512:6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
+         VERSION=7.0.1
+     SOURCE_HASH=sha512:9268889f0fbe69180651a592ac0b328d18f8b60c7d83f9d6c506dc21254afcb2281662f4d19faf3520976ae100600d00cd6eb2aa42c83880fa4c4c36e760c68a
           SOURCE=$SPELL-v$VERSION.tar.gz
    SOURCE_URL[0]=https://github.com/mltframework/mlt/archive/v$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index c253c93dee..5fb7295b2a 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,8 @@
+2021-07-09 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 7.0.1
+	* SUB_DEPENDS DEPENDS BUILD: lots of changes to build flags
+	  convert to cmake build
+
 2021-04-25 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 6.26.1
 
diff --git a/video/mlt/INSTALL b/video/mlt/INSTALL
index 1e686db2d7..1e686db2d7 100755..100644
--- a/video/mlt/INSTALL
+++ b/video/mlt/INSTALL
diff --git a/video/mlt/SUB_DEPENDS b/video/mlt/SUB_DEPENDS
index 85c4a38c46..a4db8b68d8 100755
--- a/video/mlt/SUB_DEPENDS
+++ b/video/mlt/SUB_DEPENDS
@@ -1,6 +1,6 @@
 case $THIS_SUB_DEPENDS in
   PYTHON) message "Python bindings requested, forcing python dependency" &&
-          depends python '--swig-languages=python';;
+          depends python3 '-DSWIG_PYTHON=on';;
        *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
           return 1;;
 esac