Index: head/graphics/digikam-kde4/Makefile.common =================================================================== --- head/graphics/digikam-kde4/Makefile.common (revision 437105) +++ head/graphics/digikam-kde4/Makefile.common (revision 437106) @@ -1,148 +1,163 @@ # $FreeBSD$ # # Make sure when DIGIKAM_VER is updated that the following ports are updated: # graphics/digikam-kde4 # graphics/digikam-kde4-doc # graphics/digikam-kde4-l10n # graphics/kipi-plugin-* # graphics/kipi-plugins-kde4 # graphics/libkface # graphics/libkipiplugins # These ports now lead independent lives: # astro/libkgeomap (part of KDE Applications) # net/libkvkontakte (part of KDE Applications) # net/libmediawiki (part of digiKam 4.12) DIGIKAM_VER= 4.14.0 MASTER_SITES= KDE/Attic/digikam KIPI_PLUGINS_ALL= acquireimages \ advancedslideshow \ batchprocess \ calendar \ debianscreenshots \ dngconverter \ dropbox \ expoblending \ facebook \ flashexport \ flickrexport \ galleryexport \ googleservices \ gpssync \ htmlexport \ imageshackexport \ imageviewer \ imgurexport \ ipodexport \ jalbumexport \ jpeglossless \ kioexport \ kmlexport \ kopete \ mediawiki \ metadataedit \ panorama \ photolayoutseditor \ piwigoexport \ printimages \ rajceexport \ rawconverter \ removeredeyes \ sendimages \ shwup \ smug \ timeadjust \ videoslideshow \ vkontakte \ yandexfotki # libkipiplugins is special: it's not listed in KIPI_PLUGINS_ALL, # and every plugin depends on it libkipiplugins_DIR= common libkipiplugins_DESC= Common library for kipi plugins batchprocess_DIR= batchprocessimages kioexport_DIR= kioexportimport acquireimages_DESC= Acquire images using flat scanner advancedslideshow_DESC= Slide images with 2D and 3D effects using OpenGL batchprocess_DESC= Batch process images (convert, resize, rename, etc.) calendar_DESC= Create calendars debianscreenshots_DESC= Export images to Debian Screenshots web service dngconverter_DESC= Convert Raw Image to Digital NeGative dropbox_DESC= Export images to Dropbox cloud service expoblending_DESC= Create pseudo HDR image with a stack of bracketed images facebook_DESC= Import/export images to/from a remote Facebook web service flashexport_DESC= Export images to Flash using SimpleViewer flickrexport_DESC= Export images to a remote Flickr based web service galleryexport_DESC= Export images to a remote Gallery googleservices_DESC= Export images to Google Services (drive/picasa) gpssync_DESC= Geolocalize images htmlexport_DESC= Export images collections into a static XHTML page imageshackexport_DESC= Export images to ImageShack web service imageviewer_DESC= Preview images using OpenGL imgurexport_DESC= Export images to ImgUr web service ipodexport_DESC= Export images to an Ipod device jalbumexport_DESC= Export images to jAlbum jpeglossless_DESC= Rotate/flip images without losing quality kioexport_DESC= Export images to remote computer using network protocol kmlexport_DESC= Create KML files to present images with coordinates kopete_DESC= Export images to an instant messaging contact mediawiki_DESC= Export images to Mediawiki based web service metadataedit_DESC= Edit EXIF, IPTC and XMP metadata panorama_DESC= Assemble panoramic photo automatically # not ready for production yet # photivointegration_DESC= Integration of the Photivo RAW-Processor photolayoutseditor_DESC=Assemble images together piwigoexport_DESC= Export images to a remote Piwigo (PHPWebGallery) server printimages_DESC= Print images in various format rajceexport_DESC= Export images to Rajce web service rawconverter_DESC= Convert Raw Image to JPEG/PNG/TIFF removeredeyes_DESC= Remove red eyes on image automatically sendimages_DESC= Send images by e-mail shwup_DESC= Export images to Shwup web service smug_DESC= Import/export images to/from a remote SmugMug web service timeadjust_DESC= Adjust date and time videoslideshow_DESC= Export images as Video Slide Show vkontakte_DESC= Export images to VKontakte web service # Requires https://bugs.kde.org/show_bug.cgi?id=217950 # wallpaper_DESC= Set image as background on desktop yandexfotki_DESC= Export images to Yandex web service DISTNAME= digikam-${DIGIKAM_VER} DISTINFO_FILE= ${.CURDIR:H:H}/graphics/digikam-kde4/distinfo LICENSE?= GPLv2 USES+= tar:bzip2 .if !defined(NO_BUILD) USES+= cmake kde:4 USE_KDE+= automoc4 kdelibs USE_QT4+= qmake_build moc_build rcc_build uic_build WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} PLIST_SUB+= SHLIB_VER=${DIGIKAM_VER} . if defined(KIPI_PLUGIN) CONFLICTS_INSTALL= kipi-plugins-2.* DESCR= ${.CURDIR:H:H}/graphics/kipi-plugins-kde4/pkg-descr USES+= pkgconfig .if ${KIPI_PLUGIN} != "libkipiplugins" EXTRA_PATCHES= ${.CURDIR:H:H}/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt LIB_DEPENDS+= libkipiplugins.so:graphics/libkipiplugins .endif EXTRA_PATCHES+= ${.CURDIR:H:H}/graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions ${DISTNAME}/extra/kipi-plugins WRKSRC= ${WRKDIR}/${DISTNAME}/extra/kipi-plugins BUILD_WRKSRC= ${WRKSRC}/${${KIPI_PLUGIN}_DIR} INSTALL_WRKSRC= ${BUILD_WRKSRC} ${KIPI_PLUGIN}_DIR?= ${KIPI_PLUGIN} + +.if ${KIPI_PLUGIN} != "libkipiplugins" +# Each plugin is built separately from the same tarball. The upstream build +# process expects a single build for all plugins, which includes building +# libkipiplugins itself. +# Adjust it (together with extrapatch-CMakeLists.txt in +# graphics/kipi-plugins-kde4) by actually looking for libkipiplugins with +# find_library() and linking against it instead of ending up just passing +# "-lkipiplugins" to the linker because of the way we build these ports. +post-patch: kipi-plugin-post-patch +kipi-plugin-post-patch: + ${FIND} ${BUILD_WRKSRC} -name CMakeLists.txt | ${XARGS} ${REINPLACE_CMD} -e \ + 's, kipiplugins, $${LIBKIPIPLUGINS_LIBRARIES},' \ + ${BUILD_WRKSRC}/CMakeLists.txt +.endif . endif # defined(KIPI_PLUGIN) .endif # !defined(NO_BUILD) Index: head/graphics/kipi-plugin-ipodexport/files/patch-cmake_modules_FindIpod.cmake =================================================================== --- head/graphics/kipi-plugin-ipodexport/files/patch-cmake_modules_FindIpod.cmake (nonexistent) +++ head/graphics/kipi-plugin-ipodexport/files/patch-cmake_modules_FindIpod.cmake (revision 437106) @@ -0,0 +1,26 @@ +Always look for libgpod using CMake instead of just using the pkg-config call +directly, as the latter does not use full paths. +--- cmake/modules/FindIpod.cmake ++++ cmake/modules/FindIpod.cmake +@@ -14,12 +14,6 @@ if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) + SET(IPOD_FOUND TRUE) + + else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) +- if(NOT WIN32) +- # use pkg-config to get the directories and then use these values +- # in the FIND_PATH() and FIND_LIBRARY() calls +- find_package(PkgConfig) +- PKG_SEARCH_MODULE(IPOD libgpod-1.0) +- else(NOT WIN32) + find_path(IPOD_INCLUDE_DIRS + NAMES + gpod/itdb.h +@@ -32,7 +26,7 @@ else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) + if(IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) + set(IPOD_FOUND ON) + endif(IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) +- endif(NOT WIN32) ++ + IF (IPOD_FOUND) + IF (NOT IPOD_FIND_QUIETLY) + MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}") Property changes on: head/graphics/kipi-plugin-ipodexport/files/patch-cmake_modules_FindIpod.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt =================================================================== --- head/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt (revision 437105) +++ head/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt (revision 437106) @@ -1,19 +1,24 @@ +The first hunk looks for libkipiplugins via CMake, as we split every kipi +plugin as well as the common code into separate ports. Not using CMake results +in "kipiplugins" in a target_link_libraries() call becoming a literal +-lkipiplugins being passed to the linker instead of /path/to/libkipiplugin.so. --- ./CMakeLists.txt.orig 2015-02-25 22:15:14.659030000 +0100 +++ ./CMakeLists.txt 2015-02-25 22:17:07.071209000 +0100 -@@ -356,7 +356,6 @@ +@@ -391,7 +391,7 @@ if(KIPI_FOUND) # Plugins which will be always compiled - add_subdirectory(common) ++ find_library(LIBKIPIPLUGINS_LIBRARIES kipiplugins) add_subdirectory(timeadjust) add_subdirectory(jpeglossless) add_subdirectory(rawconverter) @@ -468,7 +467,7 @@ endif() endif() - + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins/tools/kpversion.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/kpversion.h) else() message(STATUS "")