summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2013-12-08 11:39:12 -0500
committerErik Hanson <erik@slackbuilds.org>2013-12-14 10:52:14 -0600
commit361d205921d9596fea5c4efa8f93d09b1ef0e37c (patch)
tree1e7497da062026b9c7c2b6962402fe38e6f701d1
parentc9c07db6422603857b6a655c7a39d1d3dad097ec (diff)
downloadslackbuilds-361d205921d9596fea5c4efa8f93d09b1ef0e37c.tar.gz
graphics/digikam: Cleanup + added additional optional deps.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--graphics/digikam/README4
-rw-r--r--graphics/digikam/digikam.SlackBuild14
-rw-r--r--graphics/digikam/digikam.info2
3 files changed, 10 insertions, 10 deletions
diff --git a/graphics/digikam/README b/graphics/digikam/README
index 2a15fc6437..1ae423df61 100644
--- a/graphics/digikam/README
+++ b/graphics/digikam/README
@@ -5,7 +5,7 @@ by directory layout or by custom collections. An easy to use interface
is provided that enables you to connect to your camera and preview,
download and/or delete your images.
-liblqr, libpgf and libdc1394 are optional dependencies.
-lensfun would be one too, but building against it it's broken ATM.
+eigen3, lensfun, liblqr, libpgf, libdc1394, and opencv are optional
+dependencies.
NOTE: digikam now ships with its own internal version of kipi-plugins.
diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild
index eb5703c820..168ffb1d88 100644
--- a/graphics/digikam/digikam.SlackBuild
+++ b/graphics/digikam/digikam.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for digiKam
# Copyright 2007-2011 Frank Caraballo <fecaraballo{at}gmail{dot}com>
+# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,6 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Modified by Niklas 'Nille' Åkerström for slackware64 and to use cmake.
-# Updated by Willy Sudiarto Raharjo <willysr@slackware-id.org>
PRGNAM=digikam
VERSION=${VERSION:-3.5.0}
@@ -59,14 +59,14 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
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 {} \;
mkdir -p build
cd build
@@ -83,7 +83,7 @@ cd build
make install DESTDIR=$PKG
cd ..
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/graphics/digikam/digikam.info b/graphics/digikam/digikam.info
index c49de0ff7d..c85954c2a2 100644
--- a/graphics/digikam/digikam.info
+++ b/graphics/digikam/digikam.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://download.kde.org/stable/digikam/digikam-3.5.0.tar.bz2"
MD5SUM="16d570269883652487516a77c9d7d6f8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="ffmpeg opencv"
+REQUIRES="%README% ffmpeg opencv"
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"