From nobody Thu Aug 15 11:54:39 2024 X-Original-To: dev-commits-ports-all@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 4Wl3Sv5nxlz5TV9N; Thu, 15 Aug 2024 11:54:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl3Sv3qKLz3y0g; Thu, 15 Aug 2024 11:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722879; 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=HszCsBEj0t0SCIeobD6Ug5NibnfGXqnhspo5BimQRjU=; b=OxH5eLaJJwsO9TS6+CNIdUTiCW7NSVv3aR5qtiar62gmjHVlLTPJgc8Fy1YUFNcC/GIJY3 UAEyITAilhHUhYPANTzvTPzSA43hhAl10AzNOJ3AhbqCQt6DVxxTSG6W+u+YSrJyMk4mEV mC86AXJnJVMsF14+4XQ0iuC8UxvxUmmURgCOqU0880KtCwwdJWPK8U3YbSwNJlsFHalIh/ esB1/gsU0llls4/iVDq9I077uMGWuJtjgvoykyizaIt3tAohxEGqy4upSQl0PkE8895S+F vZfxy3HFjmQlRF30FHq7x06mPe1A3BrbwlZEci4ZUWgLwp9U9gqMHs+zw0CNKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723722879; a=rsa-sha256; cv=none; b=uDmSTYRi6GRSN8jKjKrYmZ2Hiojf+8o9fy8aE2OVplq5WzZkv4oY+cJPS+CCPm/UcpCVYt FDhP7e5Jl9NvO/z7HZVSaUK0iLQBvH+oOSf0x5zZWvKssRK64zF+yyS7oFad8Ts0/wnOEz igrvLMBO2ZQXKoogknpYgr4xYTxWZb9w2+xeQSwKvAGJB7Ee14+Rx16u+LQIZea/sDsu7p Flb8whkXluZctpuez8xWpLo0Za4a/qrwiu0zHKad65B2bT+Kg9Vyig4z1UvAJaAQiR6NwB Zqa8mIPld3xNIIBM3P/p1Dxzhj5qxFsiGeaEVqK7jyHuj0+curY9JeqBeAOwUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722879; 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=HszCsBEj0t0SCIeobD6Ug5NibnfGXqnhspo5BimQRjU=; b=N8oap6yv7E8SqtaoJl+0ncWi7PtVVOmVbRtrLkfhK3szUW26n78xuESdNMEk9VyuOUnpQm yoNnApEJDmQd47Y29UXo/OeSksg6osjk6brC9rG3QfUYnr4WoqbbghvMP5id0tA1AvQ6xx O01mbyARfHtADwzjU2Y0LDP4TH9b4pCGuV4h5rcBw3Y57JGCx/Qh9Ii72nSdZQiPrnMZtI ahGRwFmOT9gqs5G2qB4GTgUxFid3+0/DgrDXWJSnQIR8S3j3lyU8VIlz43kZpC8w86+Vrg fIERrhCr0UcTpl5epy45xWedKIo4radoY2LKjUDwOQE21ztzJC/H1K7olM+ICw== 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 4Wl3Sv3R3vzMMZ; Thu, 15 Aug 2024 11:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FBsdGT056920; Thu, 15 Aug 2024 11:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FBsdk4056917; Thu, 15 Aug 2024 11:54:39 GMT (envelope-from git) Date: Thu, 15 Aug 2024 11:54:39 GMT Message-Id: <202408151154.47FBsdk4056917@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 87ccdb191def - main - graphics/vips: Add x11 and nox11 flavors List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87ccdb191deff44cfd027ef1370a0e7b9f615d74 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=87ccdb191deff44cfd027ef1370a0e7b9f615d74 commit 87ccdb191deff44cfd027ef1370a0e7b9f615d74 Author: Po-Chuan Hsieh AuthorDate: 2024-08-15 09:41:31 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-08-15 10:55:27 +0000 graphics/vips: Add x11 and nox11 flavors --- graphics/vips/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index c247570db237..e275c3d73622 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -41,6 +41,12 @@ USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:R} +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +nox11_PKGNAMESUFFIX= -nox11 + +CONFLICTS_INSTALL= vips vips-nox11 + SHEBANG_FILES= tools/vipsprofile OPTIONS_DEFINE= CFITSIO DOCS FFTW FONTCONFIG GIF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBARCHIVE LIBEXIF LIBRSVG2 MATIO OPENEXR PANGO PNG POPPLER SPNG TIFF WEBP @@ -66,7 +72,7 @@ FONTCONFIG_MESON_ENABLED= fontconfig GIF_BUILD_DEPENDS= cgif>=0.2.0:graphics/cgif GIF_LIB_DEPENDS= libcgif.so:graphics/cgif GIF_MESON_ENABLED= cgif -GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick +GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick@${FLAVOR} GRAPHMAGICK_MESON_ON= -Dmagick=enabled -Dmagick-package=GraphicsMagick HEIF_BUILD_DEPENDS= libheif>=1.4.0:graphics/libheif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif @@ -75,7 +81,7 @@ HIGHWAY_BUILD_DEPENDS= highway>=1.0.5:devel/highway HIGHWAY_LIB_DEPENDS= libhwy.so:devel/highway HIGHWAY_MESON_ENABLED= highway IMAGEMAGICK_MESON_ON= -Dmagick=enabled -Dmagick-package=MagickCore -IMAGEMAGICK_USES= magick +IMAGEMAGICK_USES= magick:${FLAVOR} IMAGEQUANT_LIB_DEPENDS= libimagequant.so:graphics/libimagequant IMAGEQUANT_MESON_ENABLED= imagequant JPEG_BUILD_DEPENDS= openjpeg>=2.4:graphics/openjpeg