aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorPhilip Lacroix <slackph at posteo dot de>2017-02-08 23:21:19 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-02-11 07:24:31 +0700
commita0f02e21ef33979b6c9bf0e608e761b9bd4a2683 (patch)
tree80d5266cfd47a25e6dacb68356cab71ceb256cc2 /multimedia
parent6b471a5b2926885fa7e907deb8a6268fac9a5db7 (diff)
multimedia/coriander: Minor changes, added new optional dep.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/coriander/README6
-rw-r--r--multimedia/coriander/coriander.SlackBuild8
-rw-r--r--multimedia/coriander/coriander.info2
-rw-r--r--multimedia/coriander/slack-desc12
4 files changed, 15 insertions, 13 deletions
diff --git a/multimedia/coriander/README b/multimedia/coriander/README
index fe6184b15ae2..60ab304338b3 100644
--- a/multimedia/coriander/README
+++ b/multimedia/coriander/README
@@ -1,8 +1,10 @@
Coriander is a full-featured graphical interface for controlling digital cameras
through the IEEE-1394 bus (i.e. FireWire or iLink). It can also record videos,
send images to an FTP site and convert videos to V4L streams. A live display is
-provided as well. The program will work with any camera which is compatible with
+also provided. The program will work with any camera that is compatible with
the IIDC specifications (v1.04 or later): this includes most 1394 webcams and
many industrial and scientific cameras.
-Optional dependencies: ftplib (FTP support)
+NOTE: FTP support is added automatically if ftplib is detected.
+
+Optional dependencies: ftplib
diff --git a/multimedia/coriander/coriander.SlackBuild b/multimedia/coriander/coriander.SlackBuild
index e6d3c9c846c2..eaba975fedf5 100644
--- a/multimedia/coriander/coriander.SlackBuild
+++ b/multimedia/coriander/coriander.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for coriander
-# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/multimedia/coriander/coriander.info b/multimedia/coriander/coriander.info
index 49cdd8fb2f62..9e109b5985f3 100644
--- a/multimedia/coriander/coriander.info
+++ b/multimedia/coriander/coriander.info
@@ -2,7 +2,7 @@ PRGNAM="coriander"
VERSION="2.0.2"
HOMEPAGE="http://damien.douxchamps.net/ieee1394/coriander/"
DOWNLOAD="http://sourceforge.net/projects/coriander/files/coriander-2/2.0.2/coriander-2.0.2.tar.gz"
-MD5SUM="431d98fb013217681f97ade168201fb8"
+MD5SUM="431d98fb013217681f97ade168201fb8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libdc1394 libgnomeui"
diff --git a/multimedia/coriander/slack-desc b/multimedia/coriander/slack-desc
index 71a96adc90cc..dc2a5e7e8ab4 100644
--- a/multimedia/coriander/slack-desc
+++ b/multimedia/coriander/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-coriander: coriander (program to control IEEE-1394 digital cameras)
+coriander: coriander (a program to control IEEE-1394 digital cameras)
coriander:
-coriander: Coriander is a full-featured graphical interface for controlling a
-coriander: digital camera through the IEEE-1394 bus (i.e. FireWire or iLink).
+coriander: Coriander is a full-featured graphical interface for controlling
+coriander: digital cameras through the IEEE-1394 bus (i.e. FireWire or iLink).
coriander: It can also record videos, send images to an FTP site and convert
-coriander: videos to V4L streams. A live display is provided. The program will
-coriander: work with IIDC-compatible devices (v1.04 or later) including most
-coriander: 1394 webcams and many industrial and scientific cameras.
+coriander: videos to V4L streams. A live display is also provided. The program
+coriander: will work with IIDC-compatible devices (v1.04 or later) including
+coriander: most 1394 webcams and many industrial and scientific cameras.
coriander:
coriander: Homepage: http://damien.douxchamps.net/ieee1394/coriander/
coriander: