Document the "-j" flag. I forgot to do this when I first added that feature.

Quote filenames before running jhead, so you can have spaces in filenames.
help and ok giovanni@
This commit is contained in:
ckuethe 2010-07-15 16:08:22 +00:00
parent e5dd1b709b
commit 9a56caebb0
3 changed files with 39 additions and 6 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2009/04/26 01:24:37 ckuethe Exp $ # $OpenBSD: Makefile,v 1.6 2010/07/15 16:08:22 ckuethe Exp $
COMMENT= online Image GALlery generator COMMENT= online Image GALlery generator
V= 1.4.7 V= 1.4.7
DISTNAME= igal-$V-wt DISTNAME= igal-$V-wt
PKGNAME= igal-${V}p0 PKGNAME= igal-${V}
REVISION= 1
CATEGORIES= www graphics CATEGORIES= www graphics
HOMEPAGE= http://trexler.at/igal/ HOMEPAGE= http://trexler.at/igal/

View File

@ -1,6 +1,15 @@
$OpenBSD: patch-igal,v 1.1 2009/04/26 01:24:37 ckuethe Exp $ $OpenBSD: patch-igal,v 1.2 2010/07/15 16:08:22 ckuethe Exp $
--- igal.orig Wed Feb 27 05:18:03 2008 --- igal.orig Wed Feb 27 04:18:03 2008
+++ igal Wed Mar 25 16:37:24 2009 +++ igal Fri Jul 9 09:35:28 2010
@@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
############################################################################
# Please change this accordingly if you change the DESTDIR in the tarball
# distribution Makefile or the --prefix of the RPM installation
-$LIBDIR = "/usr/local/lib/igal";
+$LIBDIR = "/usr/local/share/igal";
# for example if you make DESTDIR=/usr then $LIBDIR="/usr/lib/igal"
############################################################################
#
@@ -32,6 +32,12 @@ $HAVEIM = 0; @@ -32,6 +32,12 @@ $HAVEIM = 0;
# #
$HAVELJ = 0; $HAVELJ = 0;
@ -39,6 +48,15 @@ $OpenBSD: patch-igal,v 1.1 2009/04/26 01:24:37 ckuethe Exp $
'p=i','r','s','t=i','u','w=i','x','y=i','ad','as', 'p=i','r','s','t=i','u','w=i','x','y=i','ad','as',
'bigy=i', 'con=s','help','im','www','xy=i', 'dest=s', 'bigy=i', 'con=s','help','im','www','xy=i', 'dest=s',
'AddSubdir') or die "$usage"; 'AddSubdir') or die "$usage";
@@ -192,7 +200,7 @@ $opt_o = "$opt_o/" if ( $opt_o );
$opt_d =~ s/\/$//;
# let users store their templates in a $HOME/.igal directory, if it exists,
-# instead of the site-wide /usr/local/lib/igal (from line 8 up top)
+# instead of the site-wide /usr/local/share/igal (from line 8 up top)
$LIBDIR = $userigaldir if ((-r $userigaldir) && (-d $userigaldir));
# load up image files from $opt_d into array @imgfiles
@@ -313,6 +321,10 @@ print "\nWARNING: The ImageMagick package (imagemagic @@ -313,6 +321,10 @@ print "\nWARNING: The ImageMagick package (imagemagic
$HAVELJ = (&exist("cjpeg") and &exist("djpeg") &exist("pnmscale")) unless ($HAVELJ or ($njpg == 0) or $HAVEIM); $HAVELJ = (&exist("cjpeg") and &exist("djpeg") &exist("pnmscale")) unless ($HAVELJ or ($njpg == 0) or $HAVEIM);
print "\nWARNING: at least one of the commands \"cjpeg\", \"djpeg\" and \"pnmscale\" is not\ninstalled. You can find these at rpmfind.net (inside libjpeg and libgr-progs)\nor you can download the source code from:\n http://www.ijg.org/ and\n http://netpbm.sourceforge.net/\n\n" unless ($HAVELJ or ($njpg == 0) or $HAVEIM); print "\nWARNING: at least one of the commands \"cjpeg\", \"djpeg\" and \"pnmscale\" is not\ninstalled. You can find these at rpmfind.net (inside libjpeg and libgr-progs)\nor you can download the source code from:\n http://www.ijg.org/ and\n http://netpbm.sourceforge.net/\n\n" unless ($HAVELJ or ($njpg == 0) or $HAVEIM);
@ -58,7 +76,7 @@ $OpenBSD: patch-igal,v 1.1 2009/04/26 01:24:37 ckuethe Exp $
+ # exif metadata + # exif metadata
+ if ($opt_j && $HAVEJH) { + if ($opt_j && $HAVEJH) {
+ local $f = $imgfiles[$i]; + local $f = $imgfiles[$i];
+ local $exif = `jhead $f | egrep -v '^File|Camera make' | grep : | sed 's/\$/<br>/'`; + local $exif = `jhead "$f" | egrep -v '^File|Camera make' | grep : | sed 's/\$/<br>/'`;
+ $workarea =~ s/<!--IMAGE-EXIF-->/$exif/; + $workarea =~ s/<!--IMAGE-EXIF-->/$exif/;
+ } + }
# add in the image counter unless -x is specified # add in the image counter unless -x is specified

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-igal_1,v 1.1 2010/07/15 16:08:22 ckuethe Exp $
--- igal.1.orig Fri Jul 9 09:40:19 2010
+++ igal.1 Fri Jul 9 09:35:28 2010
@@ -149,6 +149,10 @@ Name of the main thumbnail index file. The default is
.IR index.html ,
as desirable for most web servers.
.TP
+.BI -j
+Invoke jhead to extract EXIF tags from images and substitute
+the results into the slide caption.
+.TP
.BI -k
Use the image captions for the HTML slide titles.
The default behavior is to use the image names.