rev 12765 - in kde-extras/kipi-plugins/branches/kde4: . debian
Mark Purcell
msp at alioth.debian.org
Fri Nov 28 22:58:28 UTC 2008
Author: msp
Date: 2008-11-28 22:58:28 +0000 (Fri, 28 Nov 2008)
New Revision: 12765
Added:
kde-extras/kipi-plugins/branches/kde4/CMakeLists.txt
Removed:
kde-extras/kipi-plugins/branches/kde4/debian/TODO
Modified:
kde-extras/kipi-plugins/branches/kde4/debian/changelog
Log:
* (NOT RELEASED YET) New upstream release
* FTBFS ;-(
Added: kde-extras/kipi-plugins/branches/kde4/CMakeLists.txt
===================================================================
--- kde-extras/kipi-plugins/branches/kde4/CMakeLists.txt (rev 0)
+++ kde-extras/kipi-plugins/branches/kde4/CMakeLists.txt 2008-11-28 22:58:28 UTC (rev 12765)
@@ -0,0 +1,348 @@
+PROJECT(kipi-plugins)
+
+# =======================================================
+# Informations to update before to release this package.
+
+# kipi-plugins version
+SET(KIPIPLUGINS_MAJOR_VERSION "0")
+SET(KIPIPLUGINS_MINOR_VERSION "2")
+SET(KIPIPLUGINS_PATCH_VERSION "0")
+
+# Suffix to add at end of version string. Usual values are:
+# "-svn" : alpha code unstable from svn. Do not use in production
+# "-beta1" : beta1 release.
+# "-beta2" : beta2 release.
+# "-beta3" : beta3 release.
+# "-rc" : release candidate.
+# "" : final relase. Can be used in production.
+SET(KIPIPLUGINS_SUFFIX_VERSION "-beta3")
+
+# =======================================================
+# Set env. variables accordinly.
+
+SET(KIPIPLUGINS_VERSION_STRING
+ "${KIPIPLUGINS_MAJOR_VERSION}.${KIPIPLUGINS_MINOR_VERSION}.${KIPIPLUGINS_PATCH_VERSION}${KIPIPLUGINS_SUFFIX_VERSION}"
+ )
+
+# =======================================================
+
+FIND_PACKAGE(KDE4 REQUIRED)
+
+INCLUDE(MacroOptionalFindPackage)
+INCLUDE(FindPackageHandleStandardArgs)
+INCLUDE(KDE4Defaults)
+INCLUDE(MacroLibrary)
+
+# Depencies detection required by all plugins
+FIND_PACKAGE(Kexiv2 REQUIRED)
+FIND_PACKAGE(Kdcraw REQUIRED)
+FIND_PACKAGE(Kipi REQUIRED)
+FIND_PACKAGE(JPEG REQUIRED)
+FIND_PACKAGE(PNG REQUIRED)
+FIND_PACKAGE(TIFF REQUIRED)
+
+# Optional depencies detection required by some plugins
+
+MACRO_OPTIONAL_FIND_PACKAGE(Sane) # For AcquireImages
+MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile.
+MACRO_OPTIONAL_FIND_PACKAGE(Threads) # For DNGConverter: DNG SDK need native threads support.
+MACRO_OPTIONAL_FIND_PACKAGE(LibXml2) # For Htmlexport
+MACRO_OPTIONAL_FIND_PACKAGE(LibXslt) # For Htmlexport
+MACRO_OPTIONAL_FIND_PACKAGE(OpenGL) # For Slideshow and ImageViewer
+
+# LINUX Only need X11.
+IF(NOT WIN32 AND NOT APPLE)
+ MACRO_OPTIONAL_FIND_PACKAGE(X11) # For Slideshow and ImageViewer (under Linux)
+ENDIF(NOT WIN32 AND NOT APPLE)
+
+IF(NOT WIN32)
+ # Check KDcraw version installed to compile fine DngConverter plugin.
+ FIND_PACKAGE(PkgConfig)
+ PKG_CHECK_MODULES(Kdcraw libkdcraw>=0.4.0)
+ IF(Kdcraw_FOUND)
+ SET(KDCRAW_FOR_DNGCONVERTER TRUE)
+ ELSE(Kdcraw_FOUND)
+ SET(KDCRAW_FOR_DNGCONVERTER FALSE)
+ SET(KDCRAW_FOUND FALSE)
+ ENDIF(Kdcraw_FOUND)
+ELSE(NOT WIN32)
+ SET(KDCRAW_FOR_DNGCONVERTER TRUE)
+ENDIF(NOT WIN32)
+
+INCLUDE(MacroOptionalDependPackage)
+MACRO_OPTIONAL_DEPEND_PACKAGE(KSane "ksane")
+IF(DEPEND_PACKAGE_KSane)
+ MACRO_OPTIONAL_FIND_PACKAGE(KSane) # For AcquireImages
+ELSE(DEPEND_PACKAGE_KSane)
+ SET(KSANE_FOUND FALSE)
+ENDIF(DEPEND_PACKAGE_KSane)
+
+# TODO: add others optional depencies to check when others plugins will be ported to KDE4
+#
+# ipodexport need Gpod library
+# calendar need Kcal library (KDEPIM)
+
+# ==================================================================================================
+# Log messages
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "----------------------------------------------------------------------------------")
+MESSAGE(STATUS " kipi-plugins ${KIPIPLUGINS_VERSION_STRING} dependencies results <http://www.kipi-plugins.org>")
+MESSAGE(STATUS "")
+
+IF(JPEG_FOUND)
+ MESSAGE(STATUS " libjpeg library found............... YES")
+ELSE(JPEG_FOUND)
+ MESSAGE(STATUS " libjpeg library found............... NO")
+ MESSAGE(STATUS "")
+ MESSAGE(SEND_ERROR " kipi-plugins needs libjpeg. You need to install the libjpeg development package.")
+ MESSAGE(STATUS " libjpeg website is at http://www.ijg.org")
+ MESSAGE(STATUS "")
+ENDIF(JPEG_FOUND)
+
+IF(TIFF_FOUND)
+ MESSAGE(STATUS " libtiff library found............... YES")
+ELSE(TIFF_FOUND)
+ MESSAGE(STATUS " libtiff library found............... NO")
+ MESSAGE(STATUS "")
+ MESSAGE(SEND_ERROR " kipi-plugins needs libtiff. You need to install the libtiff development package.")
+ MESSAGE(STATUS " libtiff website is at http://www.remotesensing.org/libtiff")
+ MESSAGE(STATUS "")
+ENDIF(TIFF_FOUND)
+
+IF(PNG_FOUND)
+ MESSAGE(STATUS " libpng library found................ YES")
+ELSE(PNG_FOUND)
+ MESSAGE(STATUS " libpng library found................ NO")
+ MESSAGE(STATUS "")
+ MESSAGE(SEND_ERROR " kipi-plugins needs libpng. You need to install the correct version (>= 1.2.7).")
+ MESSAGE(STATUS " Libpng website is at http://www.libpng.org/pub/png/libpng.html")
+ MESSAGE(STATUS "")
+ENDIF(PNG_FOUND)
+
+IF(KIPI_FOUND)
+ MESSAGE(STATUS " libkipi library found............... YES")
+ELSE(KIPI_FOUND)
+ MESSAGE(STATUS " libkipi library found............... NO")
+ MESSAGE(STATUS "")
+ MESSAGE(SEND_ERROR " kipi-plugins needs libkipi library >= 0.2.0. You need to install libkipi first")
+ MESSAGE(STATUS " libkipi website is at http://www.kipi-plugins.org")
+ MESSAGE(STATUS "")
+ENDIF(KIPI_FOUND)
+
+IF(KEXIV2_FOUND)
+ MESSAGE(STATUS " libkexiv2 library found............. YES")
+ELSE(KEXIV2_FOUND)
+ MESSAGE(STATUS " libkexiv2 library found............. NO")
+ MESSAGE(STATUS "")
+ MESSAGE(SEND_ERROR " kipi-plugins needs libkexiv2 library >= 0.2.0. You need to install libkexiv2 first")
+ MESSAGE(STATUS " libkexiv2 website is at http://www.kipi-plugins.org")
+ MESSAGE(STATUS "")
+ENDIF(KEXIV2_FOUND)
+
+IF(KDCRAW_FOUND)
+ MESSAGE(STATUS " libkdcraw library found............. YES")
+ELSE(KDCRAW_FOUND)
+ MESSAGE(STATUS " libkdcraw library found............. NO")
+ MESSAGE(STATUS "")
+ MESSAGE(SEND_ERROR " kipi-plugins needs libkdcraw library >= 0.4.0. You need to install libkdcraw first")
+ MESSAGE(STATUS " libkdcraw website is at http://www.kipi-plugins.org")
+ MESSAGE(STATUS "")
+ENDIF(KDCRAW_FOUND)
+
+IF(KSANE_FOUND)
+ MESSAGE(STATUS " libksane library found.............. YES (optional)")
+ELSE(KSANE_FOUND)
+ MESSAGE(STATUS " libksane library found.............. NO (optional)")
+ENDIF(KSANE_FOUND)
+
+IF(LIBXML2_FOUND)
+ MESSAGE(STATUS " libxml2 library found............... YES (optional)")
+ELSE(LIBXML2_FOUND)
+ MESSAGE(STATUS " libxml2 library found............... NO (optional)")
+ENDIF(LIBXML2_FOUND)
+
+IF(LIBXSLT_FOUND)
+ MESSAGE(STATUS " libxslt library found............... YES (optional)")
+ELSE(LIBXSLT_FOUND)
+ MESSAGE(STATUS " libxslt library found............... NO (optional)")
+ENDIF(LIBXSLT_FOUND)
+
+IF(EXPAT_FOUND)
+ MESSAGE(STATUS " libexpat library found.............. YES (optional)")
+ELSE(EXPAT_FOUND)
+ MESSAGE(STATUS " libexpat library found.............. NO (optional)")
+ENDIF(EXPAT_FOUND)
+
+IF(CMAKE_USE_PTHREADS_INIT OR CMAKE_USE_WIN32_THREADS_INIT)
+ MESSAGE(STATUS " native threads support found........ YES (optional)")
+ELSE(CMAKE_USE_PTHREADS_INIT OR CMAKE_USE_WIN32_THREADS_INIT)
+ MESSAGE(STATUS " native threads support found........ NO (optional)")
+ENDIF(CMAKE_USE_PTHREADS_INIT OR CMAKE_USE_WIN32_THREADS_INIT)
+
+IF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " libopengl library found............. YES (optional)")
+ELSE(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " libopengl library found............. NO (optional)")
+ENDIF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+
+# LINUX Only need X11.
+IF(NOT WIN32 AND NOT APPLE)
+ IF(X11_FOUND AND X11_Xrandr_FOUND)
+ MESSAGE(STATUS " libX11 library found................ YES (optional)")
+ ELSE(X11_FOUND AND X11_Xrandr_FOUND)
+ MESSAGE(STATUS " libX11 library found................ NO (optional)")
+ ENDIF(X11_FOUND AND X11_Xrandr_FOUND)
+ENDIF(NOT WIN32 AND NOT APPLE)
+
+IF(JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND KDCRAW_FOUND AND KEXIV2_FOUND AND KIPI_FOUND)
+ MESSAGE(STATUS " kipi-plugins will be compiled....... YES")
+ SET(KIPIPLUGINS_CAN_BE_COMPILED true)
+ELSE(JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND KDCRAW_FOUND AND KEXIV2_FOUND AND KIPI_FOUND)
+ MESSAGE(FATAL_ERROR " kipi-plugins will not be compiled! Look README file for more details about dependencies...")
+ SET(KIPIPLUGINS_CAN_BE_COMPILED false)
+ENDIF(JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND KDCRAW_FOUND AND KEXIV2_FOUND AND KIPI_FOUND)
+
+IF(SANE_FOUND AND KSANE_FOUND)
+ MESSAGE(STATUS " AcquireImages will be compiled...... YES (optional)")
+ELSE(SANE_FOUND AND KSANE_FOUND)
+ MESSAGE(STATUS " AcquireImages will be compiled...... NO (optional - Look README file for more details about dependencies)")
+ENDIF(SANE_FOUND AND KSANE_FOUND)
+
+IF(LIBXML2_FOUND AND LIBXSLT_FOUND)
+ MESSAGE(STATUS " HtmlExport will be compiled......... YES (optional)")
+ELSE(LIBXML2_FOUND AND LIBXSLT_FOUND)
+ MESSAGE(STATUS " HtmlExport will be compiled......... NO (optional - Look README file for more details about dependencies)")
+ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND)
+
+IF(NOT WIN32 AND NOT APPLE)
+ IF(X11_FOUND AND X11_Xrandr_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " SlideShow will be compiled.......... YES (optional)")
+ MESSAGE(STATUS " ImageViewer will be compiled........ YES (optional)")
+ ELSE(X11_FOUND AND X11_Xrandr_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " SlideShow will be compiled.......... NO (optional - Look README file for more details about dependencies)")
+ MESSAGE(STATUS " ImageViewer will be compiled........ NO (optional - Look README file for more details about dependencies)")
+ ENDIF(X11_FOUND AND X11_Xrandr_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ELSE(NOT WIN32 AND NOT APPLE)
+ IF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " SlideShow will be compiled.......... YES (optional)")
+ MESSAGE(STATUS " ImageViewer will be compiled........ YES (optional)")
+ ELSE(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " SlideShow will be compiled.......... NO (optional - Look README file for more details about dependencies)")
+ MESSAGE(STATUS " ImageViewer will be compiled........ NO (optional - Look README file for more details about dependencies)")
+ ENDIF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ENDIF(NOT WIN32 AND NOT APPLE)
+
+IF(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+ MESSAGE(STATUS " DNGConverter will be compiled....... YES (optional)")
+ELSE(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+ MESSAGE(STATUS " DNGConverter will be compiled....... NO (optional - Look README file for more details about dependencies)")
+ENDIF(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+
+MESSAGE(STATUS "----------------------------------------------------------------------------------")
+MESSAGE(STATUS "")
+
+# ==================================================================================================
+
+IF(KIPIPLUGINS_CAN_BE_COMPILED)
+
+ # ==================================================================================================
+ # Create svn version header
+
+ # See http://public.kitware.com/pipermail/cmake/2006-July/010299.html
+ # We only do this IF we are in a .svn dir
+
+ FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn)
+
+ IF(NOT SVN_MARKER)
+ SET (SVN_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt) # Dummy file
+ ENDIF(NOT SVN_MARKER)
+
+ # Add a custom command to drive the svn script whenever the svn entries
+ # file changes.
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/svnscript.cmake.in_cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake"
+ @ONLY)
+
+ ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/svnversion.h"
+ DEPENDS ${SVN_MARKER}
+ COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake")
+
+ # Add a custom target to drive the custom command.
+ ADD_CUSTOM_TARGET(svnversion
+ ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/svnversion.h")
+
+ # ==================================================================================================
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins
+ ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins
+ ${KEXIV2_INCLUDE_DIR}
+ ${KDCRAW_INCLUDE_DIR}
+ ${KIPI_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${QT4_INCLUDES}
+ )
+
+ # Plugins which will be always compiled
+
+ ADD_SUBDIRECTORY(common)
+ ADD_SUBDIRECTORY(timeadjust)
+ ADD_SUBDIRECTORY(jpeglossless)
+ ADD_SUBDIRECTORY(rawconverter)
+ ADD_SUBDIRECTORY(metadataedit)
+ ADD_SUBDIRECTORY(sendimages)
+ ADD_SUBDIRECTORY(gpssync)
+ ADD_SUBDIRECTORY(simpleviewerexport)
+ ADD_SUBDIRECTORY(flickrexport)
+ ADD_SUBDIRECTORY(galleryexport)
+
+ IF(NOT WIN32)
+ ADD_SUBDIRECTORY(picasawebexport) # Do not compile yet under Win32
+ ENDIF(NOT WIN32)
+
+ IF(SANE_FOUND AND KSANE_FOUND)
+ ADD_SUBDIRECTORY(acquireimages)
+ ENDIF(SANE_FOUND AND KSANE_FOUND)
+
+ IF(LIBXML2_FOUND AND LIBXSLT_FOUND)
+ ADD_SUBDIRECTORY(htmlexport)
+ ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND)
+
+ # Plugins which depend on OpenGL
+
+ IF(NOT WIN32 AND NOT APPLE)
+ IF(X11_FOUND AND X11_Xrandr_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ # Under LINUX we need X11 library with OpenGL.
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(slideshow)
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(imageviewer)
+ ENDIF(X11_FOUND AND X11_Xrandr_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ ELSE(NOT WIN32 AND NOT APPLE)
+ IF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(slideshow)
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(imageviewer)
+ ENDIF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ ENDIF(NOT WIN32 AND NOT APPLE)
+
+ IF(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+ IF(CMAKE_USE_PTHREADS_INIT OR CMAKE_USE_WIN32_THREADS_INIT)
+ ADD_SUBDIRECTORY(dngconverter)
+ ENDIF(CMAKE_USE_PTHREADS_INIT OR CMAKE_USE_WIN32_THREADS_INIT)
+ ENDIF(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+
+# Laurent Montel : wallpaper is currently disabled. Waiting new api with KDE 4.2
+#
+# FIND_FILE(KDESKTOP_INTERFACE_FILE_FOUND org.kde.kdesktop.Background.xml PATHS ${DBUS_INTERFACES_INSTALL_DIR} )
+#
+# IF(KDESKTOP_INTERFACE_FILE_FOUND)
+# ADD_SUBDIRECTORY( wallpaper )
+# ELSE(KDESKTOP_INTERFACE_FILE_FOUND)
+# MESSAGE(STATUS "Wallpaper plugins will not compile. Kdebase (kdesktop) must be installed before compiling it")
+# ENDIF(KDESKTOP_INTERFACE_FILE_FOUND)
+
+ IF(NOT WIN32)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/kipi-plugins.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/kipi-plugins.lsm)
+ ENDIF(NOT WIN32)
+
+ENDIF(KIPIPLUGINS_CAN_BE_COMPILED)
+include(MacroOptionalAddSubdirectory)
+macro_optional_add_subdirectory( po )
Deleted: kde-extras/kipi-plugins/branches/kde4/debian/TODO
Modified: kde-extras/kipi-plugins/branches/kde4/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/branches/kde4/debian/changelog 2008-11-28 22:34:08 UTC (rev 12764)
+++ kde-extras/kipi-plugins/branches/kde4/debian/changelog 2008-11-28 22:58:28 UTC (rev 12765)
@@ -1,3 +1,9 @@
+kipi-plugins (0.2.0-beta4-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Nov 2008 09:53:36 +1100
+
kipi-plugins (0.2.0~beta3-1) UNRELEASED; urgency=low
* (NOT RELEASED YET) New upstream release
@@ -5,12 +11,6 @@
-- Mark Purcell <msp at debian.org> Thu, 30 Oct 2008 21:41:13 +1100
-kipi-plugins (0.1.6-2) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Mark Purcell <msp at debian.org> Thu, 16 Oct 2008 21:15:43 +1100
-
kipi-plugins (0.1.6-1) experimental; urgency=low
* New upstream release for KDE3
More information about the pkg-kde-commits
mailing list