diff --git a/metadata/categories.conf b/metadata/categories.conf index 850c11d..f996ca3 100644 --- a/metadata/categories.conf +++ b/metadata/categories.conf @@ -2,6 +2,7 @@ app-arch app-crypt app-paludis dev-lang +graphics net-libs net-proxy sys-apps diff --git a/packages/graphics/photivo/files/photivo-scm-cmake.patch b/packages/graphics/photivo/files/photivo-scm-cmake.patch new file mode 100644 index 0000000..1a422b6 --- /dev/null +++ b/packages/graphics/photivo/files/photivo-scm-cmake.patch @@ -0,0 +1,31 @@ +diff --git a/var/tmp/paludis/build/graphics-photivo-scm/work/photivo-scm/CMakeLists.txt b/CMakeLists.txt +index 431408c..95313ec 100644 +--- a/var/tmp/paludis/build/graphics-photivo-scm/work/photivo-scm/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,11 +105,11 @@ if( EXISTS ${PROJECT_SOURCE_DIR}/.hg ) + # Determine Photivo version with mercurial. Use current date if mercurial is unavailable. + find_program( MERCURIAL hg ) + if( MERCURIAL ) +- execute_process( COMMAND hg branch OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BRANCH ) +- execute_process( COMMAND hg log --limit 1 --branch ${BRANCH} --template {date|shortdate} ++ execute_process( COMMAND hg -R ${PROJECT_SOURCE_DIR} branch OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BRANCH ) ++ execute_process( COMMAND hg -R ${PROJECT_SOURCE_DIR} log --limit 1 --branch ${BRANCH} --template {date|shortdate} + OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE REVDATE ) +- execute_process( COMMAND hg identify --id OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE REVISION ) +- execute_process( COMMAND hg identify -n OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PACKREVISION ) ++ execute_process( COMMAND hg -R ${PROJECT_SOURCE_DIR} identify --id OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE REVISION ) ++ execute_process( COMMAND hg -R ${PROJECT_SOURCE_DIR} identify -n OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PACKREVISION ) + set( APPVERSION "${REVDATE} (rev ${REVISION})" ) + string( REGEX REPLACE [+] "" REVISION ${REVISION} ) + string( REGEX REPLACE [+] "" PACKREVISION ${PACKREVISION} ) +@@ -138,8 +138,8 @@ message( "Build ptClear : ${WITH_CLEAR}" ) + message( "Build Gimp plugin : ${WITH_GIMP}" ) + message( "Build Adobe profiles creator : ${WITH_ADOBE_PROFILES}\n" ) + +-set( CMAKE_CXX_FLAGS "" ) +-set( CMAKE_C_FLAGS "" ) ++set( CMAKE_CXX_FLAGS "-std=c++11" ) ++set( CMAKE_C_FLAGS "-std=c++11" ) + set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops -fopenmp -std=gnu++0x" ) + set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=gnu++0x" ) + set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=gnu++0x" ) diff --git a/packages/graphics/photivo/photivo-scm.exheres-0 b/packages/graphics/photivo/photivo-scm.exheres-0 index 43aeaad..3880187 100644 --- a/packages/graphics/photivo/photivo-scm.exheres-0 +++ b/packages/graphics/photivo/photivo-scm.exheres-0 @@ -1,16 +1,28 @@ # Copyright (c) 2014 Denis Knauf # Distributed under the terms of the GNU General Public License v3 +SCM_REPOSITORY="https://code.google.com/p/photivo/" require scm-hg -require qmake +require cmake SUMMARY="Photivo is a free and open source (GPL3) photo processor." HOMEPAGE="http://photivo.org/" -SCM_REPOSITORY="https://code.google.com/p/photivo/" LICENCES="GPL-3" +MYOPTIONS="gimp" PLATFORMS="~amd64" +SLOT="0" DEPENDENCIES=" build+run: - media-gfx/GraphicsMagick[lcms] - media-libs/liblqr + graphics/exiv2[>=0.19] + media-gfx/GraphicsMagick[>=1.3.12][lcms] + media-libs/lensfun[>=0.2.5] + media-libs/liblqr[>=0.4.1] + sci-libs/fftw[>=3.2.2] + gimp? ( + media-gfx/gimp[>=2.6.10] + x11-libs/gtk+:2 + ) " +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}/${PNV}-cmake.patch" +)