Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / 
gimp


Commits:
cff8430a by Christian Hesse at 2024-09-24T21:58:37+02:00
upgpkg: 2.10.38-4: fix detection of libheif >= 1.18.0

- - - - -


3 changed files:

- .SRCINFO
- + 0002-fix-detection-of-libheif-1.15.0.patch
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = gimp
        pkgdesc = GNU Image Manipulation Program
        pkgver = 2.10.38
-       pkgrel = 3
+       pkgrel = 4
        url = https://www.gimp.org/
        install = gimp.install
        arch = x86_64
@@ -62,9 +62,11 @@ pkgbase = gimp
        optdepends = gvfs: for HTTP/S support (and many other schemes)
        source = https://download.gimp.org/pub/gimp/v2.10/gimp-2.10.38.tar.bz2
        source = 0001-no-check-update.patch
+       source = 0002-fix-detection-of-libheif-1.15.0.patch
        source = linux.gpl
        sha256sums = 
50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e
        sha256sums = 
ac3e8b44cf391f4ab3050652f2cc1f146f451fb25178d5a596d905f5bad13fcf
+       sha256sums = 
24814e981121830242f0a9b7d1da99e7282b247b87b482e2b394cff75b4675ef
        sha256sums = 
1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3
 
 pkgname = gimp


=====================================
0002-fix-detection-of-libheif-1.15.0.patch
=====================================
@@ -0,0 +1,46 @@
+From 0837165331607989b53b48c1067bcf96612a5873 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Tue, 24 Sep 2024 21:41:59 +0200
+Subject: [PATCH 1/1] fix detection of libheif >= 1.18.0
+
+https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a
+---
+ configure.ac | 25 +++++++------------------
+ 1 file changed, 7 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48c3c77..7c857bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1843,24 +1843,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`
+-  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`
+-  if test "x$can_import_avif" = xyes; then
+-    MIME_TYPES="$MIME_TYPES;image/avif"
+-  fi
+-
+-  if test "x$can_import_heic" != xyes && test "x$can_import_avif" != xyes; 
then
+-    have_libheif=no
+-    have_libheif_1_4_0=no
+-    warning_libheif=""
+-  else
+-    FILE_HEIF='file-heif$(EXEEXT)'
+-  fi
++  can_import_heic=yes
++  can_export_heic=yes
++  can_import_avif=yes
++  can_export_avif=yes
++  MIME_TYPES="$MIME_TYPES;image/heif;image/heic"
++  MIME_TYPES="$MIME_TYPES;image/avif"
++  FILE_HEIF='file-heif$(EXEEXT)'
+ fi
+ 
+ AC_SUBST(FILE_HEIF)


=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
 
 pkgname=gimp
 pkgver=2.10.38
-pkgrel=3
+pkgrel=4
 pkgdesc='GNU Image Manipulation Program'
 url='https://www.gimp.org/'
 arch=('x86_64')
@@ -29,15 +29,18 @@ optdepends=('alsa-lib: for MIDI event controller module'
 install=gimp.install
 
source=(https://download.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         0001-no-check-update.patch
+        0002-fix-detection-of-libheif-1.15.0.patch
         linux.gpl)
 sha256sums=('50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e'
             'ac3e8b44cf391f4ab3050652f2cc1f146f451fb25178d5a596d905f5bad13fcf'
+            '24814e981121830242f0a9b7d1da99e7282b247b87b482e2b394cff75b4675ef'
             '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
   patch -Np1 < ../0001-no-check-update.patch
+  patch -Np1 < ../0002-fix-detection-of-libheif-1.15.0.patch
 
   autoreconf -vi
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gimp/-/commit/cff8430ad264ad5e15dd6c0e0d6a24cbfc97f69d

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gimp/-/commit/cff8430ad264ad5e15dd6c0e0d6a24cbfc97f69d
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to