CVS commit: pkgsrc/graphics/webp-pixbuf-loader

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun Aug 13 00:34:47 UTC 2023

Modified Files:
        pkgsrc/graphics/webp-pixbuf-loader: Makefile distinfo
        pkgsrc/graphics/webp-pixbuf-loader/patches: patch-io-webp.c

Log Message:
webp-pixbuf-loader: update fix to make geeqie show webp properly.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/webp-pixbuf-loader/Makefile \
    pkgsrc/graphics/webp-pixbuf-loader/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/webp-pixbuf-loader/patches/patch-io-webp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/webp-pixbuf-loader/Makefile
diff -u pkgsrc/graphics/webp-pixbuf-loader/Makefile:1.2 pkgsrc/graphics/webp-pixbuf-loader/Makefile:1.3
--- pkgsrc/graphics/webp-pixbuf-loader/Makefile:1.2     Sat Aug  5 00:37:22 2023
+++ pkgsrc/graphics/webp-pixbuf-loader/Makefile Sun Aug 13 00:34:47 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2023/08/05 00:37:22 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2023/08/13 00:34:47 tsutsui Exp $
 
 DISTNAME=      webp-pixbuf-loader-0.2.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=aruiz/}
 GITHUB_PROJECT=        ${DISTNAME:S/-${PKGVERSION_NOREV}//}
Index: pkgsrc/graphics/webp-pixbuf-loader/distinfo
diff -u pkgsrc/graphics/webp-pixbuf-loader/distinfo:1.2 pkgsrc/graphics/webp-pixbuf-loader/distinfo:1.3
--- pkgsrc/graphics/webp-pixbuf-loader/distinfo:1.2     Sat Aug  5 00:37:22 2023
+++ pkgsrc/graphics/webp-pixbuf-loader/distinfo Sun Aug 13 00:34:47 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2023/08/05 00:37:22 tsutsui Exp $
+$NetBSD: distinfo,v 1.3 2023/08/13 00:34:47 tsutsui Exp $
 
 BLAKE2s (webp-pixbuf-loader-0.2.4.tar.gz) = a0ebdbe37b5ba2a163801b780fd2a900bdc47e590eecd119dedd8eef6402db9a
 SHA512 (webp-pixbuf-loader-0.2.4.tar.gz) = a367987a7c7ca4df594233a7b6fb281a1484026cdf8cb653d8513103e5d59e69d6ffaef1da8c6875be6d978b8a29251e5d89b6e2959e67057aae0f6cd7464b5e
 Size (webp-pixbuf-loader-0.2.4.tar.gz) = 9136758 bytes
-SHA1 (patch-io-webp.c) = 1714ba4186952c5bb53be931a44c1690e3a59783
+SHA1 (patch-io-webp.c) = c1f9121dfff42cfd445a627bf0f361dec6ce0a52

Index: pkgsrc/graphics/webp-pixbuf-loader/patches/patch-io-webp.c
diff -u pkgsrc/graphics/webp-pixbuf-loader/patches/patch-io-webp.c:1.2 pkgsrc/graphics/webp-pixbuf-loader/patches/patch-io-webp.c:1.3
--- pkgsrc/graphics/webp-pixbuf-loader/patches/patch-io-webp.c:1.2      Sat Aug  5 00:37:23 2023
+++ pkgsrc/graphics/webp-pixbuf-loader/patches/patch-io-webp.c  Sun Aug 13 00:34:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-io-webp.c,v 1.2 2023/08/05 00:37:23 tsutsui Exp $
+$NetBSD: patch-io-webp.c,v 1.3 2023/08/13 00:34:47 tsutsui Exp $
 
 - update_func() shall be called for proper signal delivery
   https://github.com/aruiz/webp-pixbuf-loader/pull/73
@@ -14,12 +14,35 @@ $NetBSD: patch-io-webp.c,v 1.2 2023/08/0
            ret = TRUE;
          }
  
-@@ -189,6 +191,8 @@ stop_load (gpointer data, GError **error
+@@ -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)
          {
-           if (context->prepare_func)
-             context->prepare_func (pb, NULL, context->user_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);
  
-           g_clear_object (&pb);
+           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)