svn commit: r568532 - in head/graphics/freeimage: . files

[Piotr Kubaj]

Author: pkubaj
Date: Tue Mar 16 00:46:20 2021
New Revision: 568532
URL: https://svnweb.freebsd.org/changeset/ports/568532

Log:
  graphics/freeimage: fix build on powerpc64 with CPUTYPE=power7 or higher and on powerpc64le
  
  The bundled png is set up for VSX autodetection, but no actual VSX-related code is included.

Added:
  head/graphics/freeimage/files/patch-Source_LibPNG_pngpriv.h   (contents, props changed)
Modified:
  head/graphics/freeimage/Makefile

Modified: head/graphics/freeimage/Makefile
==============================================================================
--- head/graphics/freeimage/Makefile	Tue Mar 16 00:24:04 2021	(r568531)
+++ head/graphics/freeimage/Makefile	Tue Mar 16 00:46:20 2021	(r568532)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freeimage
 PORTVERSION=	3.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
 DISTNAME=	FreeImage${PORTVERSION:S/.//g}
@@ -28,7 +28,8 @@ DOS2UNIX_FILES=	Source/LibOpenJPEG/opj_malloc.h \
 		Source/LibRawLite/dcraw/dcraw.c \
 		Source/LibRawLite/internal/dcraw_common.cpp \
 		Source/FreeImage/PluginBMP.cpp \
-		Source/FreeImage/PluginDDS.cpp
+		Source/FreeImage/PluginDDS.cpp \
+		Source/LibPNG/pngpriv.h
 
 WRKSRC=		${WRKDIR}/FreeImage
 MAKE_ARGS=	CC="${CC}" CPP="${CPP}" CXX="${CXX}"

Added: head/graphics/freeimage/files/patch-Source_LibPNG_pngpriv.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/freeimage/files/patch-Source_LibPNG_pngpriv.h	Tue Mar 16 00:46:20 2021	(r568532)
@@ -0,0 +1,14 @@
+--- Source/LibPNG/pngpriv.h.orig	2021-03-16 00:44:46 UTC
++++ Source/LibPNG/pngpriv.h
+@@ -193,11 +193,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+ #     define PNG_POWERPC_VSX_OPT 0
+-#  endif
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT