Update www/igal2 to 2.1
This version adds EXIF support using p5-Image-ExifTool. - change $LIBDIR to /usr/local/share - remove jhead from and add graphics/p5-Image-ExifTool as new run dep - remove the changes for integrating jhead - remove patch-slidetemplate2_html OK aja@
This commit is contained in:
rpe
parent
da7cfdeb6c
commit
ac80a29686
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:44:42 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2015/04/19 12:49:54 rpe Exp $
|
||||
|
||||
COMMENT= online Image GALlery generator
|
||||
|
||||
DISTNAME= igal2-2.0
|
||||
REVISION= 0
|
||||
DISTNAME= igal2-2.1
|
||||
CATEGORIES= www graphics
|
||||
|
||||
HOMEPAGE= http://igal.trexler.at/
|
||||
@ -15,7 +14,7 @@ MASTER_SITES= ${HOMEPAGE}
|
||||
|
||||
RUN_DEPENDS= graphics/ImageMagick \
|
||||
graphics/jpeg \
|
||||
graphics/jhead
|
||||
graphics/p5-Image-ExifTool
|
||||
|
||||
NO_BUILD= Yes
|
||||
NO_TEST= Yes
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (igal2-2.0.tar.gz) = X2ltDJTHUILdsDkdS7qW7BHWBxDgummWqWU6rXW4Fik=
|
||||
SIZE (igal2-2.0.tar.gz) = 27206
|
||||
SHA256 (igal2-2.1.tar.gz) = 8tRXokvtMKk8qxerTzBFkew9LQ0CVO+nw5BMNFxnG+M=
|
||||
SIZE (igal2-2.1.tar.gz) = 28243
|
||||
|
||||
@ -1,45 +1,16 @@
|
||||
$OpenBSD: patch-igal2,v 1.1.1.1 2012/04/24 11:40:38 jasper Exp $
|
||||
--- igal2.orig Sun Nov 16 22:00:00 2008
|
||||
+++ igal2 Tue Apr 24 13:00:12 2012
|
||||
@@ -33,6 +33,12 @@ $HAVEIM = 0;
|
||||
#
|
||||
$HAVELJ = 0;
|
||||
$OpenBSD: patch-igal2,v 1.2 2015/04/19 12:49:54 rpe Exp $
|
||||
--- igal2.orig Sun Apr 19 11:15:27 2015
|
||||
+++ igal2 Sun Apr 19 11:15:50 2015
|
||||
@@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
|
||||
############################################################################
|
||||
+# If you KNOW you have Jhead installed then setting this equal to 1 may speed
|
||||
+# up the code a bit (igal will stop checking for these commands every time it
|
||||
+# runs)
|
||||
+#
|
||||
+$HAVEJH = 0;
|
||||
+############################################################################
|
||||
|
||||
# This is IGAL version 2.0, an online Image GALlery generator.
|
||||
# Copyright (C) 2000 Eric Pop, 2003 Wolfgang Trexler
|
||||
@@ -85,6 +91,7 @@ $opt_d = "."; # look in current directory "."
|
||||
$opt_f = "0"; # -f to force thumbnail regeneration
|
||||
$opt_h = "0";
|
||||
$opt_i = "index.html"; # name of the main thumbnail index file
|
||||
+$opt_j = "0"; # -j uses jhead to extract EXIF metadata
|
||||
$opt_k = "0"; # -k for the captions to also be used as slide titles
|
||||
$opt_m = ""; # -m Apply a watermark to each image
|
||||
$opt_n = "0"; # -n to use image file names for the .html files
|
||||
@@ -118,6 +125,7 @@ Options: -a write image sizes under thum
|
||||
-f force thumbnail regeneration
|
||||
-h displays this brief help; same as --help
|
||||
-i <file> name of the main thumbnail index file (index.html)
|
||||
+ -j add EXIF metadata to the slide pages
|
||||
-k use the image captions for the HTML slide titles
|
||||
-m <file> Automatically add watermark to each image
|
||||
-n use image file names for the HTML slide files
|
||||
@@ -173,7 +181,7 @@ END_OF_USAGE
|
||||
@igal_options = @ARGV;
|
||||
|
||||
# process command-line arguments (overriding defaults above)
|
||||
-GetOptions('a','c','C','d=s','f','h','i=s','k','m=s','n','o=s',
|
||||
+GetOptions('a','c','C','d=s','f','h','i=s','j','k','m=s','n','o=s',
|
||||
'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',
|
||||
'AddSubdir', 'pagination=s') or die "$usage";
|
||||
@@ -198,7 +206,7 @@ $opt_o = "$opt_o/" if ( $opt_o );
|
||||
# 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/igal2";
|
||||
+$LIBDIR = "/usr/local/share/igal2";
|
||||
# for example if you make DESTDIR=/usr then $LIBDIR="/usr/lib/igal2"
|
||||
############################################################################
|
||||
#
|
||||
@@ -205,7 +205,7 @@ die "Critical failure: Lib Image::ExifTool not install
|
||||
$opt_d =~ s/\/$//;
|
||||
|
||||
# let users store their templates in a $HOME/.igal directory, if it exists,
|
||||
@ -48,28 +19,3 @@ $OpenBSD: patch-igal2,v 1.1.1.1 2012/04/24 11:40:38 jasper Exp $
|
||||
$LIBDIR = $userigaldir if ((-r $userigaldir) && (-d $userigaldir));
|
||||
|
||||
# load up image files from $opt_d into array @imgfiles
|
||||
@@ -319,6 +327,10 @@ print "\nWARNING: The ImageMagick package (imagemagic
|
||||
$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);
|
||||
|
||||
+# find out if the jhead exists
|
||||
+$HAVEJH = (&exist("jhead")) unless ($HAVEJH);
|
||||
+print "\nWARNING: The Jhead package is not installed; without it you won't get information about the camera used to take the photo.\n" unless ($HAVEJH);
|
||||
+
|
||||
# give up if no image processing commands can be found
|
||||
die "ERROR: the necessary image processing tools aren't installed on your system.\nPlease obtain them as specified above.\n\n" unless ($HAVEIM or $HAVELJ);
|
||||
|
||||
@@ -535,7 +547,12 @@ if ($opt_s) {
|
||||
$workarea =~ s/<!--THIS-IMAGE-->/$destback$imgfile_i_encoded/g;
|
||||
}
|
||||
}
|
||||
-
|
||||
+ # exif metadata
|
||||
+ if ($opt_j && $HAVEJH) {
|
||||
+ local $f = $imgfiles[$i];
|
||||
+ local $exif = `jhead "$f" | egrep -v '^File|Camera make' | grep : | sed 's/\$/<br>/'`;
|
||||
+ $workarea =~ s/<!--IMAGE-EXIF-->/$exif/;
|
||||
+ }
|
||||
# add in the image counter unless -x is specified
|
||||
if ($opt_x) {
|
||||
$imagecaption = $captions[$i];
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-igal2_1,v 1.1.1.1 2012/04/24 11:40:38 jasper Exp $
|
||||
--- igal2.1.orig Tue Apr 24 12:59:19 2012
|
||||
+++ igal2.1 Tue Apr 24 12:59:21 2012
|
||||
@@ -143,6 +143,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.
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-slidetemplate2_html,v 1.2 2012/05/20 08:50:10 jasper Exp $
|
||||
--- slidetemplate2.html.orig Sun Nov 16 22:00:00 2008
|
||||
+++ slidetemplate2.html Sat May 19 19:24:24 2012
|
||||
@@ -3,7 +3,7 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
|
||||
- <META name="generator" content="igal 1.4 freshmeat.net/projects/igal">
|
||||
+ <META name="generator" content="igal 2.0 freshmeat.net/projects/igal">
|
||||
<TITLE><!--SLIDE-TITLE--></TITLE>
|
||||
<LINK rel="stylesheet" type="text/css" href="igal2.css">
|
||||
<LINK rel="contents" href="<!--INDEX-FILE-->">
|
||||
@@ -40,6 +40,7 @@
|
||||
</TABLE>
|
||||
|
||||
<P class="center"><!--IMAGE-CAPTION--></P>
|
||||
+ <P class="center"><!--IMAGE-EXIF--></P>
|
||||
</DIV>
|
||||
|
||||
<P class="center">
|
||||
Loading…
Reference in New Issue
Block a user