Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
85f5f1ba
Commit
85f5f1ba
authored
Apr 12, 2019
by
Jean-Baptiste Mardelle
Browse files
AppImage update: do not build MLT inside dependencies so we can have more frequent updates
parent
d819f17b
Pipeline
#2398
passed with stage
in 13 minutes and 4 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
packaging/appimage/3rdparty/CMakeLists.txt
View file @
85f5f1ba
...
...
@@ -108,6 +108,7 @@ add_subdirectory( ext_gdkpixbuf )
add_subdirectory
(
ext_gtk+
)
add_subdirectory
(
ext_gavl
)
add_subdirectory
(
ext_frei0r
)
add_subdirectory
(
ext_opencv
)
add_subdirectory
(
ext_vidstab
)
add_subdirectory
(
ext_mlt
)
add_subdirectory
(
ext_ruby
)
...
...
packaging/appimage/3rdparty/ext_opencv/CMakeLists.txt
View file @
85f5f1ba
# Script to build OpenCV for digiKam bundle.
#
# Copyright (c) 2015-2017, Gilles Caulier, <caulier dot gilles at gmail dot com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
set
(
EXTPREFIX_opencv
"
${
EXTPREFIX
}
"
)
set
(
Opencv_Conf -DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF
-DBUILD_DOCS=OFF
-DBUILD_PERF_TESTS=OFF
-DBUILD_NEW_PYTHON_SUPPORT=OFF
-BUILD_ZLIB=OFF
-DOPENCV_BUILD_3RDPARTY_LIBS=OFF
-DINSTALL_C_EXAMPLES=OFF
-DINSTALL_PYTHON_EXAMPLES=OFF
-DWITH_1394=OFF
-DWITH_VTK=OFF
-DWITH_CUDA=OFF
-DWITH_DIRECTX=OFF
-DWITH_DSHOW=OFF
-DWITH_EIGEN=OFF
-DWITH_FFMPEG=OFF
-DWITH_GSTREAMER=OFF
-DWITH_GTK=OFF
-DWITH_IPP=OFF
-DWITH_JASPER=OFF
-DWITH_JPEG=OFF
-DWITH_MATLAB=OFF
-DWITH_OPENEXR=OFF
-DWITH_OPENNI=OFF
-DWITH_PNG=OFF
-DWITH_PVAPI=OFF
-DWITH_WIN32UI=OFF
-DWITH_QT=OFF
-DWITH_QUICKTIME=OFF
-DWITH_QT_OPENGL=OFF
-DWITH_TBB=OFF
-DWITH_TIFF=OFF
-DWITH_UNICAP=OFF
-DWITH_V4L=OFF
-DWITH_VFW=OFF
-DWITH_VIDEOINPUT=OFF
-DWITH_XINE=OFF
-DWITH_OPENCL=OFF
-DWITH_GPHOTO2=OFF
-DBUILD_opencv_videoio=OFF
# The OpenCV contrib repo external project
ExternalProject_Add
(
ext_opencv_contrib
DOWNLOAD_DIR
${
EXT_DOWNLOAD_DIR
}
URL https://github.com/opencv/opencv_contrib/archive/4.1.0.tar.gz
URL_MD5 5357a038f54ba15c771abb0d91a5519d
# This is a support repository for OpenCV 4.x and does not contain any
# build or install rules. This will be hooked into OpenCV which will control
# those steps.
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
""
)
JoinListAsString
(
"
${
Opencv_Conf
}
"
" "
BASH_OPTIONS
)
if
(
MINGW
)
ExternalProject_Add
(
ext_opencv
URL https://github.com/Itseez/opencv/archive/3.2.0.zip
URL_MD5 bfc6a261eb069b709bcfe7e363ef5899
CMAKE_ARGS -DCMAKE_BUILD_TYPE=
${
GLOBAL_BUILD_TYPE
}
-DCMAKE_TOOLCHAIN_FILE=
${
MXE_TOOLCHAIN
}
-DCMAKE_INSTALL_PREFIX=
${
MXE_INSTALL_PREFIX
}
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
${
GLOBAL_PROFILE
}
${
Opencv_Conf
}
UPDATE_COMMAND
""
ALWAYS 0
)
ExternalProject_Add_step
(
ext_opencv before_download
# Note : under MXE, in case of curl is not compiled with https support,
# we cannot download the tarball as under Linux/MacOS.
# COMMAND wget -N https://github.com/Itseez/opencv/archive/3.2.0.zip -O ${EXTERNALS_DOWNLOAD_DIR}/3.2.0.zip
# DEPENDERS download
)
elseif
(
APPLE
)
ExternalProject_Add
(
ext_opencv
DOWNLOAD_DIR
${
EXTERNALS_DOWNLOAD_DIR
}
URL https://github.com/Itseez/opencv/archive/3.2.0.zip
URL_MD5 bfc6a261eb069b709bcfe7e363ef5899
CONFIGURE_COMMAND cp
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../bootstrap.macports <SOURCE_DIR>/. &&
<SOURCE_DIR>/bootstrap.macports
${
EXTPREFIX_opencv
}
RelWithDebInfo x86_64
"
${
BASH_OPTIONS
}
"
BUILD_COMMAND cd <SOURCE_DIR>/build && $
(
MAKE
)
INSTALL_COMMAND cd <SOURCE_DIR>/build && make install/fast
BUILD_IN_SOURCE 1
UPDATE_COMMAND
""
ALWAYS 0
)
else
()
#Linux
ExternalProject_Add
(
ext_opencv
DOWNLOAD_DIR
${
EXTERNALS_DOWNLOAD_DIR
}
URL https://github.com/Itseez/opencv/archive/3.2.0.zip
URL_MD5 bfc6a261eb069b709bcfe7e363ef5899
INSTALL_DIR
${
EXTPREFIX_opencv
}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
EXTPREFIX_opencv
}
-DCMAKE_BUILD_TYPE=
${
GLOBAL_BUILD_TYPE
}
${
GLOBAL_PROFILE
}
${
Opencv_Conf
}
UPDATE_COMMAND
""
ALWAYS 0
)
endif
()
# The OpenCV external project
ExternalProject_Add
(
ext_opencv
DOWNLOAD_DIR
${
EXT_DOWNLOAD_DIR
}
URL https://github.com/opencv/opencv/archive/4.1.0.tar.gz
URL_MD5 b80c59c7e4feee6a00608315e02b0b73
CMAKE_ARGS
${
CMAKE_GLOBAL_PROFILE
}
-DOPENCV_EXTRA_MODULES_PATH=
${
EXT_BUILD_DIR
}
/deps-build/ext_opencv/ext_opencv_contrib
DEPENDS ext_opencv_contrib
)
packaging/appimage/build-dependencies.sh
View file @
85f5f1ba
...
...
@@ -118,13 +118,12 @@ cmake --build . --target ext_gtk+
cmake
--build
.
--target
ext_gavl
cmake
--build
.
--target
ext_frei0r
cmake
--build
.
--target
ext_vidstab
#
cmake --build . --target ext_opencv
cmake
--build
.
--target
ext_opencv
#export CC=/usr/bin/gcc-6
#export CXX=/usr/bin/g++-6
#cmake --build . --target ext_movit
cmake
--build
.
--target
ext_mlt
cmake
--build
.
--target
ext_kbookmarks
cmake
--build
.
--target
ext_kxmlgui
cmake
--build
.
--target
ext_kconfigwidgets
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment