CVS commit: pkgsrc/graphics/gimp

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jul 15 11:39:40 UTC 2024

Modified Files:
        pkgsrc/graphics/gimp: distinfo
        pkgsrc/graphics/gimp/patches: patch-ab

Log Message:
graphics/gimp: Hard code return value from pkg-config

* libheif-1.18.0 has not variables in libheif.pc to be returned.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/graphics/gimp/distinfo
cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/gimp/patches/patch-ab

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

Modified files:

Index: pkgsrc/graphics/gimp/distinfo
diff -u pkgsrc/graphics/gimp/distinfo:1.117 pkgsrc/graphics/gimp/distinfo:1.118
--- pkgsrc/graphics/gimp/distinfo:1.117 Mon May  6 17:53:10 2024
+++ pkgsrc/graphics/gimp/distinfo       Mon Jul 15 11:39:40 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.117 2024/05/06 17:53:10 wiz Exp $
+$NetBSD: distinfo,v 1.118 2024/07/15 11:39:40 ryoon Exp $
 
 BLAKE2s (gimp-2.10.38.tar.bz2) = 337d56b37f1153ed939203be9b26b12152c628b63327da1cb7510c6e06959a5c
 SHA512 (gimp-2.10.38.tar.bz2) = 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 Size (gimp-2.10.38.tar.bz2) = 31698453 bytes
 SHA1 (patch-aa) = 403c46d7070de208769e99e512922ba3a5b7129b
-SHA1 (patch-ab) = 44d37daf37ec604f97bb5b3edf0908ada56ed6d6
+SHA1 (patch-ab) = 684bc8868561ab96db0a6a56afdcc7cdcdc5f26b
 SHA1 (patch-app_core_gimpbrush-transform.cc) = 3bd3f69401ee7dabb53f7ebf533870ee9add856c
 SHA1 (patch-app_gui_gui.c) = 781a44f0779305b9d39deb14f4b8ef1cf06137ff
 SHA1 (patch-configure.ac) = c7e89bc9fd576eb95a9288eccea8959cbe1ee6de

Index: pkgsrc/graphics/gimp/patches/patch-ab
diff -u pkgsrc/graphics/gimp/patches/patch-ab:1.44 pkgsrc/graphics/gimp/patches/patch-ab:1.45
--- pkgsrc/graphics/gimp/patches/patch-ab:1.44  Fri Jul 14 18:25:48 2023
+++ pkgsrc/graphics/gimp/patches/patch-ab       Mon Jul 15 11:39:40 2024
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.44 2023/07/14 18:25:48 ryoon Exp $
+$NetBSD: patch-ab,v 1.45 2024/07/15 11:39:40 ryoon Exp $
 
 CC_VERSION_OPTS for gcc is modified to avoid going through the link
 stage. If pkgsrc appends or prepends any linker flags through
 CWRAPPERS (e.g. for MKRELRO), getting the version of the compiler may
 fail because GCC will try to link the nonexistent program.
 
---- configure.orig     2021-09-14 15:56:15.000000000 +0000
+As of libheif-1.18.0, builtin_h265_decoder and so on are not available
+anymore.
+
+--- configure.orig     2024-05-03 00:36:33.000000000 +0000
 +++ configure
-@@ -22344,11 +22344,11 @@ WARNING: GCC 7.2.0 has a serious bug aff
+@@ -21054,11 +21054,11 @@ WARNING: GCC 7.2.0 has a serious bug aff
           See https://bugzilla.gnome.org/show_bug.cgi?id=787222";
    fi
    # For GCC, use -v which has more information than --version.
@@ -21,7 +24,25 @@ fail because GCC will try to link the no
  fi
  
  for CC_VERSION_OPT in $CC_VERSION_OPTS; do
-@@ -36084,7 +36084,7 @@ esac
+@@ -30417,13 +30417,13 @@ can_export_heic=no
+ can_import_avif=no
+ can_export_avif=no
+ if test "x$have_libheif" = xyes; then
+-  can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif`
+-  can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif`
++  can_import_heic=yes
++  can_export_heic=yes
+   if test "x$can_import_heic" = xyes; then
+     MIME_TYPES="$MIME_TYPES;image/heif;image/heic"
+   fi
+-  can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif`
+-  can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif`
++  can_import_avif=yes
++  can_export_avif=yes
+   if test "x$can_import_avif" = xyes; then
+     MIME_TYPES="$MIME_TYPES;image/avif"
+   fi
+@@ -34799,7 +34799,7 @@ esac
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"