yes | sudo apt-get install liblua5.3-dev
yes | sudo apt-get install libpoppler-glib-dev
yes | sudo apt-get install libraw-dev libomp-dev
+ yes | sudo apt-get install libwebp-dev
yes | sudo apt-get install git
yes | sudo apt-get install python3 python3-pip python3-setuptools python3-wheel ninja-build
yes | sudo apt-get install meson
yes | sudo apt-get install gettext
mkdir -p $GITHUB_WORKSPACE/AppDir
mkdir -p $GITHUB_WORKSPACE/AppDir/usr
- meson setup -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgit=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dyelp-build=disabled -Dprefix=$GITHUB_WORKSPACE/AppDir/usr build
+ meson setup -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgit=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=disabled -Dyelp-build=disabled -Dprefix=$GITHUB_WORKSPACE/AppDir/usr build
ninja -C build install
tar -czvf geeqie.gz $GITHUB_WORKSPACE/
with:
action: build
directory: build
- setup-options: -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgit=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dyelp-build=disabled
+ setup-options: -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgit=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=disabled -Dyelp-build=disabled
options: --verbose
meson-version: 0.56.2
- run: sudo apt-get install liblua5.3-dev
- run: sudo apt-get install libpoppler-glib-dev
- run: sudo apt-get install libraw-dev libomp-dev
- - run: sudo apt-get install webp-pixbuf-loader
+ - run: sudo apt-get install libwebp-dev
- uses: actions/checkout@v3
- run: git fetch --tags --force
- libraw20
- librsvg2-common
- libtiff5
+ - libwebp7
files:
include: []
- libraw20
- librsvg2-common
- libtiff5
+ - libwebp7
files:
include: []
/* Define to enable use of custom tiff loader */
#mesondefine HAVE_TIFF
+/* Define to enable use of custom webp loader */
+#mesondefine HAVE_WEBP
+
/* Version number of package */
#mesondefine VERSION
HAVE_PDF=1 \
HAVE_RAW=1 \
HAVE_SPELL=1 \
- HAVE_TIFF=1
+ HAVE_TIFF=1 \
+ HAVE_WEBP
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
summary({'videothumbnailer' : ['disabled -thumbnails of video files supported', false]}, section : 'Configuration', bool_yn : true)
endif
-# libpixbufloader-webp is not loaded as part of libgdk-pixbuf. Just issue
-# a warning if not installed
-libwebp_dir = dependency('gdk-pixbuf-2.0', method: 'pkg-config').get_variable(pkgconfig: 'gdk_pixbuf_moduledir', internal: 'gdk_pixbuf_moduledir')
-
-if libwebp_dir.contains('loaders')
- libwebp_dep = cc.find_library('pixbufloader-webp', dirs : libwebp_dir, required : false)
+libwebp_dep = []
+req_version = '>=0.6.1'
+option = get_option('webp')
+if not option.disabled()
+ libwebp_dep = dependency('libwebp', version : req_version, required : get_option('webp'))
if libwebp_dep.found()
+ conf_data.set('HAVE_WEBP', 1)
summary({'webp' : ['webp files supported:', true]}, section : 'Configuration', bool_yn : true)
else
- summary({'webp' : ['webp-pixbuf-loader not installed - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
+ summary({'webp' : ['libwebp ' + req_version + ' not found - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
else
- summary({'webp' : ['webp-pixbuf-loader not installed - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
+ summary({'webp' : ['disabled - webp files supported:', false]}, section : 'Configuration', bool_yn : true)
endif
# Check for nl_langinfo and _NL_TIME_FIRST_WEEKDAY
option('spell', type : 'feature', value : 'auto', description : 'spelling checks')
option('tiff', type : 'feature', value : 'auto', description : 'tiff')
option('videothumbnailer', type : 'feature', value : 'auto', description : 'video thumbnailer')
+option('webp', type : 'feature', value : 'auto', description : 'webp')
option('yelp-build', type : 'feature', value : 'auto', description : 'help files')
--- /dev/null
+/*
+ * Copyright (C) 20019 - The Geeqie Team
+ *
+ * Author: Colin Clark
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "main.h"
+
+#include "image-load.h"
+#include "image-load-webp.h"
+
+#ifdef HAVE_WEBP
+#include <webp/decode.h>
+
+typedef struct _ImageLoaderWEBP ImageLoaderWEBP;
+struct _ImageLoaderWEBP {
+ ImageLoaderBackendCbAreaUpdated area_updated_cb;
+ ImageLoaderBackendCbSize size_cb;
+ ImageLoaderBackendCbAreaPrepared area_prepared_cb;
+ gpointer data;
+ GdkPixbuf *pixbuf;
+ guint requested_width;
+ guint requested_height;
+ gboolean abort;
+};
+
+static void free_buffer(guchar *pixels, gpointer)
+{
+ g_free(pixels);
+}
+
+static gboolean image_loader_webp_load(gpointer loader, const guchar *buf, gsize count, GError **)
+{
+ auto ld = static_cast<ImageLoaderWEBP *>(loader);
+ gboolean res_info;
+ gint width, height;
+ guint8* data;
+ VP8StatusCode status_code;
+ WebPBitstreamFeatures features;
+
+ res_info = WebPGetInfo(buf, count, &width, &height);
+ if (!res_info)
+ {
+ log_printf("warning: webp reader error\n");
+ return FALSE;
+ }
+
+ status_code = WebPGetFeatures(buf, count, &features);
+ if (status_code != VP8_STATUS_OK)
+ {
+ log_printf("warning: webp reader error\n");
+ return FALSE;
+ }
+
+ if (features.has_alpha)
+ {
+ data = WebPDecodeRGBA(buf, count, &width, &height);
+ }
+ else
+ {
+ data = WebPDecodeRGB(buf, count, &width, &height);
+ }
+
+ ld->pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, features.has_alpha, 8, width, height, width * (features.has_alpha ? 4 : 3), free_buffer, NULL);
+
+ ld->area_updated_cb(loader, 0, 0, width, height, ld->data);
+
+ return TRUE;
+}
+
+static gpointer image_loader_webp_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
+{
+ auto loader = g_new0(ImageLoaderWEBP, 1);
+ loader->area_updated_cb = area_updated_cb;
+ loader->size_cb = size_cb;
+ loader->area_prepared_cb = area_prepared_cb;
+ loader->data = data;
+ return (gpointer) loader;
+}
+
+static void image_loader_webp_set_size(gpointer loader, int width, int height)
+{
+ auto ld = static_cast<ImageLoaderWEBP *>(loader);
+ ld->requested_width = width;
+ ld->requested_height = height;
+}
+
+static GdkPixbuf* image_loader_webp_get_pixbuf(gpointer loader)
+{
+ auto ld = static_cast<ImageLoaderWEBP *>(loader);
+ return ld->pixbuf;
+}
+
+static gchar* image_loader_webp_get_format_name(gpointer)
+{
+ return g_strdup("webp");
+}
+
+static gchar** image_loader_webp_get_format_mime_types(gpointer)
+{
+ static const gchar *mime[] = {"image/webp", nullptr};
+ return g_strdupv(const_cast<gchar **>(mime));
+}
+
+static gboolean image_loader_webp_close(gpointer, GError **)
+{
+ return TRUE;
+}
+
+static void image_loader_webp_abort(gpointer loader)
+{
+ auto ld = static_cast<ImageLoaderWEBP *>(loader);
+ ld->abort = TRUE;
+}
+
+static void image_loader_webp_free(gpointer loader)
+{
+ auto ld = static_cast<ImageLoaderWEBP *>(loader);
+ if (ld->pixbuf) g_object_unref(ld->pixbuf);
+ g_free(ld);
+}
+
+void image_loader_backend_set_webp(ImageLoaderBackend *funcs)
+{
+ funcs->loader_new = image_loader_webp_new;
+ funcs->set_size = image_loader_webp_set_size;
+ funcs->load = image_loader_webp_load;
+ funcs->write = NULL;
+ funcs->get_pixbuf = image_loader_webp_get_pixbuf;
+ funcs->close = image_loader_webp_close;
+ funcs->abort = image_loader_webp_abort;
+ funcs->free = image_loader_webp_free;
+ funcs->get_format_name = image_loader_webp_get_format_name;
+ funcs->get_format_mime_types = image_loader_webp_get_format_mime_types;
+}
+
+#endif
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- /dev/null
+/*
+ * Copyright (C) 20019 - The Geeqie Team
+ *
+ * Author: Colin Clark
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef IMAGE_LOAD_WEBP_H
+#define IMAGE_LOAD_WEBP_H
+
+#ifdef HAVE_WEBP
+void image_loader_backend_set_webp(ImageLoaderBackend *funcs);
+#endif
+
+#endif
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
#include "image-load-libraw.h"
#include "image-load-psd.h"
#include "image-load-svgz.h"
+#include "image-load-webp.h"
#include "image-load-zxscr.h"
#include "misc.h"
#include "ui-fileops.h"
}
else
#endif
+#ifdef HAVE_WEBP
+ if (il->bytes_total >= 12 &&
+ (memcmp(il->mapped_file, "RIFF", 4) == 0) &&
+ (memcmp(il->mapped_file + 8, "WEBP", 4) == 0))
+ {
+ DEBUG_1("Using custom webp loader");
+ image_loader_backend_set_webp(&il->backend);
+ }
+ else
+#endif
#ifdef HAVE_DJVU
if (il->bytes_total >= 16 &&
(memcmp(il->mapped_file, "AT&TFORM", 8) == 0) &&
'image-load-svgz.h',
'image-load-tiff.cc',
'image-load-tiff.h',
+'image-load-webp.cc',
+'image-load-webp.h',
'image-load-zxscr.cc',
'image-load-zxscr.h',
'image-overlay.cc',
libopenjp2_dep,
libraw_dep,
libunwind_dep,
+libwebp_dep,
lua_dep,
poppler_glib_dep,
thread_dep,
projects / geeqie.git / commitdiff