[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam-software-compilation] /: cleanup
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2015-10-31 23:11:31
Message-ID: E1ZsfJ5-0000wc-17 () scm ! kde ! org
[Download RAW message or body]
Git commit 4aad41ea79a0bd97fb821dba5a49b449d6d8c0ca by Gilles Caulier.
Committed on 31/10/2015 at 23:11.
Pushed by cgilles into branch 'master'.
cleanup
M +0 -1 .gitignore
M +0 -1 .gitslave.devel
M +0 -12 CMakeLists.txt
M +67 -68 DEPENDENCIES
M +0 -1 bootstrap.linux
M +0 -1 bootstrap.macports
M +0 -1 bootstrap.msvc.bat
M +0 -4 extra/CMakeLists.txt
http://commits.kde.org/scratch/mwiesweg/digikam-sc/4aad41ea79a0bd97fb821dba5a49b449d6d8c0ca
diff --git a/.gitignore b/.gitignore
index 67bbbdd..e70bcc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
core
-extra/libkface
extra/kipi-plugins
extra/libkipi
extra/libksane
diff --git a/.gitslave.devel b/.gitslave.devel
index 303c724..1116062 100644
--- a/.gitslave.devel
+++ b/.gitslave.devel
@@ -1,5 +1,4 @@
"^libkipi" "extra/libkipi"
-"^libkface" "extra/libkface"
"^libksane" "extra/libksane"
"^libmediawiki" "extra/libmediawiki"
"^libkvkontakte" "extra/libkvkontakte"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cb15da..b7be814 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,6 @@ option(DIGIKAMSC_COMPILE_DOC "Build handbook files (default=ON)"
# shared libs options for developers only
option(DIGIKAMSC_COMPILE_LIBKIPI "Build local libkipi library instead of using distributed files \
(default=OFF)" OFF)
-option(DIGIKAMSC_COMPILE_LIBKFACE "Build local libkface library instead of using distributed \
files (default=OFF)" OFF) option(DIGIKAMSC_COMPILE_LIBKSANE "Build local libksane \
library instead of using distributed files (default=OFF)" OFF) \
option(DIGIKAMSC_COMPILE_LIBMEDIAWIKI "Build local libmediawiki library instead of using distributed \
files (default=OFF)" OFF) option(DIGIKAMSC_COMPILE_LIBKVKONTAKTE "Build local libkvkontakte \
library instead of using distributed files (default=OFF)" OFF) @@ -110,17 +109,6 @@ else()
message(STATUS "Local shared libksane will be compiled......... NO")
endif()
-if(DIGIKAMSC_COMPILE_LIBKFACE)
- if(NOT EXISTS ${CMAKE_SOURCE_DIR}/extra/libkface)
- message(STATUS "Local shared libkface will be compiled.......... NO (library source code not \
available)")
- set (DIGIKAMSC_COMPILE_LIBKFACE OFF)
- else()
- message(STATUS "Local shared libkface will be compiled......... YES")
- endif()
-else()
- message(STATUS "Local shared libkface will be compiled......... NO")
-endif()
-
if(DIGIKAMSC_COMPILE_LIBMEDIAWIKI)
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/extra/libmediawiki)
message(STATUS "Local shared libmediawiki will be compiled.......... NO (library source code not \
available)")
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 7903121..cacbaa6 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,76 +1,75 @@
- libkface libkipi kipi-plugins \
digiKam version remarks \
TODO
- -------- ------- ------------ \
------- ------- ------- ---- + \
libkipi kipi-plugins digiKam version remarks \
TODO + ------- ------------ ------- \
------- ------- ----
-CMake X X X X \
>= 3.0.0 > 3.1.0 hightly recommended.
-ECM X X X X \
>= 1.7.0 +CMake X X X \
> >= 3.0.0 > 3.1.0 hightly recommended.
+ECM X X X >= \
1.7.0
-Qt5::Core X X X X \
>= 5.4.0
-Qt5::Gui X X X X \
>= 5.4.0
-Qt5::Widgets X X X X \
>= 5.4.0
-Qt5::Sql X X \
>= 5.4.0 Including Qt5 Sqlite plugin.
-Qt5::Xml X X X \
>= 5.4.0
-Qt5::Concurrent X X \
>= 5.4.0
-Qt5::WebKitWidgets X X \
>= 5.4.0
-Qt5::PrintSupport X X \
>= 5.4.0
-Qt5::DBus X \
>= 5.4.0
-Qt5::Network X \
>= 5.4.0
-Qt5::XmlPatterns X \
>= 5.4.0
-Qt5::Svg X \
>= 5.4.0
-Qt5::Multimedia opt \
>= 5.4.0 Optional due to Qt5 bug with GStreamer 1.0 Must be fixed with Qt 5.5.x. Need \
> testing (ENABLE_MEDIAPLAYER=on).
-Qt5::MultimediaWidgets opt \
>= 5.4.0 Optional due to Qt5 bug with GStreamer 1.0 Must be fixed with Qt 5.5.x. Need \
> testing (ENABLE_MEDIAPLAYER=on).
-Qt5::X11Extras opt \
>= 5.4.0 For color management support under Linux.
-Qt5::OpenGL opt \
>= 5.4.0 AdvSlideShow + ImageViewer tools.
-Qt5::Test opt opt \
>= 5.4.0 To compile test codes (BUILD_TESTING=on). +Qt5::Core X \
> X X >= 5.4.0
+Qt5::Gui X X X >= \
5.4.0 +Qt5::Widgets X X X \
>= 5.4.0 +Qt5::Sql X \
> >= 5.4.0 Including Qt5 Sqlite plugin.
+Qt5::Xml X X >= \
5.4.0 +Qt5::Concurrent X X \
>= 5.4.0 +Qt5::WebKitWidgets X X \
> >= 5.4.0
+Qt5::PrintSupport X X >= \
5.4.0 +Qt5::DBus X \
>= 5.4.0 +Qt5::Network X \
> >= 5.4.0
+Qt5::XmlPatterns X >= \
5.4.0 +Qt5::Svg X \
>= 5.4.0 +Qt5::Multimedia opt \
> >= 5.4.0 Optional due to Qt5 bug with GStreamer 1.0 Must be fixed with Qt 5.5.x. \
> > Need testing (ENABLE_MEDIAPLAYER=on).
+Qt5::MultimediaWidgets opt >= \
5.4.0 Optional due to Qt5 bug with GStreamer 1.0 Must be fixed with Qt 5.5.x. Need \
testing (ENABLE_MEDIAPLAYER=on). +Qt5::X11Extras \
opt >= 5.4.0 For color management support under Linux. +Qt5::OpenGL \
opt >= 5.4.0 AdvSlideShow + ImageViewer tools. \
+Qt5::Test opt opt >= \
5.4.0 To compile test codes (BUILD_TESTING=on).
-KF5::Config X X X \
>= 5.5.0
-KF5::I18n X X X \
>= 5.5.0
-KF5::XmlGui X X X \
>= 5.5.0
-KF5::Service X X X \
>= 5.5.0 Image Editor use KService : \
> remove plugins interface (Showfoto do not load plugins).
-KF5::KIO X X \
>= 5.5.0
-KF5::IconThemes X X \
>= 5.5.0
-KF5::WindowSystem X X \
>= 5.5.0
-KF5;;Solid X \
>= 5.5.0
-KF5;;NotifyConfig X \
>= 5.5.0
-KF5;;Notifications X \
>= 5.5.0
-KF5::ThreadWeaver opt \
>= 5.5.0 Panorama tool.
-KF5::Archive opt \
>= 5.5.0 FlashExport tool.
-KF5::CalendarCore opt \
>= 5.5.0 Calendar tool.
-KF5::ItemModels opt \
>= 5.5.0 Geolocation support. Replace by a pure Qt5 solution \
> (only used in gpsimagesortproxymodel.cpp).
-KF5::Bookmarks opt \
>= 5.5.0 Geolocation support.
-KF5::FileMetaData opt \
>= 5.5.0 KDE files indexer (ENABLE_KFILEMETADATASUPPORT=on) Still experimental, disabled by \
> default. Implementation from KDE side very unstable.
-KF5::AkonadiContact opt \
>= 5.5.0 KDE Mail contacts (ENABLE_AKONADICONTACTSUPPORT=on) Still experimental, disabled by \
> default. Need testing.
-KF5::Completion opt \
>= 5.5.0 Port to QLineEdit and QCompleter \
> (See searchtextbar.cpp modelcompletion.cpp).
-KF5::CoreAddons \
>= 5.5.0 CameraController use KProcess and \
> KMacroExpander.
+KF5::Config X X X >= \
5.5.0 +KF5::I18n X X X \
>= 5.5.0 +KF5::XmlGui X X X \
> >= 5.5.0
+KF5::Service X X X >= \
5.5.0 Image Editor use KService : remove \
plugins interface (Showfoto do not load plugins). +KF5::KIO X \
X >= 5.5.0 +KF5::IconThemes X \
X >= 5.5.0 +KF5::WindowSystem X \
X >= 5.5.0 +KF5;;Solid \
X >= 5.5.0 +KF5;;NotifyConfig \
X >= 5.5.0 +KF5;;Notifications \
X >= 5.5.0 +KF5::ThreadWeaver opt \
>= 5.5.0 Panorama tool. +KF5::Archive opt \
> >= 5.5.0 FlashExport tool.
+KF5::CalendarCore opt >= \
5.5.0 Calendar tool. +KF5::ItemModels \
opt >= 5.5.0 Geolocation support. Replace by a \
pure Qt5 solution (only used in gpsimagesortproxymodel.cpp). +KF5::Bookmarks \
opt >= 5.5.0 Geolocation support. +KF5::FileMetaData \
opt >= 5.5.0 KDE files indexer (ENABLE_KFILEMETADATASUPPORT=on) Still \
experimental, disabled by default. Implementation from KDE side very unstable. +KF5::AkonadiContact \
opt >= 5.5.0 KDE Mail contacts (ENABLE_AKONADICONTACTSUPPORT=on) Still \
experimental, disabled by default. Need testing. +KF5::Completion \
opt >= 5.5.0 Port to \
QLineEdit and QCompleter (See searchtextbar.cpp modelcompletion.cpp). +KF5::CoreAddons \
>= 5.5.0 CameraController use KProcess and \
> KMacroExpander.
-OpenCV X X \
2.x or 3.x Both versions supported using a cmake flag. 2.x support is stable, 3.x \
support is beta (with cmake option ENABLE_OPENCV3=on). Need testing.
-libpthread X \
>= 2.0.0 For DNG converter.
-libtiff X \
>= 4.0 For DImg image loader.
-libpng X \
>= 1.6 For DImg image loader.
-libjpeg X \
>= 6b jpeglib >= 8.0 hightly recommended for RawEngine.
-libpgf X \
>= 6.12.24 For thumbnails database image wavelets encoding.
-libboost X \
>= 1.55.0 For Versionning support.
-liblcms X \
>= 2.x For Color Management support.
-libexpat X \
>= 2.1.0 For DNG converter.
-libexiv2 X \
>= 0.25 Metadata low level management. 0.24 deprecated.
-Flex opt \
>= 2.5 Panorama tool.
-Bison opt \
>= 3.0 Panorama tool.
-Phonon4Qt5 opt \
>= 4.8.3 AdvSlideShow tool. Port to \
> Qt5::Multimedia/MultimediaWidgets.
-libmesa opt \
>= 11.0 AdvSlideShow + ImageViewer tools (Linux only).
-libqtkoauth opt \
>= 0.97 ImgUr tool.
-libmediawiki opt \
>= 5.5.0 MediaWiki tool (DIGIKAMSC_COMPILE_LIBMEDIAWIKI=on)
-libkvkontakte opt \
>= 4.70.0 Vkontakte tool (DIGIKAMSC_COMPILE_LIBKVKONTAKTE=on)
-libkface opt \
>= 5.0.0 Faces management (DIGIKAMSC_COMPILE_LIBKFACE=on).
-libkipi opt \
>= 5.0.0 Kipi-plugins support (DIGIKAMSC_COMPILE_LIBKIPI=on)
-libksane opt \
>= 5.0.0 Digital scanner (DIGIKAMSC_COMPILE_LIBKSANE=on).
-libjpasper opt \
>= 1.900.1 For JPEG-2000 support.
-libmarble opt \
>= 0.21.80 For geolocation support.
-libeigen3 opt \
>= 3.2 Refocus tool. See if Clapack from OpenCV can be \
> used instead.
-liblensfun opt \
>= 0.2.8 LensCorrection tool.
-liblqr-1 opt \
>= 0.4.2 Liquid rescale tool.
-libgphoto2 opt \
>= 2.5 Digital camera drivers support.
-libgomp opt \
>= 5.0 OpenMP support for RawEngine.
-libxml2 opt \
>= 2.0 RawSpeed Codecs support for RawEngine. +OpenCV \
> X 2.x or 3.x Both versions supported using a cmake flag. 2.x support \
> is stable, 3.x support is beta (with cmake option ENABLE_OPENCV3=on). Need testing.
+libpthread X >= \
2.0.0 For DNG converter. +libtiff \
X >= 4.0 For DImg image loader. +libpng \
X >= 1.6 For DImg image loader. +libjpeg \
X >= 6b jpeglib >= 8.0 hightly recommended for RawEngine. +libpgf \
X >= 6.12.24 For thumbnails database image wavelets encoding. +libboost \
X >= 1.55.0 For Versionning support. +liblcms \
X >= 2.x For Color Management support. +libexpat \
X >= 2.1.0 For DNG converter. +libexiv2 \
X >= 0.25 Metadata low level management. 0.24 deprecated. +Flex \
opt >= 2.5 Panorama tool. +Bison \
opt >= 3.0 Panorama tool. +Phonon4Qt5 \
opt >= 4.8.3 AdvSlideShow tool. \
Port to Qt5::Multimedia/MultimediaWidgets. +libmesa opt \
>= 11.0 AdvSlideShow + ImageViewer tools (Linux only). +libqtkoauth \
> opt >= 0.97 ImgUr tool.
+libmediawiki opt >= \
5.5.0 MediaWiki tool (DIGIKAMSC_COMPILE_LIBMEDIAWIKI=on) +libkvkontakte \
opt >= 4.70.0 Vkontakte tool \
(DIGIKAMSC_COMPILE_LIBKVKONTAKTE=on) +libkipi \
opt >= 5.0.0 Kipi-plugins support (DIGIKAMSC_COMPILE_LIBKIPI=on) +libksane \
opt >= 5.0.0 Digital scanner (DIGIKAMSC_COMPILE_LIBKSANE=on). +libjpasper \
opt >= 1.900.1 For JPEG-2000 support. +libmarble \
opt >= 0.21.80 For geolocation support. +libeigen3 \
opt >= 3.2 Refocus tool. See if \
Clapack from OpenCV can be used instead. +liblensfun \
opt >= 0.2.8 LensCorrection tool. +liblqr-1 \
opt >= 0.4.2 Liquid rescale tool. +libgphoto2 \
opt >= 2.5 Digital camera drivers support. +libgomp \
opt >= 5.0 OpenMP support for RawEngine. +libxml2 \
opt >= 2.0 RawSpeed Codecs support for RawEngine.
diff --git a/bootstrap.linux b/bootstrap.linux
index a76f819..a3ccc6a 100755
--- a/bootstrap.linux
+++ b/bootstrap.linux
@@ -69,7 +69,6 @@ cmake -G "$MAKEFILES_TYPE" . \
-DDIGIKAMSC_COMPILE_PO=OFF \
-DDIGIKAMSC_COMPILE_DOC=OFF \
-DDIGIKAMSC_COMPILE_LIBKIPI=ON \
- -DDIGIKAMSC_COMPILE_LIBKFACE=ON \
-DDIGIKAMSC_COMPILE_LIBKSANE=ON \
-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \
-DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
diff --git a/bootstrap.macports b/bootstrap.macports
index 125a505..d8a7b56 100755
--- a/bootstrap.macports
+++ b/bootstrap.macports
@@ -55,7 +55,6 @@ cmake -G "$MAKEFILES_TYPE" . \
-DDIGIKAMSC_COMPILE_PO=OFF \
-DDIGIKAMSC_COMPILE_DOC=ON \
-DDIGIKAMSC_COMPILE_LIBKIPI=ON \
- -DDIGIKAMSC_COMPILE_LIBKFACE=ON \
-DDIGIKAMSC_COMPILE_LIBKSANE=ON \
-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \
-DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
diff --git a/bootstrap.msvc.bat b/bootstrap.msvc.bat
index 82f03c1..c743f48 100755
--- a/bootstrap.msvc.bat
+++ b/bootstrap.msvc.bat
@@ -32,7 +32,6 @@ cmake -G "NMake Makefiles" . ^
-DDIGIKAMSC_COMPILE_PO=OFF ^
-DDIGIKAMSC_COMPILE_DOC=ON ^
-DDIGIKAMSC_COMPILE_LIBKIPI=ON ^
- -DDIGIKAMSC_COMPILE_LIBKFACE=ON ^
-DDIGIKAMSC_COMPILE_LIBKSANE=ON ^
-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON ^
-DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 2c5a81e..bb0ce85 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -8,10 +8,6 @@ if(DIGIKAMSC_COMPILE_LIBKIPI)
add_subdirectory(libkipi)
endif()
-if(DIGIKAMSC_COMPILE_LIBKFACE)
- ECM_OPTIONAL_ADD_SUBDIRECTORY(libkface)
-endif()
-
if(DIGIKAMSC_COMPILE_LIBKSANE)
ECM_OPTIONAL_ADD_SUBDIRECTORY(libksane)
endif()
[prev in list] [next in list] [prev in thread] [next in thread]