diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 884cc0591d6c..9f1c0f0c99db 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,65 +1,64 @@ PORTNAME= lux -PORTVERSION= 1.1.6 -PORTREVISION= 2 +PORTVERSION= 1.1.7 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= f49809a01243 +COMMIT= 8230eb57d67b 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 8605a78a504a..ac3c98bd8c53 100644 --- a/graphics/lux/distinfo +++ b/graphics/lux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680004680 -SHA256 (f49809a01243.tar.bz2) = 96c9b961d7ed2c9947463a72558eb572df340990a87eeeba8e03e96ff3b191f5 -SIZE (f49809a01243.tar.bz2) = 1168741 +TIMESTAMP = 1690538615 +SHA256 (8230eb57d67b.tar.bz2) = 140a74737134103e59ef990978958024de8ec45f51edc9293c73be9caabc4626 +SIZE (8230eb57d67b.tar.bz2) = 1181563 diff --git a/graphics/lux/files/patch-pv__metadata.h b/graphics/lux/files/patch-pv__metadata.h deleted file mode 100644 index 2ecb3de3a524..000000000000 --- a/graphics/lux/files/patch-pv__metadata.h +++ /dev/null @@ -1,141 +0,0 @@ ---- pv_metadata.h.orig 2023-03-27 07:19:09 UTC -+++ pv_metadata.h -@@ -234,7 +234,7 @@ struct metadata_type - std::cout << result->key() << ": " - << result->value() << std::endl ; - -- _result = result->value().toLong() ; -+ _result = result->value().toInt64() ; - return true ; - } - return false ; -@@ -665,7 +665,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_uncropped_width = result->value().toLong() ; -+ lux_uncropped_width = result->value().toInt64() ; - } - - lux_uncropped_height = -1 ; -@@ -673,7 +673,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_uncropped_height = result->value().toLong() ; -+ lux_uncropped_height = result->value().toInt64() ; - } - - lux_cropping_active = false ; -@@ -681,7 +681,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_cropping_active = result->value().toLong() ; -+ lux_cropping_active = result->value().toInt64() ; - } - - lux_cropped_width = -1 ; -@@ -689,7 +689,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_cropped_width = result->value().toLong() ; -+ lux_cropped_width = result->value().toInt64() ; - } - - lux_cropped_height = -1 ; -@@ -697,7 +697,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_cropped_height = result->value().toLong() ; -+ lux_cropped_height = result->value().toInt64() ; - } - - lux_crop_x0 = -1 ; -@@ -705,7 +705,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_crop_x0 = result->value().toLong() ; -+ lux_crop_x0 = result->value().toInt64() ; - } - - lux_crop_y0 = -1 ; -@@ -713,7 +713,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_crop_y0 = result->value().toLong() ; -+ lux_crop_y0 = result->value().toInt64() ; - } - - lux_crop_x1 = -1 ; -@@ -721,7 +721,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_crop_x1 = result->value().toLong() ; -+ lux_crop_x1 = result->value().toInt64() ; - } - - lux_crop_y1 = -1 ; -@@ -729,7 +729,7 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- lux_crop_y1 = result->value().toLong() ; -+ lux_crop_y1 = result->value().toInt64() ; - } - - if ( lux_cropping_active ) -@@ -790,42 +790,42 @@ struct metadata_type - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- FullPanoHeightPixels = result->value().toLong() ; -+ FullPanoHeightPixels = result->value().toInt64() ; - } - - key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.FullPanoWidthPixels" ) ) ; - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- FullPanoWidthPixels = result->value().toLong() ; -+ FullPanoWidthPixels = result->value().toInt64() ; - } - - key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaImageHeightPixels" ) ) ; - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- CroppedAreaImageHeightPixels = result->value().toLong() ; -+ CroppedAreaImageHeightPixels = result->value().toInt64() ; - } - - key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaImageWidthPixels" ) ) ; - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- CroppedAreaImageWidthPixels = result->value().toLong() ; -+ CroppedAreaImageWidthPixels = result->value().toInt64() ; - } - - key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaLeftPixels" ) ) ; - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- CroppedAreaLeftPixels = result->value().toLong() ; -+ CroppedAreaLeftPixels = result->value().toInt64() ; - } - - key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaTopPixels" ) ) ; - result = xmpData.findKey ( key ) ; - if ( result != xmpData.end() ) - { -- CroppedAreaTopPixels = result->value().toLong() ; -+ CroppedAreaTopPixels = result->value().toInt64() ; - } - - // currently we only process GPano data if projection is equirectangular diff --git a/graphics/lux/files/patch-pv__no__rendering.cc b/graphics/lux/files/patch-pv__no__rendering.cc deleted file mode 100644 index b372aa3e64fa..000000000000 --- a/graphics/lux/files/patch-pv__no__rendering.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- pv_no_rendering.cc.orig 2023-03-27 07:19:09 UTC -+++ pv_no_rendering.cc -@@ -8828,7 +8828,7 @@ void store_rendered_image ( const job_type * p_job , - - image->writeMetadata(); - } -- catch ( Exiv2::AnyError& e ) -+ catch ( Exiv2::Error& e ) - { - std::cerr << "Caught Exiv2 exception '" - << e << "'\n" ; diff --git a/graphics/lux/files/patch-vspline_hwy__simd__type.h b/graphics/lux/files/patch-vspline_hwy__simd__type.h deleted file mode 100644 index 40c9ffe81739..000000000000 --- a/graphics/lux/files/patch-vspline_hwy__simd__type.h +++ /dev/null @@ -1,20 +0,0 @@ ---- vspline/hwy_simd_type.h.orig 2023-03-30 09:58:06 UTC -+++ vspline/hwy_simd_type.h -@@ -104,7 +104,9 @@ - #include - #include - #include -+#ifndef HWY_HAVE_ATAN2 - #include "hwy_atan2.h" -+#endif - - // lux uses it's own dispatching mechanism, but this code should also - // cooperate with highway's multi-platform strategy -@@ -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)