Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Oct 2022 02:28:20 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f03467517e89 - main - graphics/GraphicsMagick: Clean up
Message-ID:  <202210030228.2932SKKl002156@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f03467517e890f9a7fdcc28a9c7b516ec1fd53af

commit f03467517e890f9a7fdcc28a9c7b516ec1fd53af
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-10-03 02:18:14 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.options.mk>
 
 .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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210030228.2932SKKl002156>