Date: Mon, 21 Oct 2024 09:37:08 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 905958dd6f1e - main - graphics/lux: fix build on i386 Message-ID: <202410210937.49L9b8nL032661@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=905958dd6f1eaacd3f42637ff78da7008a83aea1 commit 905958dd6f1eaacd3f42637ff78da7008a83aea1 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2024-10-14 12:37:46 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-10-21 09:36:00 +0000 graphics/lux: fix build on i386 Use int over unsigned int for fc_t to avoid a type narrowing error. Regenerate patches while we are at it. MFH: 2024Q4 --- graphics/lux/Makefile | 2 +- graphics/lux/files/patch-CMakeLists.txt | 14 +++++++------- graphics/lux/files/patch-options.h | 6 +++--- graphics/lux/files/patch-pv__rendering__common.h | 11 +++++++++++ graphics/lux/files/patch-tinyfiledialogs.c | 6 +++--- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 7b91998c0b4c..a5c5a153e442 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,6 +1,6 @@ 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 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,6 +1,6 @@ ---- 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 @@ -11,7 +11,7 @@ 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} \ @@ -20,16 +20,16 @@ -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,6 +1,6 @@ ---- 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 ) @@ -8,4 +8,4 @@ +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,7 +1,7 @@ ---- 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. + |__________________________________________| */ -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410210937.49L9b8nL032661>