3 files changed, 6 insertions, 64 deletions
diff --git a/graphics/photivo/photivo-lensfun-0.3.0.diff b/graphics/photivo/photivo-lensfun-0.3.0.diff
deleted file mode 100644
index f25c3517a6..0000000000
--- a/graphics/photivo/photivo-lensfun-0.3.0.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -r 2debcb532cbd Sources/ptConstants.h
---- a/Sources/ptConstants.h	Sun May 25 15:40:27 2014 +0700
-+++ b/Sources/ptConstants.h	Sun Nov 23 17:39:52 2014 +0100
-@@ -222,7 +222,9 @@
- const short ptLfunDistModel_None      = LF_DIST_MODEL_NONE;
- const short ptLfunDistModel_Poly3     = LF_DIST_MODEL_POLY3;
- const short ptLfunDistModel_Poly5     = LF_DIST_MODEL_POLY5;
-+#ifdef LF_DIST_MODEL_FOV1
- const short ptLfunDistModel_Fov1      = LF_DIST_MODEL_FOV1;
-+#endif
- 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	Sun Nov 23 17:39:52 2014 +0100
-@@ -177,7 +177,9 @@
-   {ptLfunDistModel_None,     QObject::tr("None") },
-   {ptLfunDistModel_Poly3,    QObject::tr("3rd order polynomial") },
-   {ptLfunDistModel_Poly5,    QObject::tr("5th order polynomial") },
-+#ifdef LF_DIST_MODEL_FOV1
-   {ptLfunDistModel_Fov1,     QObject::tr("1st order field of view") },
-+#endif
-   {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	Sun Nov 23 17:39:52 2014 +0100
-@@ -3067,7 +3067,9 @@
-   short DistModel = Settings->GetInt("LfunDistModel");
-   LfunDistPoly3Container->setVisible(DistModel == ptLfunDistModel_Poly3);
-   LfunDistPoly5Container->setVisible(DistModel == ptLfunDistModel_Poly5);
-+#ifdef LF_DIST_MODEL_FOV1
-   LfunDistFov1Container->setVisible(DistModel == ptLfunDistModel_Fov1);
-+#endif
-   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	Sun Nov 23 17:39:52 2014 +0100
-@@ -2238,12 +2238,14 @@
-         DistortionData.Terms[1] = Settings->GetDouble("LfunDistPoly5K2");
-         DistortionData.Terms[2] = 0.0;
-         break;
-+#ifdef LF_DIST_MODEL_FOV1
-       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;
-+#endif	
-       case LF_DIST_MODEL_PTLENS:
-         modflags |= LF_MODIFY_DISTORTION;
-         DistortionData.Terms[0] = Settings->GetDouble("LfunDistPTLensA");
diff --git a/graphics/photivo/photivo.SlackBuild b/graphics/photivo/photivo.SlackBuild
index dfd2a719be..c6cfb4874a 100644
--- a/graphics/photivo/photivo.SlackBuild
+++ b/graphics/photivo/photivo.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=photivo
-VERSION=${VERSION:-20140525}
-SRC_VERSION=2debcb532cbd
+VERSION=${VERSION:-20150519}
+SRC_VERSION=66a8c1082d88
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz || tar xvf $CWD/2debcb532cbdcf20fdac4aa89facfcebba868039.tar.gz
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz || tar xvf $CWD/66a8c1082d88e6fb8e6ade73f373d28a6ac09721.tar.gz
 cd $PRGNAM-$SRC_VERSION
 find . -exec touch {} \;
 chown -R root:root .
@@ -72,7 +72,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/lensfun
-patch -p1 < $CWD/photivo-lensfun-0.3.0.diff
 qmake CONFIG+=WithGimp photivo.pro PREFIX=/usr
 make
 make install INSTALL_ROOT=$PKG
diff --git a/graphics/photivo/photivo.info b/graphics/photivo/photivo.info
index c1199f8d82..38182af443 100644
--- a/graphics/photivo/photivo.info
+++ b/graphics/photivo/photivo.info
@@ -1,8 +1,8 @@
 PRGNAM="photivo"
-VERSION="20140525"
+VERSION="20150519"
 HOMEPAGE="http://photivo.org"
-DOWNLOAD="https://photivo.googlecode.com/archive/2debcb532cbdcf20fdac4aa89facfcebba868039.tar.gz"
-MD5SUM="cb82e0e1aa6a1a9face3e36de254519b"
+DOWNLOAD="https://photivo.googlecode.com/archive/66a8c1082d88e6fb8e6ade73f373d28a6ac09721.tar.gz"
+MD5SUM="fd072f91a459878e00ee378d4e3ae5bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="GraphicsMagick lensfun liblqr"