From nobody Mon Oct 3 02:28:20 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 4MglBF2Dv1z4fBch; Mon, 3 Oct 2022 02:28:21 +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 4MglBF1ZXBz4PHj; Mon, 3 Oct 2022 02:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664764101; 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=bwciRRGFZu91k6BUq0ZLvbsmJ9SFbURr11pfVY6bG+A=; b=BtWmwX4XdUTiMJl/zrthu/nf50xnAkJ2Y1ystDVXI2SvoS0wtuQaVShw1yxonBmXmhWIN+ dap5kNlahCHbVbb926JCWjTZpS7cp++NkfxM8SZuPZOgj4CuahSSLXvM7DFvK4BuiXgY8X ovkVLdU9uYj4xviAci6C6eAvdWAfEsOkjZ4YT5U89M7TS6WhAoejcjdWqx90O3oJ9AU4l4 NnKIPDXU6LaEwhyE5lUs1G6ePjNk967QhYHEoN7IX1g2Pmj10iIjAEN9oegRQ6+Fju+0ps 3mllxUxZhHuUMurFCmKYPuMa7txmgIE/WjCguuAGG6k++fi1Np+ifUkZ58Iblg== 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 4MglBF0dsvz13fB; Mon, 3 Oct 2022 02:28:21 +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 2932SKut002157; Mon, 3 Oct 2022 02:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2932SKKl002156; Mon, 3 Oct 2022 02:28:20 GMT (envelope-from git) Date: Mon, 3 Oct 2022 02:28:20 GMT Message-Id: <202210030228.2932SKKl002156@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: f03467517e89 - main - graphics/GraphicsMagick: Clean up 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f03467517e890f9a7fdcc28a9c7b516ec1fd53af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664764101; 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=bwciRRGFZu91k6BUq0ZLvbsmJ9SFbURr11pfVY6bG+A=; b=FmyI6N/aablk03tjUwoRpEvnzxKpJD3gD0Ff7Qu3bLVkvA4dHKsOfDSZUe8aLsW1RwuS2G AThNGOhZDouIVsT7iWuu//feIEdEuSNzVSEd2KMQSQOIwrk92BwDkySnymBy7YIiRAc64V f2nBUXA2JRnbOj1nIu1OFmf+n11Yb4ojypWlUdgTdXBFEwUB95SNH0aDLidD90ux9SWNyv ug2K1TigyS4dmRImnB/O6qoIYRkS1FkZrjWuw/CpRnzweNaJuPSqjmj4nfdXQIAtMZT66z u0Ism76wT3e6fFGFCYf559yyD6nSqbt6xqgXfalGX+CeHgLsDcOaB0o7/mGT7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664764101; a=rsa-sha256; cv=none; b=QDlQs2vF9n4s1a37SjMPPH4L9pB3XXSHbKgELSy71kP44Amhp5ilqQUzy6Lk1Er9INTvQs vRQoDm751MN6Vv473wCqFczYdSKh6+T0MNk44NHotNaHesngBIdG4peO8GMsXnKHkN/TT/ f9fAG3LEcUTDcdBVd4mt8+n7siFhRGaEHbGvdW5YdoLKFquFLNOl591CjUP9eVIt22bA3V 2aYKIv94MFT8b/2/tdCmfPEoztjilVh+Omh0pWOBsyggqhk8WB/4gSpXey5MwpT3HDuKnw QAs6S4VFIA5/Ir6KmxsD3QUr1DwB85XzU5adfjDlyoRybuLAhnFnvaXq2oQI5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f03467517e890f9a7fdcc28a9c7b516ec1fd53af commit f03467517e890f9a7fdcc28a9c7b516ec1fd53af Author: Po-Chuan Hsieh AuthorDate: 2022-10-03 02:18:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-10-03 02:22:56 +0000 graphics/GraphicsMagick: Clean up - Do not force i386 to use GCC since LLVM has OpenMP support now - Remove SSE and UMEM options - Remove SSE option: use CPUTYPE instead - Remove UMEM option: it is for Solaris - Bump PORTREVISION for dependency and package change PR: 260505 Reported by: diizzy --- graphics/GraphicsMagick/Makefile | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 02be7007de34..63c380f50658 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,6 +1,6 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.38 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -25,10 +25,9 @@ USE_LDCONFIG= yes # Use fonts installed by x11-fonts/webfonts by default WINDOWS_FONT_DIR?= ${LOCALBASE}/share/fonts/webfonts -OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG SSE TEST TIFF UMEM WEBP WMF X11 XML ZLIB ZSTD +OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG TEST TIFF WEBP WMF X11 XML ZLIB ZSTD OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality) -UMEM_DESC= UMEM memory allocation library support TEST_DESC= Run bundled self-tests after build BZIP2_CONFIGURE_WITH= bzlib @@ -61,7 +60,6 @@ TEST_BUILD_DEPENDS= webfonts>=0:x11-fonts/webfonts TEST_RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts TIFF_CONFIGURE_WITH= tiff TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -UMEM_CONFIGURE_WITH= umem WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WMF_CONFIGURE_WITH= wmf @@ -79,23 +77,11 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include .if ${PORT_OPTIONS:MOPENMP} -.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le && ${ARCH} != riscv64 +.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le && ${ARCH} != riscv64 USES+= compiler:gcc-c++11-lib .endif .endif -.if ${PORT_OPTIONS:MSSE} -.if ${MACHINE_CPU:Msse} -CFLAGS+= -msse -.endif -.if ${MACHINE_CPU:Msse2} -CFLAGS+= -msse2 -.endif -.if ${MACHINE_CPU:Msse3} -CFLAGS+= -msse3 -.endif -.endif - .if ${PORT_OPTIONS:MWMF} .if ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libwmflite.so:graphics/libwmf