From nobody Mon Oct 21 09:39:26 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XX9Hz2Qmfz5Ylsy; Mon, 21 Oct 2024 09:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX9Hy6qtqz4qKl; Mon, 21 Oct 2024 09:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g450J4ooDxTIEbBAZ14WJMtzUmwSrki/LQq5LYMm5WE=; b=JvBDq0CMkG69G4slLGK376PFWjCPxy7mMuc3kjEzCF81f3hFa46/hrZXWNELzgKAz/us6c NHqjwG3WJL8fF14KV/tOCyMjEqZfxmbeg7OjiQ5g/GywTBpJu/j7422gOGaNL9blfpEn2Z ECAwvWaFPRKs+QhXRivqRLqSRLzHXd2D7MT57fHSvjVTlP6+thQdcXtsT8hKtT6N0RJej3 TjqYoyWjc7AOZESKfs2iPwwJxIJMDZN9yDQ2jyaEo85onkWpgyB1SyDgHLm+mwuzTiwDGG 7qILgDXJa3vwEKzEpET3G7193HhlmQdqeMwRrNUeDc4jVsIK9wHGtTd7lsrhSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g450J4ooDxTIEbBAZ14WJMtzUmwSrki/LQq5LYMm5WE=; b=pyYbJSOBGkc6W8AdWoEfy6blrp1nTyiGYAkKu6IcMQ6noO6/IM2yeahvvjYnMcOyaAzPvG bf+BbfYKjAudvdvaudJ8hBRs27huZPkH1gUvxO9+ek2B63rzsG3hO9Nh0Mb9phoEkyE16C IEt4rIgTm7bMr8zzmxqnilVpko8kq2wzxyoX20wHKqdwd/iDMifq/CQ5SV/ckl+eCCEKRf mgu63LUsNtL10yIR47ENDFqzyWfsvCpFankQ4ppOBLoJtAHbq9B7Tf0um0EKZTpMSe2Vna HNxexX8+4o4BMI3o2zzdV5zU59t5puubJeTzdGDuTlxA7/nh7GLOlXU83TXXcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729503567; a=rsa-sha256; cv=none; b=kETBAuF0H9qTHfDJPH86ivGaYAhaW1KPwMVWTIsWpPMdzY80uhFIuIzkY0FJ9D0smb4xQO pGz7rYDNp6A/x4TyUym/p/mubG7+zo4xEXfFMmeZNXZlwL5X8k8TfexDT36v3x5ywzkB1Y /V+XipDQUem8J9DuIzlHKo/FP3i/SaC3xFpTxEywiDVgS1eEMegTG9GMRKZGJQnSj+OmLx tmcWdqpNQB2eoxImQ1qMPq8I5OBCr0mN09bpjc8mbIJVKp2TXPg5kmEhbkMT9iJ2T+ZXcg PbMsrUIHJHmN2gvtVJEf38RLME3hN9xDBlpkty90uj722eK1Tuzc3y6gr0zLPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX9Hy6PsPzPr4; Mon, 21 Oct 2024 09:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L9dQbX034547; Mon, 21 Oct 2024 09:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L9dQ2I034544; Mon, 21 Oct 2024 09:39:26 GMT (envelope-from git) Date: Mon, 21 Oct 2024 09:39:26 GMT Message-Id: <202410210939.49L9dQ2I034544@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 648ebc89a57a - 2024Q4 - graphics/lux: fix build on i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 648ebc89a57aae95f071f9805461e20e254d7348 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=648ebc89a57aae95f071f9805461e20e254d7348 commit 648ebc89a57aae95f071f9805461e20e254d7348 Author: Robert Clausecker AuthorDate: 2024-10-14 12:37:46 +0000 Commit: Robert Clausecker CommitDate: 2024-10-21 09:38:51 +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 (cherry picked from commit 905958dd6f1eaacd3f42637ff78da7008a83aea1) --- 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. + |__________________________________________| */ -