diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/photivo/photivo-lensfun-0.3.0.diff | 57 | ||||
| -rw-r--r-- | graphics/photivo/photivo.SlackBuild | 26 | ||||
| -rw-r--r-- | graphics/photivo/photivo.info | 6 |
3 files changed, 73 insertions, 16 deletions
diff --git a/graphics/photivo/photivo-lensfun-0.3.0.diff b/graphics/photivo/photivo-lensfun-0.3.0.diff new file mode 100644 index 0000000000..f25c3517a6 --- /dev/null +++ b/graphics/photivo/photivo-lensfun-0.3.0.diff @@ -0,0 +1,57 @@ +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 2f1eed2e3c..dfd2a719be 100644 --- a/graphics/photivo/photivo.SlackBuild +++ b/graphics/photivo/photivo.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Photivo -# Copyright 2013 Giorgio Peron <giorgio.peron@gmail.com>, Campodarsego, PD, Italy +# Copyright 2014 Giorgio Peron <giorgio.peron@gmail.com>, Campodarsego, PD, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=photivo -VERSION=${VERSION:-20131103} +VERSION=${VERSION:-20140525} +SRC_VERSION=2debcb532cbd BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,18 +61,19 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz || tar xvf $CWD/2debcb532cbdcf20fdac4aa89facfcebba868039.tar.gz +cd $PRGNAM-$SRC_VERSION find . -exec touch {} \; chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -#qmake CONFIG+=WithClear CONFIG+=WithGimp CONFIG+=WithAdobeProfiles CONFIG+=WithCurves photivo.pro PREFIX=/usr/share -qmake photivo.pro PREFIX=/usr +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 @@ -81,9 +83,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README COPYING* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README COPYING* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/graphics/photivo/photivo.info b/graphics/photivo/photivo.info index 7bcfbf9c92..c1199f8d82 100644 --- a/graphics/photivo/photivo.info +++ b/graphics/photivo/photivo.info @@ -1,8 +1,8 @@ PRGNAM="photivo" -VERSION="20131103" +VERSION="20140525" HOMEPAGE="http://photivo.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/photivo-20131103.tar.xz" -MD5SUM="52b51959f027be93cbb4c409a14df726" +DOWNLOAD="https://photivo.googlecode.com/archive/2debcb532cbdcf20fdac4aa89facfcebba868039.tar.gz" +MD5SUM="cb82e0e1aa6a1a9face3e36de254519b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="GraphicsMagick lensfun liblqr" |