Include a Other Software section in Help file

[geeqie.git] / web / geeqie-install-debian.sh

diff --git a/web/geeqie-install-debian.sh b/web/geeqie-install-debian.sh
index adff056..9a16278 100755 (executable)
--- a/web/geeqie-install-debian.sh
+++ b/web/geeqie-install-debian.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
-version="2019-08-09"
+version="2021-05-10"
 description=$'
 Geeqie is an image viewer.
 This script will download, compile, and install Geeqie on Debian-based systems.
 If run from a folder that already contains the Geeqie sources, the source
 code will be updated from the repository.
-Dialogs allow the user to install additional features, including
-additional pixbuf loaders.
+Dialogs allow the user to install additional features.
 
 Command line options are:
 -v --version The version of this file
@@ -25,6 +24,7 @@ essential_array=(
 "libglib2.0-0"
 "intltool"
 "libtool"
+"yelp-tools"
 )
 
 # Optional for both GTK2 and GTK3
@@ -67,6 +67,10 @@ optional_array=(
 "libwebp-dev"
 "libdjvulibre (for DjVu images)"
 "libdjvulibre-dev"
+"libopenjp2 (for JP2 images)"
+"libopenjp2-7-dev"
+"libraw (for CR3 images)"
+"libraw-dev"
 )
 
 # Optional for GTK3 only
@@ -79,14 +83,6 @@ optional_gtk3_array=(
 "libpoppler-glib-dev"
 )
 
-# Optional pixbuf loaders
-optional_loaders_array=(
-".psd Photoshop images"
-"psd"
-".xcf Gimp files"
-"xcf"
-)
-
 ####################################################################
 # Get System Info
 # Derived from: https://github.com/coto/server-easy-install (GPL)
@@ -207,70 +203,6 @@ install_options()
        fi
 }
 
-install_psd()
-{
-       rm -rf gdk-pixbuf-psd
-       git clone https://github.com/and-rom/gdk-pixbuf-psd.git
-       cd gdk-pixbuf-psd
-       ./autogen.sh
-       make
-       sudo --askpass make install
-       sudo --askpass gdk-pixbuf-query-loaders --update-cache
-       cd -
-       rm -rf gdk-pixbuf-psd
-}
-
-install_xcf()
-{
-       rm -rf xcf-pixbuf-loader
-       package_install libbz2-dev
-       git clone https://github.com/StephaneDelcroix/xcf-pixbuf-loader.git
-       cd xcf-pixbuf-loader
-       ./autogen.sh
-       make
-
-       # There must be a better way...
-       loader_locn=$(gdk-pixbuf-query-loaders | grep "LoaderDir" | tr -d '#[:space:]')
-
-       OLDIFS=$IFS
-       IFS='='
-       set $loader_locn
-       OLDIFS=$IFS
-
-       if [ -d $2 ]
-       then
-               sudo --askpass cp .libs/libioxcf.so $2
-               sudo --askpass gdk-pixbuf-query-loaders --update-cache
-       fi
-       cd -
-       rm -rf xcf-pixbuf-loader
-}
-
-install_extra_loaders()
-{
-       if [ -n "$extra_loaders" ]
-       then
-               OLDIFS=$IFS
-               IFS='|'
-               set $extra_loaders
-               while [ $# -gt 0 ];
-               do
-                       case $1 in
-                       "psd" )
-                               install_psd
-                       ;;
-                       "xcf" )
-                               install_xcf
-                       ;;
-                       esac
-
-                       shift
-               done
-               IFS=$OLDIFS
-       fi
-       return
-}
-
 uninstall()
 {
        current_dir=$(basename $PWD)
@@ -359,7 +291,7 @@ Machine: $MACH" 2>/dev/null
        exit
 fi
 
-# Parse the comand line
+# Parse the command line
 OPTS=$(getopt -o vhc:t:b:d: --long version,help,commit:,tag:,back:,debug: -- "$@")
 eval set -- "$OPTS"
 
@@ -524,44 +456,6 @@ then
        done
 fi
 
-# Get the optional loaders not yet installed
-((i=0))
-gdk-pixbuf-query-loaders | grep WebP >/dev/null
-if [[ $? == 1 ]]
-then
-       if [ -z "$loaders_string" ]
-       then
-               loaders_string=$'FALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-       else
-               loaders_string="$loaders_string"$'\nFALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-
-       fi
-fi
-
-((i=i+2))
-gdk-pixbuf-query-loaders | grep psd >/dev/null
-if [[ $? == 1 ]]
-then
-       if [ -z "$loaders_string" ]
-       then
-               loaders_string=$'FALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-       else
-               loaders_string="$loaders_string"$'\nFALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-       fi
-fi
-
-((i=i+2))
-gdk-pixbuf-query-loaders | grep xcf >/dev/null
-if [[ $? == 1 ]]
-then
-       if [ -z "$loaders_string" ]
-       then
-               loaders_string=$'FALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-       else
-               loaders_string="$loaders_string"$'\nFALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-       fi
-fi
-
 kill $zen_pid 2>/dev/null
 
 # Ask the user which options to install
@@ -575,17 +469,6 @@ then
        fi
 fi
 
-# Ask the user which extra loaders to install
-if [ -n "$loaders_string" ]
-then
-       extra_loaders=$(echo "$loaders_string" | zenity --title="$title" --width=370 --height=400 --list --checklist --text 'These loaders are not part of the main repository,\nbut are known to work to some extent.' --column='Select' --column='Library files' --column='Library' --hide-column=3 --print-column=3 2>/dev/null)
-
-       if [[ $? == 1 ]]
-       then
-               exit_install
-       fi
-fi
-
 # Start of Zenity progress section
 zen_pipe=$(mktemp --dry-run --tmpdir geeqie_install_pipe_XXXXXX)
 mkfifo $zen_pipe
@@ -604,8 +487,6 @@ install_options
 echo "6" > $zen_pipe
 echo "#Installing extra loaders..." > $zen_pipe
 
-install_extra_loaders
-
 echo "10" > $zen_pipe
 echo "#Getting new sources from server..." > $zen_pipe