From nobody Tue Mar 21 12:54:50 2023 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 4Pgs571PYnz40HMc; Tue, 21 Mar 2023 12:54:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pgs570ymBz4K9n; Tue, 21 Mar 2023 12:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679403291; 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=SaRViNf03k2ep+VrUeYKzei4q1wGF5LFRSlWYmgZ/mU=; b=Y6iMYW76VyUPaHcOpomkJiATDc3cOCqjWN3EwFbXn4n8hV50br3zeLY2i7WMVAacee5+8V oIQ/irbmRL6m4oyrrKq2UOfKcClB/7RIPCiaF9Lf4CqfhL3qAhrZTSdTWmuj3BMJ10fWY9 3JINkRTpmaXdthZQVCixN1ew4zdLqhhGzoLkuMd8LDybdMYTXWPP2j/VCbwC6TTwcb7pmg c7FH55aodSDDxCYrC6twK9REUvp5oXs4/r8zV6EI5wntI9+CfEUCA9dJpCkJuYKwN1yLW0 Xr/dszG8lVeEw1WgkM/I5M9U4Qxm/TFM1SwBCE+p+2Eq66uNc6vQgfn6QbQ/5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679403291; 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=SaRViNf03k2ep+VrUeYKzei4q1wGF5LFRSlWYmgZ/mU=; b=BtMtNl6JpxRhB8VHQRhBCpPdh2iybCvr8BTih7xV8nqldj+gn1fWJCcw7lZ/YNru7qsdY/ mLi3KawcyOaKRDurfbM8ANDrqABJwDWm9y3IgiLTcRPLE0dVfzD0EJ9mdAyN8LiQViHBc4 PAC4fBnJ699jNj+xEjy8CPlI0BVxPgeSokUIGqbBwNhFuS5Go3KnAB9dASIRh99qTkPSbq ZJGCtM254f2JXsCzA/IegiaiJjNq9uoQ4j+lok2A9OZk8hL/FjgAgEqmUY+8HIBl0N2exm Az2cH+B3x3xlm67XM5DaK5cXO4onijqnQ29mL+xT/gJlXK31NttJo78lvXIPDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679403291; a=rsa-sha256; cv=none; b=rLJCnYUF6QAgofjgv71jVhbwpEQ4RniVHbMeOcAKgqRKL7kFRFeuUb34l3uXprpb00LbNY rz252AEdHqQsgXvv3R+WZz9GIyR3fyJV2ZQS+ZVk95cnKIT1do2X8/hCuF6NRFbarILmoI RJBPudwPQGk9FSBNXpTP2QGpZmGRMqy1YK5kRhEyjdfaHYArgbG+w1Zl9nkijFGXuLQcG1 w3odc++XwulKLu4l7wJ0J/8yVEIfKLseKyDQo6RgDZnZukNvAoZtanlPbAUfAjRFIF7g7V JAWNBRMiBeBnh5OU65G0RsGI78DVezoIXZ3MYjfC3olxM8Kc3tPwsPhdwpyqEw== 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 4Pgs5702NKz1CDN; Tue, 21 Mar 2023 12:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LCsol4077262; Tue, 21 Mar 2023 12:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LCsoAm077261; Tue, 21 Mar 2023 12:54:50 GMT (envelope-from git) Date: Tue, 21 Mar 2023 12:54:50 GMT Message-Id: <202303211254.32LCsoAm077261@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 3959c2813bc0 - main - graphics/lux: Update to 1.1.5 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 3959c2813bc0ba8bb13f1a36f5e088b0f04e68fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=3959c2813bc0ba8bb13f1a36f5e088b0f04e68fe commit 3959c2813bc0ba8bb13f1a36f5e088b0f04e68fe Author: Robert Clausecker AuthorDate: 2023-02-09 17:05:46 +0000 Commit: Robert Clausecker CommitDate: 2023-03-21 12:53:47 +0000 graphics/lux: Update to 1.1.5 Upstream changes: - EXIF metadata is now used to determine field of view - panorama photographs from smartphone camera applications are no heuristically detected - new config file ~/.lux.ini is evaluated - many small improvements and bug fixes Changelog: https://groups.google.com/g/hugin-ptx/c/bfX6Fu3mwy0/m/BNmUoqbnAAAJ --- graphics/lux/Makefile | 4 +-- graphics/lux/distinfo | 6 ++-- graphics/lux/files/patch-CMakeLists.txt | 59 +++++++++++++-------------------- 3 files changed, 28 insertions(+), 41 deletions(-) diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 5742f54f8bfe..1432f31cc198 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,5 +1,5 @@ PORTNAME= lux -PORTVERSION= 1.1.4 +PORTVERSION= 1.1.5 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/kfj/pv/get/ PKGNAMESUFFIX= -pv # distinguish from www/lux @@ -29,7 +29,7 @@ CXXFLAGS+= -Wno-deprecated-declarations CONFLICTS= lux WRKSRC= ${WRKDIR}/kfj-pv-${COMMIT} -COMMIT= 402942545a06 +COMMIT= 4a1b894733a2 OPTIONS_DEFINE_amd64= SSSE3 SSE42 AVX AVX2 AVX512 OPTIONS_DEFINE_i386= SSE2 SSSE3 SSE42 AVX AVX2 AVX512 diff --git a/graphics/lux/distinfo b/graphics/lux/distinfo index c7984ec8661a..0026a3e9b5e8 100644 --- a/graphics/lux/distinfo +++ b/graphics/lux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661566212 -SHA256 (402942545a06.tar.bz2) = d266d5cb1308aa033af619eff4e81d0c9e4fec9f406a29177ee519b5d92f36cc -SIZE (402942545a06.tar.bz2) = 1143378 +TIMESTAMP = 1675961713 +SHA256 (4a1b894733a2.tar.bz2) = 008bdbb6d38740aa984abbdf996f96521ec8dd0f7f0c0960150f5b6166aa0bbd +SIZE (4a1b894733a2.tar.bz2) = 1158307 diff --git a/graphics/lux/files/patch-CMakeLists.txt b/graphics/lux/files/patch-CMakeLists.txt index c94ff78923fa..24bbaac3b3e1 100644 --- a/graphics/lux/files/patch-CMakeLists.txt +++ b/graphics/lux/files/patch-CMakeLists.txt @@ -1,48 +1,35 @@ ---- CMakeLists.txt.orig 2022-08-26 12:57:31 UTC +--- CMakeLists.txt.orig 2023-02-09 16:33:06 UTC +++ CMakeLists.txt -@@ -96,8 +96,8 @@ message(STATUS "***** SYSTEM PROCESSOR ${CMAKE_SYSTEM_ - set(i86 FALSE) +@@ -139,8 +139,8 @@ message(STATUS "***** => LUX DATA DIRECTORY ${DataDir} + message(STATUS "***** SYSTEM PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}") - if(UNIX OR APPLE) -- if ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64 -- OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i686) -+ if ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL amd64 -+ OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386) - set(i86 TRUE) - endif() - elseif(WIN32) -@@ -268,7 +268,7 @@ set(AVX2_FLAGS "${RENDERING_FLAGS} \ + 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} \ # about it and I don't have an AVX512 machine. set(AVX512f_FLAGS "${RENDERING_FLAGS} \ -- -mavx512f -march=skx \ -+ -mavx512f -march=skylake-avx512 \ +- -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") -@@ -553,9 +553,6 @@ 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 +@@ -651,12 +651,6 @@ endif() --install(FILES NotoSans-Regular.ttf noto_font_license.txt DESTINATION -- "${DataDir}/fonts") -- - # KFJ 2022-08-24 simplified package versioning, only using a.b.c - - set(LUX_PACKAGE_RELEASE "${pv_major}.${pv_minor}.${pv_patch}") -@@ -618,15 +615,6 @@ install(FILES scripts/512X512/lux.png + install(TARGETS ${_project_name} DESTINATION bin) - install(FILES scripts/1024X1024/lux.png - DESTINATION share/icons/hicolor/1024x1024/apps) +-# Copy the NotoSans-Regular font and the readme (as required by the license) +-# to the platform-specific font directory - --install(FILES scripts/256X256/lux.png -- DESTINATION share/icons/gnome/256x256/apps) -- --install(FILES scripts/512X512/lux.png -- DESTINATION share/icons/gnome/512x512/apps) +-install(FILES NotoSans-Regular.ttf noto_font_license.txt DESTINATION +- "${DataDir}/fonts") - --install(FILES scripts/1024X1024/lux.png -- DESTINATION share/icons/gnome/1024x1024/apps) - - install(FILES scripts/lux.desktop - DESTINATION share/applications) + # 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