diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 7b91998c0b4c..a5c5a153e442 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,67 +1,67 @@ PORTNAME= lux DISTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 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 LIB_DEPENDS= libhwy.so:devel/highway \ libsfml-window.so:devel/sfml \ libexiv2.so:graphics/exiv2 \ libvigraimpex.so:graphics/vigra \ libOpenImageIO.so:graphics/openimageio RUN_DEPENDS= ${GUIFONT}:x11-fonts/noto-sans GUIFONT= ${LOCALBASE}/share/fonts/noto/NotoSans-Regular.ttf USES= cmake desktop-file-utils dos2unix localbase:ldflags pkgconfig tar:bz2 gl USE_GL= gl DOS2UNIX_FILES= tinyfiledialogs.c CMAKE_ON= USE_HWY_LIBRARY CXXFLAGS+= -Wno-deprecated-declarations CONFLICTS= lux WRKSRC= ${WRKDIR}/kfj-pv-${COMMIT} COMMIT= 02d14627bc75 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= -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/files/patch-CMakeLists.txt b/graphics/lux/files/patch-CMakeLists.txt index 24bbaac3b3e1..3e65d9f96e06 100644 --- a/graphics/lux/files/patch-CMakeLists.txt +++ b/graphics/lux/files/patch-CMakeLists.txt @@ -1,35 +1,35 @@ ---- CMakeLists.txt.orig 2023-02-09 16:33:06 UTC +--- CMakeLists.txt.orig 2024-04-22 10:18:21 UTC +++ CMakeLists.txt -@@ -139,8 +139,8 @@ message(STATUS "***** => LUX DATA DIRECTORY ${DataDir} +@@ -140,8 +140,8 @@ if ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64 message(STATUS "***** SYSTEM PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}") if ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64 - OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL AMD64 - OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i686 ) + OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL amd64 + OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 ) set(i86 TRUE) message(STATUS "***** setting i86 TRUE for an intel/AMD target") else() -@@ -351,7 +351,7 @@ set(AVX2_FLAGS "${RENDERING_FLAGS} \ +@@ -383,7 +383,7 @@ set(AVX512f_FLAGS "${RENDERING_FLAGS} \ # about it and I don't have an AVX512 machine. set(AVX512f_FLAGS "${RENDERING_FLAGS} \ - -mavx512f -march=skx -mpclmul -maes \ + -mavx512f -march=skylake-avx512 -mpclmul -maes \ -D hn=hn_avx512 -D PV_ARCH=PV_AVX512f \ -D PV_ARCHNAME=\\\"avx512f\\\" \ -D PV_PRIORITY=0 -D PV_VIABILITY=has_avx512f -D FLV_AVX512f") -@@ -651,12 +651,6 @@ endif() +@@ -727,12 +727,6 @@ install(TARGETS ${_project_name} DESTINATION bin) + # install the binary install(TARGETS ${_project_name} DESTINATION bin) - +- -# Copy the NotoSans-Regular font and the readme (as required by the license) -# to the platform-specific font directory - -install(FILES NotoSans-Regular.ttf noto_font_license.txt DESTINATION - "${DataDir}/fonts") -- + # The next section could do with sone tidying up. It deals with packaging # lux for distribution. This is used for some distribution channles, e.g. - # to make .deb packages for ubuntu and debian, but packaging for windows diff --git a/graphics/lux/files/patch-options.h b/graphics/lux/files/patch-options.h index 567f5573c2dc..a7b3cdd252b7 100644 --- a/graphics/lux/files/patch-options.h +++ b/graphics/lux/files/patch-options.h @@ -1,11 +1,11 @@ ---- options.h.orig 2022-08-27 02:26:10 UTC +--- options.h.orig 2024-04-22 10:18:21 UTC +++ options.h -@@ -132,7 +132,7 @@ yes_no ( fullscreen , true ) +@@ -136,7 +136,7 @@ yes_no ( grey_edge , true ) yes_no ( fully_covered , false ) yes_no ( fuse , false ) yes_no ( grey_edge , true ) -option ( gui_font , "" ) +option ( gui_font , "%%GUIFONT%%" ) integer ( gui_extent , 0 ) real ( gui_scale_factor , 0.0 ) - yes_no ( hdr_merge , false ) + yes_no ( gpu_for_srgb , false ) diff --git a/graphics/lux/files/patch-pv__rendering__common.h b/graphics/lux/files/patch-pv__rendering__common.h new file mode 100644 index 000000000000..f3c7e12dca52 --- /dev/null +++ b/graphics/lux/files/patch-pv__rendering__common.h @@ -0,0 +1,11 @@ +--- pv_rendering_common.h.orig 2024-10-14 12:36:31 UTC ++++ pv_rendering_common.h +@@ -194,7 +194,7 @@ static const int max_degree = 7 ; // vspline_constants + + // typedef unsigned short fc_t ; + +-typedef unsigned int fc_t ; ++typedef int fc_t ; + + #ifdef VECTORIZE + diff --git a/graphics/lux/files/patch-tinyfiledialogs.c b/graphics/lux/files/patch-tinyfiledialogs.c index 044de50cece0..a067fa9ec9b6 100644 --- a/graphics/lux/files/patch-tinyfiledialogs.c +++ b/graphics/lux/files/patch-tinyfiledialogs.c @@ -1,16 +1,16 @@ ---- tinyfiledialogs.c.orig 2022-03-08 00:31:39 UTC +--- tinyfiledialogs.c.orig 2024-10-14 12:36:00 UTC +++ tinyfiledialogs.c -@@ -47,13 +47,6 @@ Thanks for contributions, bug corrections & thorough t - - Paul Rouget +@@ -53,13 +53,6 @@ misrepresented as being the original software. + |__________________________________________| */ - -#ifndef __sun -#ifndef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 2 /* to accept POSIX 2 in old ANSI C standards */ -#endif -#endif - #if !defined(_WIN32) && ( defined(__GNUC__) || defined(__clang__) ) #if !defined(_GNU_SOURCE) #define _GNU_SOURCE /* used only to resolve symbolic links. Can be commented out */