From nobody Sun Jul 9 22:09: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 4QzhBk4P3xz4mr0x; Sun, 9 Jul 2023 22:09:50 +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 4QzhBk2XNNz3CgH; Sun, 9 Jul 2023 22:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940590; 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=mijEllea1SfqnORvuRMd3ykptR+yc99uapKUpseiDDM=; b=widJ5GaLja2BUeSzQ/P0sWnmIbsRv1938cY4Iw9MVZgnrV7NxNUk4RY8PtLmyltrvV7/Gu GgT5rFGHnutwqhjwpUkQk8WAK0x5DAkwB2Iy7WzdT3IWxFAGl2Ofsqa98ovmwR+d6MUGfF YgCIB+oDOEv5BPrvB3DjyXZ0sGnpKAZtl0WyWCw9FydTqoLfUuPzDZEXER8gHCgjaRrgTv qpdIYBkxV/QGvbSb6FATxLjFHkIykfK7fDWi66fAjl+5Wxkl54POGGBl1tbMiiA04odwBA ZVskA6wkWnsM1U1GBCNBvgPEN+hIXI1QGJ0mOuvree0j5QVQie5tEJgYI9YYQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940590; 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=mijEllea1SfqnORvuRMd3ykptR+yc99uapKUpseiDDM=; b=QPQLKH0uzM15EIlP62xqOv6rxbXbbtBtxcGEbJSCtGuM04iK2U9ZWCZUSNkDF/hTQoTVSe wjg9oa8VcSlecaMiitEdOKHZGyfiVTngHr8I/TWbJmRIEH3eVl/yGvvMtAb9Ck+Y2DxeHZ gtNH3/bGZMpxiKGBqaXZrop9M9/uEsTHD0MoRL7D9uP0xJhK7TRRWIhtqDooYnMgR/Ko7v u1q5AUZYv8DQTnRpgSsVJFyJ4lFmWh+ysZDqdHG8GNssol0/YJDF32a0Du+4zOb3psYXvi obKOr+8OD2y2sLQZbGw/Obka32kEbFmPesax2MdQqkyPHnHs4HsJzp58bfoHVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940590; a=rsa-sha256; cv=none; b=CUB9xB/nDVZJ9YIiyQ7yOKUV/ee9B1iWY/Pt6M6TlerCzDUrzU03Uqg9gSebhIopQi15Qr VBOEXnNjMaiCHxdCZQ8uLTSysZ22KB03rPbPaNjRgwF04PvFbHmNNTw8KmRD/Wr2Wgn1wG cwS0gcXa3M4VU+WaFZr1RL0d96Y0nmbfk095hGRAAHvRO6lbj3fWl9hA6+VwnMDsrBBrq6 I+RX0jAiJ9J8GVH4tf+moVlMlTJ4rYxoy6ryYtT4DyfJMZuZfy3XxkvA5KQneR32vXVO5D 3ArIH6BwOno+m7rJPBmXjb1vyz9O50xTINjRlPFH1WsX0Sw3J4ljq1FKzOk57g== 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 4QzhBk1Xn2zKTf; Sun, 9 Jul 2023 22:09:50 +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 369M9ofZ034467; Sun, 9 Jul 2023 22:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9oD8034466; Sun, 9 Jul 2023 22:09:50 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:50 GMT Message-Id: <202307092209.369M9oD8034466@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 68ac895fbe4e - main - graphics/lux: make compatible with exiv2 0.28 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68ac895fbe4ea0f7ea13195cbcff7b3117612f41 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=68ac895fbe4ea0f7ea13195cbcff7b3117612f41 commit 68ac895fbe4ea0f7ea13195cbcff7b3117612f41 Author: Matthias Andree AuthorDate: 2023-07-02 13:39:42 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:12 +0000 graphics/lux: make compatible with exiv2 0.28 PR: 282311 --- graphics/lux/Makefile | 2 +- graphics/lux/files/patch-pv__metadata.h | 141 ++++++++++++++++++++++++++ graphics/lux/files/patch-pv__no__rendering.cc | 11 ++ 3 files changed, 153 insertions(+), 1 deletion(-) diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index ced6efe19ce9..884cc0591d6c 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,6 +1,6 @@ PORTNAME= lux PORTVERSION= 1.1.6 -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-pv__metadata.h b/graphics/lux/files/patch-pv__metadata.h new file mode 100644 index 000000000000..2ecb3de3a524 --- /dev/null +++ b/graphics/lux/files/patch-pv__metadata.h @@ -0,0 +1,141 @@ +--- 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 new file mode 100644 index 000000000000..b372aa3e64fa --- /dev/null +++ b/graphics/lux/files/patch-pv__no__rendering.cc @@ -0,0 +1,11 @@ +--- 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" ;