diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 1432f31cc198..e856e76e6cd8 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,65 +1,64 @@ PORTNAME= lux -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.6 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/kfj/pv/get/ PKGNAMESUFFIX= -pv # distinguish from www/lux DISTNAME= ${COMMIT} MAINTAINER= fuz@FreeBSD.org COMMENT= Panorama and image viewer WWW= https://bitbucket.org/kfj/pv LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv6= address space exhaustion in compiler BROKEN_armv7= address space exhaustion in compiler LIB_DEPENDS= libhwy.so:devel/highway \ libsfml-window.so:devel/sfml \ libexiv2.so:graphics/exiv2 \ libvigraimpex.so:graphics/vigra RUN_DEPENDS= ${GUIFONT}:x11-fonts/noto-basic GUIFONT= ${LOCALBASE}/share/fonts/noto/NotoSans-Regular.ttf USES= cmake desktop-file-utils dos2unix pkgconfig tar:bz2 DOS2UNIX_FILES= tinyfiledialogs.c CMAKE_ON= USE_HWY_LIBRARY CXXFLAGS+= -Wno-deprecated-declarations CONFLICTS= lux WRKSRC= ${WRKDIR}/kfj-pv-${COMMIT} -COMMIT= 4a1b894733a2 - +COMMIT= f49809a01243 OPTIONS_DEFINE_amd64= SSSE3 SSE42 AVX AVX2 AVX512 OPTIONS_DEFINE_i386= SSE2 SSSE3 SSE42 AVX AVX2 AVX512 OPTIONS_DEFAULT_amd64= SSSE3 SSE42 AVX AVX2 AVX512 OPTIONS_DEFAULT_i386= SSSE3 SSE42 AVX AVX2 AVX512 SSE2_DESC= build port for Pentium 4 or newer SSSE3_DESC= support SSSE3 flavor SSE42_DESC= support SSE4.2 flavor AVX_DESC= support AVX flavor AVX2_DESC= support AVX2 flavor AVX512_DESC= support AVX-512F flavor SSE2_CXXFLAGS_OFF= ${${OSVERSION}>=1300000:?-march=i686:} SSE2_CXXFLAGS= -march=pentium4 SSSE3_CMAKE_BOOL= FLV_SSSE3 SSE42_CMAKE_BOOL= FLV_SSE42 AVX_CMAKE_BOOL= FLV_AVX AVX2_CMAKE_BOOL= FLV_AVX2 AVX512_CMAKE_BOOL= FLV_AVX512f .include # cannot use CMAKE_ON after bsd.port.pre.mk # this disables the flavor dispatch code on non-x86 .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DFLV_NATIVE=ON .endif pre-configure: @${REINPLACE_CMD} -e 's,%%GUIFONT%%,${GUIFONT},' ${WRKSRC}/options.h .include diff --git a/graphics/lux/distinfo b/graphics/lux/distinfo index 0026a3e9b5e8..8605a78a504a 100644 --- a/graphics/lux/distinfo +++ b/graphics/lux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675961713 -SHA256 (4a1b894733a2.tar.bz2) = 008bdbb6d38740aa984abbdf996f96521ec8dd0f7f0c0960150f5b6166aa0bbd -SIZE (4a1b894733a2.tar.bz2) = 1158307 +TIMESTAMP = 1680004680 +SHA256 (f49809a01243.tar.bz2) = 96c9b961d7ed2c9947463a72558eb572df340990a87eeeba8e03e96ff3b191f5 +SIZE (f49809a01243.tar.bz2) = 1168741 diff --git a/graphics/lux/files/patch-vspline_hwy__simd__type.h b/graphics/lux/files/patch-vspline_hwy__simd__type.h new file mode 100644 index 000000000000..a993421bfdc2 --- /dev/null +++ b/graphics/lux/files/patch-vspline_hwy__simd__type.h @@ -0,0 +1,10 @@ +--- vspline/hwy_simd_type.h.orig 2023-03-30 09:58:06 UTC ++++ vspline/hwy_simd_type.h +@@ -694,7 +694,6 @@ PROMOTE(unsigned short,int) + PROMOTE(unsigned char,int) + PROMOTE(unsigned char,short) + +-PROMOTE(short,unsigned int) + PROMOTE(signed char,unsigned int) + PROMOTE(unsigned short,unsigned int) + PROMOTE(unsigned char,unsigned int)