From fe1e2dad6b9d24566877f06d38411c6d581d3c70 Mon Sep 17 00:00:00 2001 From: Vladimir Druzenko Date: Fri, 24 May 2024 15:31:06 +0300 Subject: [PATCH] graphics/gimp{,-app},graphics/gegl,x11/babl: update to 2.10.38, 0.4.48, 0.1.108 Changelogs and News: https://www.gimp.org/news/2024/05/05/gimp-2-10-38-released/ https://gitlab.gnome.org/GNOME/gimp/-/blob/gimp-2-10/NEWS https://www.gegl.org/release-notes.html https://www.gegl.org/babl/ Also fix "graphics/gimp crash on quit". PR: 278789 278292 Reviewed by: diizzy Tested by: pkubaj (on powerpc*), saper@saper.info, tatsuki_makino@hotmail.com Approved by: gnome (maintainer, timeout > 2 weeks) Differential Revision: https://reviews.freebsd.org/D45094 --- graphics/gegl/Makefile | 9 +++------ graphics/gegl/distinfo | 8 +++----- .../gegl/files/patch-gegl_opencl_cl_platform_h | 13 ------------- .../files/patch-operations_external_png-load_c | 15 --------------- .../files/patch-operations_external_tiff-load_c | 15 --------------- graphics/gimp-app/Makefile | 4 ++-- graphics/gimp-app/distinfo | 6 +++--- graphics/gimp-app/pkg-plist | 1 + graphics/gimp/Makefile | 2 +- x11/babl/Makefile | 6 ++++-- x11/babl/distinfo | 6 +++--- x11/babl/pkg-plist | 1 + 12 files changed, 21 insertions(+), 65 deletions(-) delete mode 100644 graphics/gegl/files/patch-gegl_opencl_cl_platform_h delete mode 100644 graphics/gegl/files/patch-operations_external_png-load_c delete mode 100644 graphics/gegl/files/patch-operations_external_tiff-load_c diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index b7122cc8c081..3375c0063b1b 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -1,12 +1,8 @@ PORTNAME= gegl -PORTVERSION= 0.4.46 -PORTREVISION= 5 +PORTVERSION= 0.4.48 CATEGORIES= graphics MASTER_SITES= GIMP -PATCH_SITES= https://gitlab.gnome.org/GNOME/gegl/-/commit/ -PATCHFILES+= a99a93e5c9013bd4101f5058cdee7d0cf30234fe.patch:-p1 - MAINTAINER= gnome@FreeBSD.org COMMENT= Graph based image processing framework WWW= https://gegl.org/ @@ -33,6 +29,7 @@ USES+= compiler:c++14-lang USE_GNOME= glib20 introspection:build USE_LDCONFIG= yes MESON_ARGS= -Ddocs=false \ + -Dgi-docgen=disabled \ -Dworkshop=false \ -Dintrospection=true \ -Dlensfun=disabled \ @@ -46,7 +43,7 @@ MESON_ARGS= -Ddocs=false \ MESON_ARGS_armv6= -Dopenmp=disabled MESON_ARGS_armv7= -Dopenmp=disabled -GEGL_SHLIB= 0.445.1 +GEGL_SHLIB= 0.447.1 GEGL_VER= 0.4 PLIST_SUB+= GEGL_SHLIB=${GEGL_SHLIB} GEGL_VER=${GEGL_VER} diff --git a/graphics/gegl/distinfo b/graphics/gegl/distinfo index 3859286a4ef7..1ecd89b2a8ec 100644 --- a/graphics/gegl/distinfo +++ b/graphics/gegl/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1690532245 -SHA256 (gegl-0.4.46.tar.xz) = d0b3b2481bc8774c5f3d0a487611910166d18eef823a859fb91e781ab7b1e892 -SIZE (gegl-0.4.46.tar.xz) = 5799248 -SHA256 (a99a93e5c9013bd4101f5058cdee7d0cf30234fe.patch) = 87fd184bfe1d83e1a00dad3c0d57762bf5a6253ffa49fbec3eb000267dcb8c07 -SIZE (a99a93e5c9013bd4101f5058cdee7d0cf30234fe.patch) = 2588 +TIMESTAMP = 1714915707 +SHA256 (gegl-0.4.48.tar.xz) = 418c26d94be8805d7d98f6de0c6825ca26bd74fcacb6c188da47533d9ee28247 +SIZE (gegl-0.4.48.tar.xz) = 5805488 diff --git a/graphics/gegl/files/patch-gegl_opencl_cl_platform_h b/graphics/gegl/files/patch-gegl_opencl_cl_platform_h deleted file mode 100644 index 824a5565a3d8..000000000000 --- a/graphics/gegl/files/patch-gegl_opencl_cl_platform_h +++ /dev/null @@ -1,13 +0,0 @@ -Don't include altivec.h as this break the build on powerpc64. - -Index: gegl/opencl/cl_platform.h ---- gegl/opencl/cl_platform.h.orig -+++ gegl/opencl/cl_platform.h -@@ -270,7 +270,6 @@ typedef unsigned int cl_GLenum; - - /* Define basic vector types */ - #if defined( __VEC__ ) -- #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ - typedef vector unsigned char __cl_uchar16; - typedef vector signed char __cl_char16; - typedef vector unsigned short __cl_ushort8; diff --git a/graphics/gegl/files/patch-operations_external_png-load_c b/graphics/gegl/files/patch-operations_external_png-load_c deleted file mode 100644 index 9dbbc15e1362..000000000000 --- a/graphics/gegl/files/patch-operations_external_png-load_c +++ /dev/null @@ -1,15 +0,0 @@ -../gegl-0.4.30/operations/external/png-load.c:85:9: warning: -implicit declaration of function 'strptime' is invalid in C99 [-Wimplicit-function-declaration] - -Index: operations/external/png-load.c ---- operations/external/png-load.c.orig -+++ operations/external/png-load.c -@@ -20,7 +20,7 @@ - - #include "config.h" - #ifdef HAVE_STRPTIME --#define _XOPEN_SOURCE -+#define _XOPEN_SOURCE 700 - #include - #endif - #include diff --git a/graphics/gegl/files/patch-operations_external_tiff-load_c b/graphics/gegl/files/patch-operations_external_tiff-load_c deleted file mode 100644 index 26c2caa40cdd..000000000000 --- a/graphics/gegl/files/patch-operations_external_tiff-load_c +++ /dev/null @@ -1,15 +0,0 @@ -../gegl-0.4.30/operations/external/tiff-load.c:99:9: warning: -implicit declaration of function 'strptime' is invalid in C99 - -Index: operations/external/tiff-load.c ---- operations/external/tiff-load.c.orig -+++ operations/external/tiff-load.c -@@ -18,7 +18,7 @@ - - #include "config.h" - #ifdef HAVE_STRPTIME --#define _XOPEN_SOURCE -+#define _XOPEN_SOURCE 700 - #include - #endif - #include diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 47f89f5d1ad5..abe09738b338 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -1,6 +1,6 @@ PORTNAME?= gimp -PORTVERSION= 2.10.36 -PORTREVISION?= 3 +PORTVERSION= 2.10.38 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo index ccc648368da5..6e1f4aee5cbc 100644 --- a/graphics/gimp-app/distinfo +++ b/graphics/gimp-app/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707563571 -SHA256 (gimp-2.10.36.tar.bz2) = 3d3bc3c69a4bdb3aea9ba2d5385ed98ea03953f3857aafd1d6976011ed7cdbb2 -SIZE (gimp-2.10.36.tar.bz2) = 31532334 +TIMESTAMP = 1714916480 +SHA256 (gimp-2.10.38.tar.bz2) = 50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e +SIZE (gimp-2.10.38.tar.bz2) = 31698453 diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index 22e82127df33..d804c2b4c2ea 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -5218,6 +5218,7 @@ share/locale/ka/LC_MESSAGES/gimp20-libgimp.mo share/locale/ka/LC_MESSAGES/gimp20-python.mo share/locale/ka/LC_MESSAGES/gimp20-script-fu.mo share/locale/ka/LC_MESSAGES/gimp20-std-plug-ins.mo +share/locale/kab/LC_MESSAGES/gimp20-libgimp.mo share/locale/kab/LC_MESSAGES/gimp20-python.mo share/locale/kab/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/kk/LC_MESSAGES/gimp20-libgimp.mo diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 785b2f287adf..2692d2bd5120 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,5 +1,5 @@ PORTNAME= gimp -DISTVERSION?= 2.10.32 +DISTVERSION?= 2.10.38 PORTEPOCH?= 2 CATEGORIES= graphics gnome diff --git a/x11/babl/Makefile b/x11/babl/Makefile index c15881474fb0..92780d5951a5 100644 --- a/x11/babl/Makefile +++ b/x11/babl/Makefile @@ -1,5 +1,5 @@ PORTNAME= babl -PORTVERSION= 0.1.106 +PORTVERSION= 0.1.108 CATEGORIES= x11 MASTER_SITES= GIMP @@ -17,6 +17,8 @@ USES= gnome libtool localbase meson pathfix pkgconfig tar:xz vala:build USE_LDCONFIG= yes USE_GNOME= introspection:build +MESON_ARGS= -Dgi-docgen=disabled -Dwith-docs=false + OPTIONS_DEFINE= SIMD OPTIONS_DEFAULT_amd64=SIMD OPTIONS_EXCLUDE_i386=SIMD @@ -25,7 +27,7 @@ SIMD_MESON_OFF= -Denable-mmx=false -Denable-sse=false \ -Denable-sse2=false -Denable-sse4_1=false \ -Denable-avx2=false -Denable-f16c=false -BABL_SHLIB= 0.205.1 +BABL_SHLIB= 0.207.1 BABL_VER= 0.1 PLIST_SUB+= BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER} diff --git a/x11/babl/distinfo b/x11/babl/distinfo index 08a10bfb3616..7ee12c3b4e2b 100644 --- a/x11/babl/distinfo +++ b/x11/babl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684508483 -SHA256 (babl-0.1.106.tar.xz) = d325135d3304f088c134cc620013acf035de2e5d125a50a2d91054e7377c415f -SIZE (babl-0.1.106.tar.xz) = 315068 +TIMESTAMP = 1714875298 +SHA256 (babl-0.1.108.tar.xz) = 26defe9deaab7ac4d0e076cab49c2a0d6ebd0df0c31fd209925a5f07edee1475 +SIZE (babl-0.1.108.tar.xz) = 317036 diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist index 898dbcea2456..96b4e8ab971b 100644 --- a/x11/babl/pkg-plist +++ b/x11/babl/pkg-plist @@ -25,6 +25,7 @@ lib/babl-%%BABL_VER%%/cairo.so lib/babl-%%BABL_VER%%/double.so lib/babl-%%BABL_VER%%/fast-float.so lib/babl-%%BABL_VER%%/float.so +lib/babl-%%BABL_VER%%/formats.so lib/babl-%%BABL_VER%%/gegl-fixups.so lib/babl-%%BABL_VER%%/gggl-lies.so lib/babl-%%BABL_VER%%/gggl-table-lies.so