From 9f16a7d1eec47001133dff47d0a6a1426447f4c2 Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Tue, 24 May 2016 14:22:28 +0100 Subject: [PATCH] Configuration options and documentation Configuration option changes: --enable-gps is now --enable-map --enable-clutter is now --enable-gpu-accel If --disable-gtk3 is issued, both map and gpu-accel options are also disabled. --enable-map is the only option required to compile in the map. README updated accordingly. --- README | 64 ++++++++++++++++++++++------ configure.in | 69 +++++++++++++++++-------------- doc/docbook/GuideOptionsImage.xml | 45 +++++++++----------- 3 files changed, 109 insertions(+), 69 deletions(-) diff --git a/README b/README index 9395d661..7c89f15d 100644 --- a/README +++ b/README @@ -49,21 +49,59 @@ geeqie-devel@lists.sourceforge.net ======== Requirements Required libraries: - GTK+ 2.20: ftp://ftp.gtk.org/pub/gtk + GTK+ 3.00 + www.gtk.org + enabled by default + disable with configure option: --disable-gtk3 + or + GTK+ 2.20 + disabled by default + enable with configure option: --disable-gtk3 + optional items map display and GPU acceleration + are not available with GTK2 Optional libraries: - lcms or lcms2, for color management support: http://www.littlecms.com - (disable with configure option: '--without-lcms') - exiv2, for enhanced exif support: http://www.exiv2.org/ - (disable with configure option: '--without-exiv2') - - due to fast development, newer versions work significantly better - FIXME: minimal version ? - lirc, for remote control support: http://www.lirc.org/ - (disable with configure option: '--disable-lirc') - libchamplain - experimental map support, dissabled by default - http://projects.gnome.org/libchamplain/ - WARNING: this library has a lot of dependencise - lua - Support for lua scripting + lcms2 2.0 + or + lcms 1.14 + www.littlecms.com + for color management support + enabled by default + disable with configure option: --disable-lcms + + exiv2 0.11 + www.exiv2.org + for enhanced exif support + enabled by default + disable with configure option: --disable-exiv2 + + lirc + www.lirc.org + for remote control support + enabled by default + disable with configure option: --disable-lirc + + libchamplain-gtk 0.12 + libchamplain 0.12 + libclutter 1.0 + wiki.gnome.org/Projects/libchamplain + for map display + disabled by default + enable with configure option: --enable-map + enabling will also enable GPU acceleration + + libclutter 1.0 + www.clutter-project.org + for GPU acceleration (a check-box on Preferences/Image must also be ticked) + disabled by default + enable with configure option: --enable-gpu-accel + explicitly disabling will also disable the map feature + + lua 5.1 + www.lua.org + support for lua scripting + enabled by default + disable with configure option: --disable-lua ======== Notes and changes for this release [section:release_notes] diff --git a/configure.in b/configure.in index b5c03ed3..00842e28 100644 --- a/configure.in +++ b/configure.in @@ -404,31 +404,38 @@ AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) -# clutter support - experimental +# clutter and champlain support # ---------------------------------------------------------------------- -AC_ARG_ENABLE([clutter], - AC_HELP_STRING([--enable-clutter], [enable clutter support - experimental]), +AC_ARG_ENABLE([map], + AC_HELP_STRING([--enable-map], [enable map support]), + [libgps=$enableval], [libgps=no]) + +AC_ARG_ENABLE([gpu-accel], + AC_HELP_STRING([--enable-gpu-accel], [enable GPU acceleration support - experimental]), [libclutter=$enableval], [libclutter=auto]) if test "x${libclutter}" = "xyes" -o "x${libgps}" = "xyes"; then - PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0], - [ - PKG_CHECK_MODULES(CLUTTER_GTK, [clutter-gtk-1.0 >= 1.0], + if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then + PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0], [ - HAVE_CLUTTER=yes - AC_DEFINE(HAVE_CLUTTER, 1, [define to enable use of clutter library]) + PKG_CHECK_MODULES(CLUTTER_GTK, [clutter-gtk-1.0 >= 1.0], + [ + HAVE_CLUTTER=yes + AC_DEFINE(HAVE_CLUTTER, 1, [define to enable use of clutter library]) + ], + [ + HAVE_CLUTTER=no + AC_MSG_WARN([$CLUTTER_GTK_PKG_ERRORS]) + ]) ], [ HAVE_CLUTTER=no - AC_MSG_WARN([$CLUTTER_GTK_PKG_ERRORS]) + AC_MSG_WARN([$CLUTTER_PKG_ERRORS]) ]) - - ], - [ - HAVE_CLUTTER=no - AC_MSG_WARN([$CLUTTER_PKG_ERRORS]) - ]) + else + HAVE_CLUTTER=disabled + fi else HAVE_CLUTTER=disabled fi @@ -439,23 +446,23 @@ AC_SUBST(CLUTTER_GTK_CFLAGS) AC_SUBST(CLUTTER_GTK_LIBS) -# Libchamplain support - used for GPS map facility - experimental +# Libchamplain support - used for map facility # ---------------------------------------------------------------------- -AC_ARG_ENABLE([gps], - AC_HELP_STRING([--enable-gps], [enable GPS map support - experimental]), - [libgps=$enableval], [libgps=yes]) - -if test "x${libgps}" = "xyes" -a "x${HAVE_CLUTTER}" = "xyes" ; then - PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12], - [ - HAVE_LIBCHAMPLAIN=yes - AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of GPS maps]) - ], - [ - HAVE_LIBCHAMPLAIN=no - AC_MSG_WARN([$LIBCHAMPLAIN_PKG_ERRORS]) - ]) +if test "x${libgps}" = "xyes" -a "x${HAVE_CLUTTER}" = "xyes"; then + if test "x${gtk3}" != "xno"; then + PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12], + [ + HAVE_LIBCHAMPLAIN=yes + AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of maps]) + ], + [ + HAVE_LIBCHAMPLAIN=no + AC_MSG_WARN([$LIBCHAMPLAIN_PKG_ERRORS]) + ]) + else + HAVE_LIBCHAMPLAIN=disabled + fi else HAVE_LIBCHAMPLAIN=disabled fi @@ -464,7 +471,7 @@ if test "x${libgps}" = "xyes" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.12 >= 0.12], [ HAVE_LIBCHAMPLAIN_GTK=yes - AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of GPS maps]) + AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of maps]) ], [ HAVE_LIBCHAMPLAIN_GTK=no diff --git a/doc/docbook/GuideOptionsImage.xml b/doc/docbook/GuideOptionsImage.xml index a26c206f..781da130 100644 --- a/doc/docbook/GuideOptionsImage.xml +++ b/doc/docbook/GuideOptionsImage.xml @@ -9,13 +9,12 @@
Zoom + Quality - - - Selects the method used to scale the size of an image. - - + + Selects the method used to scale the size of an image. + Nearest Fastest scaler, but results in poor image quality. @@ -31,31 +30,27 @@ Hyper Slowest scaler, sometimes gives better results than bilinear. - - - Two pass zooming - - - Enables Geeqie to first display a scaled image using the nearest zoom quality. After image decoding is complete, the image is scaled again using the selected “Zoom (scaling)” method. This allows faster display of an image as it is decoded from the source file. - - + + Use GPU acceleration via Clutter library + + Use alternate renderer. Geeqie must be compiled with the --enable-gpu-accel option. + + Two pass zooming + + Enables Geeqie to first display a scaled image using the nearest zoom quality. After image decoding is complete, the image is scaled again using the selected “Zoom (scaling)” method. This allows faster display of an image as it is decoded from the source file. + Allow enlargement of image for zoom to fit - - - Enable this to allow Geeqie to increase the image size for images that are smaller than the current view area when the zoom is set to “Fit to Window”. - - + + Enable this to allow Geeqie to increase the image size for images that are smaller than the current view area when the zoom is set to “Fit to Window”. + Limit image size when autofitting - - + This percentage will affect the size of the image when Fit image to window is set, instead of using 100% of the window, it will use the specified percentage. It allows one to keep a border around the image (values lower than 100%) or to auto zoom the image (values greater than 100%). It affects fullscreen mode too. - - + Zoom increment - - + Adjusts the step size when zooming in or out on an image. This value corresponds to the percentage of the original image. - +
Zoom control -- 2.20.1