- which mksquashfs || apt install squashfs-tools
AppDir:
+ after_runtime: |
+ ./scripts/patch-loaders-cache.sh
path: ./AppDir
app_info:
id: geeqie
- which mksquashfs || apt install squashfs-tools
AppDir:
+ after_runtime: |
+ ./scripts/patch-loaders-cache.sh
path: /home/runner/work/geeqie/geeqie/AppDir/
app_info:
id: geeqie
else
summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
endif
+
+if conf_data.has('HAVE_WEBP')
+ meson.add_install_script('./scripts/update-pixbuf-loaders-cache.sh')
+endif
'lua-test.sh',
'modify-downloaded-icons.sh',
'new-release.sh',
+'patch-loaders-cache.sh',
'template-desktop.sh',
'translators.sh',
'untranslated-text.sh',
+'update-pixbuf-loaders-cache.sh',
'web-help.sh')
--- /dev/null
+#!/bin/sh
+#**********************************************************************
+# Copyright (C) 2023 - 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.
+#**********************************************************************
+
+## @file
+## @brief Update pixbuf loaders.cache file
+##
+## Required only for webp-pixbuf-loader subproject, and
+## is run only when an AppImage is being created
+##
+
+loader=$(find ./AppDir -name libpixbufloader-webp.so)
+loaders_cache=$(find ./AppDir -name loaders.cache)
+dest=$(dirname "$loaders_cache" | sed s/local//)
+loaders_cache_dest=$(echo "$loaders_cache" | sed s/local//)
+
+cat << EOF >> "$loaders_cache"
+"libpixbufloader-webp.so"
+"webp" 5 "gdk-pixbuf" "The WebP image format" "LGPL"
+"image/webp" "audio/x-riff" ""
+"webp" ""
+"RIFFsizeWEBP" " xxxx " 100
+
+EOF
+
+cp -n "$loaders_cache" "$loaders_cache_dest"
+cp -n "$loader" "$dest""/loaders"
--- /dev/null
+#!/bin/sh
+#**********************************************************************
+# Copyright (C) 2023 - 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.
+#**********************************************************************
+
+## @file
+## @brief Update pixbuf loaders.cache file
+##
+## Required only for webp-pixbuf-loader subproject, and
+## only when Geeqie is being installed
+##
+
+loader=$(find /usr/local -name libpixbufloader-webp.so)
+dest=$(pkg-config gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir)
+
+sudo cp "$loader" "$dest"
+
+sudo "$(pkg-config gdk-pixbuf-2.0 --variable=gdk_pixbuf_query_loaders)" --update-cache
+++ /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',
project_sources += ClayRGB1998_icc_h
endif
+if conf_data.has('HAVE_WEBP')
+ webp_pixbuf_loader_proj = subproject('webp-pixbuf-loader')
+endif
+
geeqie_exe = executable('geeqie', project_sources,
dependencies : [
gtk_dep,
--- /dev/null
+diff --git a/meson.build b/meson.build
+index c46f11b..3b7d93a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,9 @@ if gdk_pb_moddir == ''
+ gdk_pb_moddir = gdkpb.get_variable(pkgconfig: 'gdk_pixbuf_moduledir', pkgconfig_define: ['prefix', get_option('prefix')])
+ endif
+
+-webp = dependency('libwebp', version: '>=1.3.2')
+-webpdemux = dependency('libwebpdemux', version: '>=1.3.2')
+-webpmux = dependency('libwebpmux', version: '>=1.3.2')
++webp = dependency('libwebp', version: '>=1.2.2')
++webpdemux = dependency('libwebpdemux', version: '>=1.2.2')
++webpmux = dependency('libwebpmux', version: '>=1.2.2')
+
+ pbl_webp = shared_module('pixbufloader-webp',
+ sources: ['io-webp.c', 'io-webp-anim.c', 'io-webp-anim-iter.c'],
--- /dev/null
+diff --git a/io-webp.c b/io-webp.c
+index c67e0a9..de2f83a 100644
+--- a/io-webp.c
++++ b/io-webp.c
+@@ -143,6 +143,8 @@ stop_load (gpointer data, GError **error)
+ {
+ if (context->prepare_func)
+ context->prepare_func (pb, GDK_PIXBUF_ANIMATION (anim), context->user_data);
++ if (context->update_func)
++ context->update_func (pb, 0, 0, context->width, context->height, context->user_data);
+ ret = TRUE;
+ }
+
+@@ -174,6 +176,9 @@ stop_load (gpointer data, GError **error)
+ return FALSE;
+ }
+
++ if (context->prepare_func)
++ context->prepare_func (pb, NULL, context->user_data);
++
+ if (icc_data)
+ {
+ gdk_pixbuf_set_option (pb, "icc-profile", icc_data);
+@@ -187,10 +192,8 @@ stop_load (gpointer data, GError **error)
+ context->buffer->len, &config);
+ if (status == VP8_STATUS_OK)
+ {
+- if (context->prepare_func)
+- context->prepare_func (pb, NULL, context->user_data);
+-
+- g_clear_object (&pb);
++ if (context->update_func)
++ context->update_func (pb, 0, 0, context->width, context->height, context->user_data);
+
+ ret = TRUE;
+ }
+@@ -198,6 +201,8 @@ stop_load (gpointer data, GError **error)
+ g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
+ "WebP decoder failed with VP8 status code: %d", status);
+ }
++
++ g_clear_object (&pb);
+ }
+
+ if (context->buffer)
--- /dev/null
+[wrap-git]
+url = https://github.com/aruiz/webp-pixbuf-loader.git
+revision = head
+depth = 1
+directory = webp-pixbuf-loader
+diff_files = webp-pixbuf-loader/pull-73.diff, webp-pixbuf-loader/meson-build.diff
projects / geeqie.git / commitdiff