From nobody Sun Jul 30 22:59:51 2023 X-Original-To: dev-commits-ports-main@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 4RDcK04vjMz4pYd5; Sun, 30 Jul 2023 22:59:52 +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 4RDcJl71MXz3xGg; Sun, 30 Jul 2023 22:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690757992; 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=p8BkpAYOwpYUXG17RLqZPW+vLWdJkKHiODFtBS+peFg=; b=T39vOCOVvMzmclivZGoEMV7LyspexwFizrdSgrj0Cr2wF6Wi4E4OW15yUDTfUdPD4xAvGW 0yS/2VKRT5LrHahLm4EZpTcroxi1w/F39twWdZ1tB5Jx0fyJvP0IWxTzk10CWi+Uxi5bwk /whGduerThtK4pGW/hjlabRu5vj+vFy43aYF+EFweIlIZa+51hnqnaVV0utR8LFepOniP8 NTQfQ1eEEo5ofNpiqKXIYqf+tvMoaKpFZPeNcnqtDXxBZIchdZIUdeE0vRdoQEQXhkbxQZ TACuQ6bpFmyAgrNrn6SS745UAN1fALWDdMX6uUMTFHypyiCHFOMzieNo8OX6XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690757992; 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=p8BkpAYOwpYUXG17RLqZPW+vLWdJkKHiODFtBS+peFg=; b=hYbQ50UzoLNygKNJlyvqk2c+iwYS6xQjVLupphabIaVxrvgLV+c+wKCnwFNx4u6AEo9618 JY3M3MSL5axZIbnPrAE7gRPKJlJcTZlkIBF8ZHAPBB6RdzdU0+ZBYZZMfA8VqbSa1Xy6SQ zZUF3F7ugOyFvjLNnhktuSXRVOHSxToOw7IjIkzztDtTXBlxYsAVQSi7dIzYKn0eQtJcWi jXgqCfimr7Sq37Wmvi1IE8eS58DW0ClJEE7XH5G3noLPfJWirv148/Ktp4YUk14A376OpV fNgGbDkJmmyK5aoc7MV7+NEDsN9GgQy8o+gM7EaR1yR83YpCBAdiVGQDg7abCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690757992; a=rsa-sha256; cv=none; b=AOzFe5ZkctuUZiZcvc4HKliwIQska7PXmiQHpFmmIGXDnE3OXGJhXtJl6OmoXhtCmlhPDJ R0r9ms1QLFvv+4LA00QjJ+aEeBvWiiZ8Wwvj2JMV2Cc+V5aXDV1p9tFUExm/lz3ZOZp3Xh 5EW3e2GzJpvKy22gAKsMm9E1tJhabAFuoTTdo1+ue9NU0pI/s3b1A+Or8MyQSitQS7Hlry Sdcw2JUSUNDqPOeytOc3qF9Kh6xKtSIImCivQDeVm+6sPxb/kb3aPh1eiRuAVSSzcldyTl XW5QKTZnXuCRQ861nSlHa/L+pfc6zllnbP2GYwHMwz7jSa4vovcAmKfozCeUUQ== 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 4RDcJl4MzrzXcV; Sun, 30 Jul 2023 22:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36UMxp6Q001430; Sun, 30 Jul 2023 22:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36UMxp7G001429; Sun, 30 Jul 2023 22:59:51 GMT (envelope-from git) Date: Sun, 30 Jul 2023 22:59:51 GMT Message-Id: <202307302259.36UMxp7G001429@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: 1c21936e0198 - main - graphics/lux: update to 1.1.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 1c21936e0198bad899a2a4ee01273ed5b8a7a628 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c21936e0198bad899a2a4ee01273ed5b8a7a628 commit 1c21936e0198bad899a2a4ee01273ed5b8a7a628 Author: Robert Clausecker AuthorDate: 2023-07-28 11:07:07 +0000 Commit: Robert Clausecker CommitDate: 2023-07-30 22:59:08 +0000 graphics/lux: update to 1.1.7 This update requires exiv2 0.28 and highway 1.0.5. Upstream changes: assorted bug fixes and improvements. Reported by: kfjahnke@gmail.com --- graphics/lux/Makefile | 5 +- graphics/lux/distinfo | 6 +- graphics/lux/files/patch-pv__metadata.h | 141 --------------------- graphics/lux/files/patch-pv__no__rendering.cc | 11 -- graphics/lux/files/patch-vspline_hwy__simd__type.h | 20 --- 5 files changed, 5 insertions(+), 178 deletions(-) diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 884cc0591d6c..9f1c0f0c99db 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,6 +1,5 @@ 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 @@ -30,7 +29,7 @@ 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 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)