From kde-commits Sat Oct 31 23:11:31 2015 From: Gilles Caulier Date: Sat, 31 Oct 2015 23:11:31 +0000 To: kde-commits Subject: [digikam-software-compilation] /: cleanup Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=144633310100611 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/4aad41ea79a0bd97fb821dba= 5a49b449d6d8c0ca 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=3DON)" # shared libs options for developers only = option(DIGIKAMSC_COMPILE_LIBKIPI "Build local libkipi library inst= ead of using distributed files (default=3DOFF)" OFF) -option(DIGIKAMSC_COMPILE_LIBKFACE "Build local libkface library ins= tead of using distributed files (default=3DOFF)" OFF) option(DIGIKAMSC_COMPILE_LIBKSANE "Build local libksane library ins= tead of using distributed files (default=3DOFF)" OFF) option(DIGIKAMSC_COMPILE_LIBMEDIAWIKI "Build local libmediawiki library= instead of using distributed files (default=3DOFF)" OFF) option(DIGIKAMSC_COMPILE_LIBKVKONTAKTE "Build local libkvkontakte librar= y instead of using distributed files (default=3DOFF)" 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.......... N= O (library source code not available)") - set (DIGIKAMSC_COMPILE_LIBKFACE OFF) - else() - message(STATUS "Local shared libkface will be compiled......... YE= S") - 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-p= lugins digiKam version remarks = TODO - -------- ------- ------= ------ ------- ------- ------- = ---- + libkipi kipi-plugins = digiKam version remarks = TODO + ------- ------------ = ------- ------- ------- = ---- = = -CMake X X X = X >=3D 3.0.0 > 3.1.0= hightly recommended. -ECM X X X = X >=3D 1.7.0 +CMake X X = X >=3D 3.0.0 > 3.1.0 hightly recommended. +ECM X X = X >=3D 1.7.0 = = -Qt5::Core X X X = X >=3D 5.4.0 -Qt5::Gui X X X = X >=3D 5.4.0 -Qt5::Widgets X X X = X >=3D 5.4.0 -Qt5::Sql X = X >=3D 5.4.0 Includi= ng Qt5 Sqlite plugin. -Qt5::Xml X X = X >=3D 5.4.0 -Qt5::Concurrent X = X >=3D 5.4.0 -Qt5::WebKitWidgets X = X >=3D 5.4.0 -Qt5::PrintSupport X = X >=3D 5.4.0 -Qt5::DBus = X >=3D 5.4.0 -Qt5::Network X = >=3D 5.4.0 -Qt5::XmlPatterns X = >=3D 5.4.0 -Qt5::Svg X = >=3D 5.4.0 -Qt5::Multimedia = opt >=3D 5.4.0 Optiona= l due to Qt5 bug with GStreamer 1.0 Must be fixed with Qt 5.5.x. N= eed testing (ENABLE_MEDIAPLAYER=3Don). -Qt5::MultimediaWidgets = opt >=3D 5.4.0 Optiona= l due to Qt5 bug with GStreamer 1.0 Must be fixed with Qt 5.5.x. N= eed testing (ENABLE_MEDIAPLAYER=3Don). -Qt5::X11Extras = opt >=3D 5.4.0 For col= or management support under Linux. -Qt5::OpenGL opt= >=3D 5.4.0 AdvSlid= eShow + ImageViewer tools. -Qt5::Test opt= opt >=3D 5.4.0 To comp= ile test codes (BUILD_TESTING=3Don). +Qt5::Core X X = X >=3D 5.4.0 +Qt5::Gui X X = X >=3D 5.4.0 +Qt5::Widgets X X = X >=3D 5.4.0 +Qt5::Sql = X >=3D 5.4.0 Including Qt5 Sqlite plugin. +Qt5::Xml X = X >=3D 5.4.0 +Qt5::Concurrent X = X >=3D 5.4.0 +Qt5::WebKitWidgets X = X >=3D 5.4.0 +Qt5::PrintSupport X = X >=3D 5.4.0 +Qt5::DBus = X >=3D 5.4.0 +Qt5::Network X = >=3D 5.4.0 +Qt5::XmlPatterns X = >=3D 5.4.0 +Qt5::Svg X = >=3D 5.4.0 +Qt5::Multimedia = opt >=3D 5.4.0 Optional due to Qt5 bug wit= h GStreamer 1.0 Must be fixed with Qt 5.5.x. Need testing (ENABLE_= MEDIAPLAYER=3Don). +Qt5::MultimediaWidgets = opt >=3D 5.4.0 Optional due to Qt5 bug wit= h GStreamer 1.0 Must be fixed with Qt 5.5.x. Need testing (ENABLE_= MEDIAPLAYER=3Don). +Qt5::X11Extras = opt >=3D 5.4.0 For color management suppor= t under Linux. +Qt5::OpenGL opt = >=3D 5.4.0 AdvSlideShow + ImageViewer = tools. +Qt5::Test opt = opt >=3D 5.4.0 To compile test codes (BUIL= D_TESTING=3Don). = = -KF5::Config X X = X >=3D 5.5.0 -KF5::I18n X X = X >=3D 5.5.0 -KF5::XmlGui X X = X >=3D 5.5.0 -KF5::Service X X = X >=3D 5.5.0 = Image Editor use KService : re= move plugins interface (Showfoto do not load plugins). -KF5::KIO X = X >=3D 5.5.0 -KF5::IconThemes X = X >=3D 5.5.0 -KF5::WindowSystem X = X >=3D 5.5.0 -KF5;;Solid = X >=3D 5.5.0 -KF5;;NotifyConfig = X >=3D 5.5.0 -KF5;;Notifications = X >=3D 5.5.0 -KF5::ThreadWeaver opt= >=3D 5.5.0 Panoram= a tool. -KF5::Archive opt= >=3D 5.5.0 FlashEx= port tool. -KF5::CalendarCore opt= >=3D 5.5.0 Calenda= r tool. -KF5::ItemModels = opt >=3D 5.5.0 Geoloca= tion support. Replace by a pure Qt5 solution= (only used in gpsimagesortproxymodel.cpp). -KF5::Bookmarks = opt >=3D 5.5.0 Geoloca= tion support. -KF5::FileMetaData = opt >=3D 5.5.0 KDE fil= es indexer (ENABLE_KFILEMETADATASUPPORT=3Don) Still experimental, disabled= by default. Implementation from KDE side very unstable. -KF5::AkonadiContact = opt >=3D 5.5.0 KDE Mai= l contacts (ENABLE_AKONADICONTACTSUPPORT=3Don) Still experimental, disabled= by default. Need testing. -KF5::Completion = opt >=3D 5.5.0 = Port to QLineEdit and QComplet= er (See searchtextbar.cpp modelcompletion.cpp). -KF5::CoreAddons = >=3D 5.5.0 = CameraController use KProcess = and KMacroExpander. +KF5::Config X X = X >=3D 5.5.0 +KF5::I18n X X = X >=3D 5.5.0 +KF5::XmlGui X X = X >=3D 5.5.0 +KF5::Service X X = X >=3D 5.5.0 = Image Editor use KService : remove plugins interfa= ce (Showfoto do not load plugins). +KF5::KIO X = X >=3D 5.5.0 +KF5::IconThemes X = X >=3D 5.5.0 +KF5::WindowSystem X = X >=3D 5.5.0 +KF5;;Solid = X >=3D 5.5.0 +KF5;;NotifyConfig = X >=3D 5.5.0 +KF5;;Notifications = X >=3D 5.5.0 +KF5::ThreadWeaver opt = >=3D 5.5.0 Panorama tool. +KF5::Archive opt = >=3D 5.5.0 FlashExport tool. +KF5::CalendarCore opt = >=3D 5.5.0 Calendar tool. +KF5::ItemModels = opt >=3D 5.5.0 Geolocation support. = Replace by a pure Qt5 solution (only used in gpsim= agesortproxymodel.cpp). +KF5::Bookmarks = opt >=3D 5.5.0 Geolocation support. +KF5::FileMetaData = opt >=3D 5.5.0 KDE files indexer (ENABLE_K= FILEMETADATASUPPORT=3Don) Still experimental, disabled by default. Impleme= ntation from KDE side very unstable. +KF5::AkonadiContact = opt >=3D 5.5.0 KDE Mail contacts (ENABLE_A= KONADICONTACTSUPPORT=3Don) Still experimental, disabled by default. Need te= sting. +KF5::Completion = opt >=3D 5.5.0 = Port to QLineEdit and QCompleter (See searchtextba= r.cpp modelcompletion.cpp). +KF5::CoreAddons = >=3D 5.5.0 = CameraController use KProcess and KMacroExpander. = = -OpenCV X = X 2.x or 3.x Both vers= ions supported using a cmake flag. 2.x support is stable, 3.x suppo= rt is beta (with cmake option ENABLE_OPENCV3=3Don). Need testing. -libpthread = X >=3D 2.0.0 For DNG= converter. -libtiff = X >=3D 4.0 For DIm= g image loader. -libpng = X >=3D 1.6 For DIm= g image loader. -libjpeg = X >=3D 6b jpeglib= >=3D 8.0 hightly recommended for RawEngine. -libpgf = X >=3D 6.12.24 For thu= mbnails database image wavelets encoding. -libboost = X >=3D 1.55.0 For Ver= sionning support. -liblcms = X >=3D 2.x For Col= or Management support. -libexpat = X >=3D 2.1.0 For DNG= converter. -libexiv2 = X >=3D 0.25 Metadat= a low level management. 0.24 deprecated. -Flex opt= >=3D 2.5 Panoram= a tool. -Bison opt= >=3D 3.0 Panoram= a tool. -Phonon4Qt5 opt= >=3D 4.8.3 AdvSlid= eShow tool. Port to Qt5::Multimedia/Multim= ediaWidgets. -libmesa opt= >=3D 11.0 AdvSlid= eShow + ImageViewer tools (Linux only). -libqtkoauth opt= >=3D 0.97 ImgUr t= ool. -libmediawiki opt= >=3D 5.5.0 MediaWi= ki tool (DIGIKAMSC_COMPILE_LIBMEDIAWIKI=3Don) -libkvkontakte opt= >=3D 4.70.0 Vkontak= te tool (DIGIKAMSC_COMPILE_LIBKVKONTAKTE=3Don) -libkface = opt >=3D 5.0.0 Faces m= anagement (DIGIKAMSC_COMPILE_LIBKFACE=3Don). -libkipi = opt >=3D 5.0.0 Kipi-pl= ugins support (DIGIKAMSC_COMPILE_LIBKIPI=3Don) -libksane = opt >=3D 5.0.0 Digital= scanner (DIGIKAMSC_COMPILE_LIBKSANE=3Don). -libjpasper = opt >=3D 1.900.1 For JPE= G-2000 support. -libmarble = opt >=3D 0.21.80 For geo= location support. -libeigen3 = opt >=3D 3.2 Refocus= tool. See if Clapack from OpenCV can= be used instead. -liblensfun = opt >=3D 0.2.8 LensCor= rection tool. -liblqr-1 = opt >=3D 0.4.2 Liquid = rescale tool. -libgphoto2 = opt >=3D 2.5 Digital= camera drivers support. -libgomp = opt >=3D 5.0 OpenMP = support for RawEngine. -libxml2 = opt >=3D 2.0 RawSpee= d 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 cma= ke option ENABLE_OPENCV3=3Don). Need testing. +libpthread = X >=3D 2.0.0 For DNG converter. +libtiff = X >=3D 4.0 For DImg image loader. +libpng = X >=3D 1.6 For DImg image loader. +libjpeg = X >=3D 6b jpeglib >=3D 8.0 hightly re= commended for RawEngine. +libpgf = X >=3D 6.12.24 For thumbnails database ima= ge wavelets encoding. +libboost = X >=3D 1.55.0 For Versionning support. +liblcms = X >=3D 2.x For Color Management suppor= t. +libexpat = X >=3D 2.1.0 For DNG converter. +libexiv2 = X >=3D 0.25 Metadata low level manageme= nt. 0.24 deprecated. +Flex opt = >=3D 2.5 Panorama tool. +Bison opt = >=3D 3.0 Panorama tool. +Phonon4Qt5 opt = >=3D 4.8.3 AdvSlideShow tool. = Port to Qt5::Multimedia/MultimediaWidgets. +libmesa opt = >=3D 11.0 AdvSlideShow + ImageViewer = tools (Linux only). +libqtkoauth opt = >=3D 0.97 ImgUr tool. +libmediawiki opt = >=3D 5.5.0 MediaWiki tool (DIGIKAMSC_C= OMPILE_LIBMEDIAWIKI=3Don) +libkvkontakte opt = >=3D 4.70.0 Vkontakte tool (DIGIKAMSC_C= OMPILE_LIBKVKONTAKTE=3Don) +libkipi = opt >=3D 5.0.0 Kipi-plugins support (DIGIK= AMSC_COMPILE_LIBKIPI=3Don) +libksane = opt >=3D 5.0.0 Digital scanner (DIGIKAMSC_= COMPILE_LIBKSANE=3Don). +libjpasper = opt >=3D 1.900.1 For JPEG-2000 support. +libmarble = opt >=3D 0.21.80 For geolocation support. +libeigen3 = opt >=3D 3.2 Refocus tool. = See if Clapack from OpenCV can be used instead. +liblensfun = opt >=3D 0.2.8 LensCorrection tool. +liblqr-1 = opt >=3D 0.4.2 Liquid rescale tool. +libgphoto2 = opt >=3D 2.5 Digital camera drivers supp= ort. +libgomp = opt >=3D 5.0 OpenMP support for RawEngin= e. +libxml2 = opt >=3D 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=3DOFF \ -DDIGIKAMSC_COMPILE_DOC=3DOFF \ -DDIGIKAMSC_COMPILE_LIBKIPI=3DON \ - -DDIGIKAMSC_COMPILE_LIBKFACE=3DON \ -DDIGIKAMSC_COMPILE_LIBKSANE=3DON \ -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=3DON \ -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=3DON \ 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=3DOFF \ -DDIGIKAMSC_COMPILE_DOC=3DON \ -DDIGIKAMSC_COMPILE_LIBKIPI=3DON \ - -DDIGIKAMSC_COMPILE_LIBKFACE=3DON \ -DDIGIKAMSC_COMPILE_LIBKSANE=3DON \ -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=3DON \ -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=3DON \ 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=3DOFF ^ -DDIGIKAMSC_COMPILE_DOC=3DON ^ -DDIGIKAMSC_COMPILE_LIBKIPI=3DON ^ - -DDIGIKAMSC_COMPILE_LIBKFACE=3DON ^ -DDIGIKAMSC_COMPILE_LIBKSANE=3DON ^ -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=3DON ^ -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=3DON \ 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()