From nobody Fri Jul 01 14:58:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4015D8A52FE; Fri, 1 Jul 2022 14:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LZJHK0k5Tz4fYh; Fri, 1 Jul 2022 14:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656687517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8YYnXs73A//8nsptDxKGBhf7XF45F2iiwRucI2oOAA=; b=YCc8/caHs4I2uVZ6TbO6UiNRi4cN0GkuvbPy8c7+9VssHLo/hppcbKYcnuguZvjzKOa2kT KndSX541tAOGixaVoRoBH+tyl/edwsfALW3/9Z0hN3GkVLxLNToEUxr9Amhu1iRtCDe8kd KeAiFA/qAk7sAPNginuYO1z7u13pH/qNmiVGvOwxuUJeWTRZkPtbsVf48nlw/jebaG2S3s w88Fd7nj0cAkigJTbXF9n5Ztz8tXsXqaovwhlBE6kyV2vB/jRpOg/H4kgZ0Ewusd3MirNj TimgZ+DnO+HpfCnxplIOZ0gMvDK7aw1atHJAFRBVhnLHZv2ZsZEy3ZrUAmqu4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D58461D0F0; Fri, 1 Jul 2022 14:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 261EwaSa058265; Fri, 1 Jul 2022 14:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261Ewa2i058264; Fri, 1 Jul 2022 14:58:36 GMT (envelope-from git) Date: Fri, 1 Jul 2022 14:58:36 GMT Message-Id: <202207011458.261Ewa2i058264@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: d609b6e51b28 - main - graphics/gimp-app: use HEIF and JXL options as default (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d609b6e51b28984a5ce70b8f58d64d4641d7d906 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656687517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8YYnXs73A//8nsptDxKGBhf7XF45F2iiwRucI2oOAA=; b=ibQML2rLdpozxWraw6z916tCh5eJRCBCvSXLsSarMmyLWfid/55ykK2ft/YBQp1HO0gzrR BCuHswoJ4ktlR4cv9MUXkDxGRdxAJgesw2o+I685o5ObXd5Y4u9y3Nd+p7ipGtgazb0GH3 NWpLRCD482rI9NoWfA2z02FJfPih6JGj+h0hn/aj00wpa0DPQPFJtS2tLcrPSqpRkMEzfa mQYtP/6P488b1un3MAl5O9s4YpqbWDPBaX9U2pBub/IZjULmguwrQyFbFLlV0vpeHQDUPM RnyTZ4B06Bpg0tDdZy12XrGbPyIX+6jl+oZ3d/MgIfeDZ/KPpdEH/WU2iRdqSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656687517; a=rsa-sha256; cv=none; b=NsnlV9/8XRT2VUaxjDPQ34SiJ9dQdmfAHDg68cD5zDPx1PhIuBRdjxnViYKvnMyvEtPAyn N1TTDbOS/b8b7lm/pKypin/NkJZH70n8VgMn4vS1JR+ji+73wvinAQTSk5P5Z5WzQARfEQ Tjd27oT/Q/ebvviHqTEoLUjWfjQQ0QX4lQ8X3SLwfR9LaJEzNMhNR8VIkZweXBegaxiSXR /GQ7SQkkpVG7Tx0oii93OXhhF1VG/7KSHyFGCLHaYri76I90vPVe3Zn6PDy6vRwKnRvsHl 0qzQDrZqDFsF0KE1dM328Je2QSiAXPD8BpUmChX5po2q2IhvWEGhoNhDj1wo/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d609b6e51b28984a5ce70b8f58d64d4641d7d906 commit d609b6e51b28984a5ce70b8f58d64d4641d7d906 Author: Dima Panov AuthorDate: 2022-07-01 12:55:39 +0000 Commit: Dima Panov CommitDate: 2022-07-01 14:58:25 +0000 graphics/gimp-app: use HEIF and JXL options as default (+) HEIF and JXL formats are very popular today and tends to be a portable standard. PR: 264870 --- graphics/gimp-app/Makefile | 118 ++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 56 deletions(-) diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 46dc75f87610..658499140867 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -2,7 +2,7 @@ PORTNAME?= gimp PORTVERSION= 2.10.32 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} @@ -18,25 +18,22 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes -LIB_DEPENDS= libpng.so:graphics/png \ - libtiff.so:graphics/tiff \ - libasound.so:audio/alsa-lib \ - liblcms2.so:graphics/lcms2 \ - libgegl-0.4.so:graphics/gegl \ + +LIB_DEPENDS= libasound.so:audio/alsa-lib \ libbabl-0.1.so:x11/babl \ - libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ - libpoppler-glib.so:graphics/poppler-glib \ + libfreetype.so:print/freetype2 \ + libgegl-0.4.so:graphics/gegl \ libgexiv2.so:graphics/gexiv2 \ + libharfbuzz.so:print/harfbuzz \ libjson-c.so:devel/json-c \ + libjson-glib-1.0.so:devel/json-glib \ + liblcms2.so:graphics/lcms2 \ libmypaint.so:graphics/libmypaint \ - libfreetype.so:print/freetype2 -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ - glib-networking>=0:net/glib-networking \ - mypaint-brushes>0:graphics/mypaint-brushes - -LIB_DEPENDS+= libjson-glib-1.0.so:devel/json-glib \ - ${LIB_DEPENDS_${ARCH}} + libpng.so:graphics/png \ + libpoppler-glib.so:graphics/poppler-glib \ + libtiff.so:graphics/tiff +LIB_DEPENDS+= ${LIB_DEPENDS_${ARCH}} LIB_DEPENDS_aarch64= libunwind.so:devel/libunwind LIB_DEPENDS_amd64= libunwind.so:devel/libunwind @@ -45,38 +42,45 @@ LIB_DEPENDS_i386= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64le= libunwind.so:devel/libunwind -GNU_CONFIGURE= yes +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ + glib-networking>=0:net/glib-networking \ + mypaint-brushes>0:graphics/mypaint-brushes + USES+= compiler:c++14-lang cpe gettext gmake gnome jpeg libtool \ localbase pkgconfig shebangfix tar:bzip2 xorg -USE_XORG= ice sm x11 xcursor xext xfixes xmu xpm xt +CPE_VENDOR= gimp +CPE_PRODUCT= gimp USE_GNOME+= cairo gtk20 intltool librsvg2 USE_LDCONFIG= yes +USE_XORG= ice sm x11 xcursor xext xfixes xmu xpm xt + +SHEBANG_FILES= plug-ins/pygimp/plug-ins/*.py + +GNU_CONFIGURE= yes +CONFIGURE_ARGS?= --with-html-dir=${PREFIX}/share/doc/gimp \ + --with-bug-report-url="https://bugs.freebsd.org/" \ + --disable-gtk-doc \ + --without-linux-input \ + --with-print \ + --without-gudev \ + --enable-default-binary \ + --disable-gimp-console \ + --disable-python \ + --without-appdata-test \ + --with-desktop-dir=${PREFIX}/share \ + --docdir=${PREFIX}/share/doc/gimp \ + --with-icc-directory=${LOCALBASE}/share/color/icc \ + --without-webkit \ + --enable-default-binary +CONFIGURE_ENV= GIMP_THREAD_LIBS=-lpthread + INSTALL_TARGET= install-strip -TEST_TARGET= check .if !defined(XAUTHORITY) TEST_ENV= XAUTHORITY=${HOME}/.Xauthority .endif -CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \ - --with-bug-report-url="https://bugs.freebsd.org/" \ - --disable-gtk-doc \ - --without-linux-input \ - --with-print \ - --without-gudev \ - --enable-default-binary \ - --disable-gimp-console \ - --disable-python \ - --without-appdata-test \ - --with-desktop-dir=${PREFIX}/share \ - --docdir=${PREFIX}/share/doc/gimp \ - --with-icc-directory=${LOCALBASE}/share/color/icc \ - --without-webkit \ - --enable-default-binary -CONFIGURE_ENV= GIMP_THREAD_LIBS=-lpthread -LIBS+= -lexecinfo -lm -CPE_VENDOR= gimp -CPE_PRODUCT= gimp +TEST_TARGET= check -SHEBANG_FILES= plug-ins/pygimp/plug-ins/*.py +LIBS+= -lexecinfo -lm PLIST_SUB+= LIBVER=0.1000.${PORTVERSION:E} @@ -84,18 +88,18 @@ PLIST_SUB+= LIBVER=0.1000.${PORTVERSION:E} USES+= desktop-file-utils -OPTIONS_DEFINE?= AALIB GHOSTSCRIPT JXL \ - HEIF LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF -OPTIONS_DEFAULT= AALIB LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF +OPTIONS_DEFINE?= AALIB GHOSTSCRIPT HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD \ + WEBP WMF +OPTIONS_DEFAULT= AALIB HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF OPTIONS_SUB= yes .endif .if defined(GIMP_SLAVE) -PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config -GIMP_LIBS= `${PKG_CONFIG} --libs gimp-2.0` -GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0` -GIMP_UI_LIBS= `${PKG_CONFIG} --libs gimpui-2.0` +PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config +GIMP_LIBS= `${PKG_CONFIG} --libs gimp-2.0` +GIMP_THUMB_LIBS= `${PKG_CONFIG} --libs gimpthumb-2.0` +GIMP_UI_LIBS= `${PKG_CONFIG} --libs gimpui-2.0` LIB_DEPENDS+= libgimp-2.0.so:graphics/gimp-app @@ -103,39 +107,41 @@ LIB_DEPENDS+= libgimp-2.0.so:graphics/gimp-app DEBUG_CONFIGURE_ON= --enable-debug -AALIB_DESC= Ascii-art Plug-in +AALIB_DESC= Ascii-art Plug-in +OPENJPEG_DESC= Enhanced JPEG (jpeg2000) graphics support + AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_WITH= aa GHOSTSCRIPT_USES= ghostscript GHOSTSCRIPT_CONFIGURE_WITH= gs -JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl -JXL_CONFIGURE_WITH= jpegxl - HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_CONFIGURE_WITH= libheif +JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +JXL_CONFIGURE_WITH= jpegxl + LIBMNG_LIB_DEPENDS= libmng.so:graphics/libmng LIBMNG_CONFIGURE_WITH= libmng -OPENEXR_CONFIGURE_WITH= openexr OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr +OPENEXR_CONFIGURE_WITH= openexr -OPENJPEG_DESC= Enhanced JPEG (jpeg2000) graphics support -OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg -OPENJPEG_CONFIGURE_WITH=jpeg2000 +OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +OPENJPEG_CONFIGURE_WITH= jpeg2000 SIMD_CONFIGURE_OFF= --disable-mmx \ --disable-sse \ --disable-altivec -WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CONFIGURE_WITH= webp + +WMF_LIB_DEPENDS= libexpat.so:textproc/expat2 \ + libwmf.so:graphics/libwmf -WMF_LIB_DEPENDS= libwmf.so:graphics/libwmf \ - libexpat.so:textproc/expat2 WMF_CONFIGURE_WITH= wmf .endif