diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmake --- old/cmake/modules/FindPGF.cmake 1969-12-31 21:00:00.000000000 -0300 +++ new/cmake/modules/FindPGF.cmake 2009-12-24 02:15:23.754769439 -0200 @@ -0,0 +1,15 @@ +# - Try to find libpgf +# Once done this will define +# +# PGF_FOUND - system has libgf +# PGF_INCLUDE_DIRS - the libpgf include directory +# PGF_LIBRARIES - Link these to use libpgf + +# PKG-CONFIG is required. +INCLUDE(FindPkgConfig REQUIRED) + +IF(PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) + + PKG_CHECK_MODULES(PGF libpgf) +ENDIF(PKG_CONFIG_FOUND) diff -ruN old/CMakeLists.txt new/CMakeLists.txt --- old/CMakeLists.txt 2009-12-21 07:30:05.000000000 -0200 +++ new/CMakeLists.txt 2009-12-24 02:15:23.755769330 -0200 @@ -34,6 +34,9 @@ "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" ) +# Path to find FindPGF.cmake script. +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") + # ================================================================================================== # Debug area codes # These codes will be set for every project specific path automatically, so @@ -63,6 +66,11 @@ FIND_PACKAGE(JPEG) FIND_PACKAGE(PNG) FIND_PACKAGE(TIFF) + +# Included to unbundle libpgf that is on portage tree. +# This function call the script cmake/modules/FindPGF.cmake +FIND_PACKAGE(PGF) + FIND_PACKAGE(Jasper) FIND_PACKAGE(Kdcraw) FIND_PACKAGE(Kexiv2) @@ -181,6 +189,16 @@ MESSAGE(STATUS "") ENDIF(PNG_FOUND) +IF(PGF_FOUND) + MESSAGE(STATUS " libpgf library found................ YES") +ELSE(PGF_FOUND) + MESSAGE(STATUS " libpgf library found................ NO") + MESSAGE(STATUS "") + MESSAGE(SEND_ERROR " digiKam needs libpgf since it was unbundled. You need to install the development package.") + MESSAGE(STATUS " Libpgf website is at http://www.libpgf.org") + MESSAGE(STATUS "") +ENDIF(PGF_FOUND) + IF(JASPER_FOUND) MESSAGE(STATUS " libjasper library found............. YES") ELSE(JASPER_FOUND) @@ -316,13 +334,13 @@ ENDIF(GLIB2_FOUND) -IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) +IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) MESSAGE(STATUS " digiKam will be compiled............ YES") SET(DIGIKAM_CAN_BE_COMPILED true) -ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) +ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) MESSAGE(FATAL_ERROR " digiKam will be compiled............ NO (Look README file for more details about dependencies)") SET(DIGIKAM_CAN_BE_COMPILED false) -ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) +ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) MESSAGE(STATUS "----------------------------------------------------------------------------------") MESSAGE(STATUS "") @@ -906,14 +924,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp ) - SET(libpgf_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp - ) + INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) SET(libsqlite2_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt --- old/digikam/CMakeLists.txt 2009-12-21 07:21:14.000000000 -0200 +++ new/digikam/CMakeLists.txt 2009-12-24 02:15:23.756770201 -0200 @@ -38,7 +38,6 @@ # specific libs and utilities ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine @@ -73,7 +72,8 @@ ${JPEG_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} - ) + ${PGF_INCLUDE_DIRS} + ) # Shared libdigikamcore ################################################################ @@ -81,9 +81,6 @@ # Disable Clapack C code warnings. SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") -# Disable libpgf warnings. -SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") - SET(digikamcore_LIB_SRCS # basic libs ${libdimg_SRCS} @@ -100,7 +97,6 @@ ${libgreycstoration_SRCS} ${libthreadimageio_SRCS} ${libthemeengine_SRCS} - ${libpgf_SRCS} ${pgfutils_SRCS} ${libdigikamhelpers_SRCS} @@ -146,6 +142,7 @@ ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} + ${PGF_LIBRARIES} ${LCMS_LIBRARIES} ${JASPER_LIBRARIES} @@ -182,14 +179,10 @@ SET_SOURCE_FILES_PROPERTIES(${libsqlite2_SRCS} PROPERTIES COMPILE_FLAGS "-w") ENDIF(WIN32) -## Disable libpgf warnings. -#SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") - SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS} ${libhaar_SRCS} ${libdatabasemodels_SRCS} ${libsqlite2_SRCS} - ${libpgf_SRCS} ${pgfutils_SRCS} ) @@ -204,6 +197,7 @@ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} + ${PGF_LIBRARIES} ) SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt --- old/libs/CMakeLists.txt 2009-12-21 07:21:03.000000000 -0200 +++ new/libs/CMakeLists.txt 2009-12-24 02:15:23.757769111 -0200 @@ -21,8 +21,10 @@ ${JPEG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${PNG_INCLUDE_DIR} + ${PGF_INCLUDE_DIRS} ${JASPER_INCLUDE_DIR} ) + ADD_SUBDIRECTORY( curves ) ADD_SUBDIRECTORY( levels ) ADD_SUBDIRECTORY( histogram )