From: Colin Clark <colin.clark@cclark.uk>
Date: Mon, 14 Jun 2021 12:51:08 +0000 (+0100)
Subject: Include a Other Software section in Help file
X-Git-Tag: v1.7~94
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=24e7bb7be54da3d0d2d12c2031f5f4fc1dee739e

Include a Other Software section in Help file

Include a section in the Help file listing software that might be useful
to Geeqie users.

Set libraw version back to 0.20 - required to decode .cr3 files.
---

diff --git a/configure.ac b/configure.ac
index 21e91dd0..799128bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,7 +376,7 @@ AC_ARG_ENABLE([raw],
     [libraw=$enableval], [libraw=auto])
 
 if test "x${libraw}" != "xno"; then
-  PKG_CHECK_MODULES(RAW, [libraw >= 0.19.5],
+  PKG_CHECK_MODULES(RAW, [libraw >= 0.20],
     [
       HAVE_RAW=yes
       AC_DEFINE(HAVE_RAW, 1, [define to enable libraw support])
diff --git a/doc/docbook/GuideIndex.xml b/doc/docbook/GuideIndex.xml
index 0f76e27e..986b8ef9 100644
--- a/doc/docbook/GuideIndex.xml
+++ b/doc/docbook/GuideIndex.xml
@@ -72,6 +72,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsMain.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsAdditional.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReference.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOtherSoftware.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideFaq.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideLicence.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideCredits.xml" />
diff --git a/doc/docbook/GuideOtherSoftware.xml b/doc/docbook/GuideOtherSoftware.xml
new file mode 100644
index 00000000..52765ddb
--- /dev/null
+++ b/doc/docbook/GuideOtherSoftware.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<chapter id="GuideOtherSoftware">
+  <title id="titleGuideOtherSoftware">Other Software</title>
+  <para>This is a list of other software that users might find useful in conjunction with Geeqie.</para>
+  <section id="Entangle">
+    <title>Entangle</title>
+    <para>
+      Tethered photography:
+      <ulink url="https://entangle-photo.org/">https://entangle-photo.org/</ulink>
+    </para>
+  </section>
+  <section id="Photini">
+    <title>Photini</title>
+    <para>
+      Digital photograph metadata editor:
+      <ulink url="https://photini.readthedocs.io/en/latest/">https://photini.readthedocs.io/en/latest/</ulink>
+    </para>
+  </section>
+</chapter>