diff --git a/packages/graphics/photivo/files/photivo-scm-cmake.patch b/packages/graphics/photivo/files/photivo-scm-cmake.patch deleted file mode 100644 index 6472cbe..0000000 --- a/packages/graphics/photivo/files/photivo-scm-cmake.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -r d687864489da CMakeLists.txt ---- a/CMakeLists.txt Sat Jan 18 15:17:05 2014 +0700 -+++ b/CMakeLists.txt Sun Apr 06 18:49:36 2014 +0200 -@@ -105,11 +105,11 @@ - # 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} ) -@@ -140,9 +140,9 @@ - --set( CMAKE_CXX_FLAGS "" ) -+set( CMAKE_CXX_FLAGS "-std=gnu++11" ) - set( CMAKE_C_FLAGS "" ) --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" ) -+set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops -fopenmp -std=gnu++11" ) -+set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=gnu++11" ) -+set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=gnu++11" ) - - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Sources - ${CMAKE_CURRENT_BINARY_DIR} diff --git a/packages/graphics/photivo/files/photivo-scm-lf_fov1_removed.patch b/packages/graphics/photivo/files/photivo-scm-lf_fov1_removed.patch deleted file mode 100644 index 3129908..0000000 --- a/packages/graphics/photivo/files/photivo-scm-lf_fov1_removed.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream: https://code.google.com/p/photivo/issues/detail?id=140 - -diff -r 2debcb532cbd Sources/ptConstants.h ---- a/Sources/ptConstants.h Sun May 25 15:40:27 2014 +0700 -+++ b/Sources/ptConstants.h Mon Dec 01 21:52:31 2014 +0100 -@@ -222,7 +222,6 @@ - const short ptLfunDistModel_None = LF_DIST_MODEL_NONE; - const short ptLfunDistModel_Poly3 = LF_DIST_MODEL_POLY3; - const short ptLfunDistModel_Poly5 = LF_DIST_MODEL_POLY5; --const short ptLfunDistModel_Fov1 = LF_DIST_MODEL_FOV1; - const short ptLfunDistModel_PTLens = LF_DIST_MODEL_PTLENS; - - -diff -r 2debcb532cbd Sources/ptGuiOptions.cpp ---- a/Sources/ptGuiOptions.cpp Sun May 25 15:40:27 2014 +0700 -+++ b/Sources/ptGuiOptions.cpp Mon Dec 01 21:52:31 2014 +0100 -@@ -177,7 +177,6 @@ - {ptLfunDistModel_None, QObject::tr("None") }, - {ptLfunDistModel_Poly3, QObject::tr("3rd order polynomial") }, - {ptLfunDistModel_Poly5, QObject::tr("5th order polynomial") }, -- {ptLfunDistModel_Fov1, QObject::tr("1st order field of view") }, - {ptLfunDistModel_PTLens, QObject::tr("Panotools lens model") }, - {-1,NULL}}; - -diff -r 2debcb532cbd Sources/ptMainWindow.cpp ---- a/Sources/ptMainWindow.cpp Sun May 25 15:40:27 2014 +0700 -+++ b/Sources/ptMainWindow.cpp Mon Dec 01 21:52:31 2014 +0100 -@@ -3067,7 +3067,6 @@ - short DistModel = Settings->GetInt("LfunDistModel"); - LfunDistPoly3Container->setVisible(DistModel == ptLfunDistModel_Poly3); - LfunDistPoly5Container->setVisible(DistModel == ptLfunDistModel_Poly5); -- LfunDistFov1Container->setVisible(DistModel == ptLfunDistModel_Fov1); - LfunDistPTLensContainer->setVisible(DistModel == ptLfunDistModel_PTLens); - } - -diff -r 2debcb532cbd Sources/ptProcessor.cpp ---- a/Sources/ptProcessor.cpp Sun May 25 15:40:27 2014 +0700 -+++ b/Sources/ptProcessor.cpp Mon Dec 01 21:52:31 2014 +0100 -@@ -2238,12 +2238,6 @@ - DistortionData.Terms[1] = Settings->GetDouble("LfunDistPoly5K2"); - DistortionData.Terms[2] = 0.0; - break; -- case LF_DIST_MODEL_FOV1: -- modflags |= LF_MODIFY_DISTORTION; -- DistortionData.Terms[0] = Settings->GetDouble("LfunDistFov1Omega"); -- DistortionData.Terms[1] = 0.0; -- DistortionData.Terms[2] = 0.0; -- break; - case LF_DIST_MODEL_PTLENS: - modflags |= LF_MODIFY_DISTORTION; - DistortionData.Terms[0] = Settings->GetDouble("LfunDistPTLensA"); diff --git a/packages/graphics/photivo/photivo-scm.exheres-0 b/packages/graphics/photivo/photivo-scm.exheres-0 index 4708e21..f21b39c 100644 --- a/packages/graphics/photivo/photivo-scm.exheres-0 +++ b/packages/graphics/photivo/photivo-scm.exheres-0 @@ -23,7 +23,3 @@ DEPENDENCIES=" x11-libs/gtk+:2 ) " -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}/${PNV}-cmake.patch" - "${FILES}/${PNV}-lf_fov1_removed.patch" -)