From nobody Sun Jul 9 22:09:28 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 4QzhBK194gz4mqwZ; Sun, 9 Jul 2023 22:09:29 +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 4QzhBJ6rh4z4l29; Sun, 9 Jul 2023 22:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940569; 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=VdtXwfUm3vD9FKEH/e0wpbcIJO01/jAQv8XNOkcjmxo=; b=KroLb2XL6YMyBXdAKnAlDBCou4KILQ5N5uzll4BOUrencmlwpgzYvBNZL+Y3HDiZ9U8tBj pifoSmSu8h+oB9XCjyA8qf0T0S9Um55yW8hNt9LmsgZ40VJ926/YKqNfUlMzSe2OGzhqbP /0YNSFsuwMDvEovzECawznwW9VgRcVNwHQ/CONNe1gDsoRWMPm2LDFtckjlz2SIdx5cSwe ovwejOhTTv1iInruoqtg7IH7DjjpTZxZN4qwXa1aYHXb7LZM+nZvwIMW1lBEEFZIz9NlYJ MIbQZuDSRI0hpq91zt46iZPGY8Mt2Ainh+Y5et5d7bD7+oU/vo8BAfXgIu+yzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940569; 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=VdtXwfUm3vD9FKEH/e0wpbcIJO01/jAQv8XNOkcjmxo=; b=vkP5vAj/DdBBqYQsLfvCBpl0GxF++2VoQ/6mLp9YxJ49GpIXQ1KIOK6ifUJc713qXTDcNd QNGD6FXg4GZpaCCB+6DqiC0dT0K24nnh9+suIhSA4cJJUpRgUj/PVyMxdkg3O/WWl0p4UD 0wlAs3yC4FuPN01Qc/3i72BlSm6pbsvoz3nIBdS/5A8bMiHmW+6nhA4V87lUFNml+LLkfv 4zx8O2JPfgJ05vAibYJvxDN7dHbqXUaaICV9gqteqfiEagCNRmWgmUNYsAhkNB9prn0/Rt duffz9spr3n58IS67kIlgYeJ2Zf0CXqufEMUSiKjECc3R7DlSg10KXYlJ+/XWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940569; a=rsa-sha256; cv=none; b=WcvaJnRkfq/dyQ+uQQdWcj0p9fGIye9vcENdNpkmxay19ltDSUo+tU9aJU3CDnqpQL+EpD 37vGRH17bGAr7SocGp8dNXLzX/s/fxDBJrxTnxFUU3pmYsqudAQoFCyT7X1m2b1m7j0py0 XIWp6gbKHnMSi1fd32QvfNoWeR4guCpRapolw7eMHS+QY8d0t3DqKGNiWWbEqPLtkGnd2H j6cTNGZCmqiQHWOXx+vaEtcX9wNT6nklhGDPah08xtVhd0xk33fxdypHWeLiL/6NkPhl17 TacwPFAmM9tUq+58AVengxKtbJ/n5e3IrIJ1h8XvvNQG8dbBTvZdl6xVQcH3uQ== 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 4QzhBJ5fnTzKRp; Sun, 9 Jul 2023 22:09:28 +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 369M9SYg034068; Sun, 9 Jul 2023 22:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9Sqg034067; Sun, 9 Jul 2023 22:09:28 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:28 GMT Message-Id: <202307092209.369M9Sqg034067@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: 5f1836a182b8 - main - graphics/filmulator: make compatible with exiv2 0.28 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f1836a182b87f8402cf50e86e889c9cdf9f32be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f1836a182b87f8402cf50e86e889c9cdf9f32be commit 5f1836a182b87f8402cf50e86e889c9cdf9f32be Author: Matthias Andree AuthorDate: 2023-07-02 11:33:03 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:06 +0000 graphics/filmulator: make compatible with exiv2 0.28 PR: 272311 --- graphics/filmulator/Makefile | 2 +- graphics/filmulator/files/patch-core_imwriteJpeg.cpp | 11 +++++++++++ .../files/patch-database_exifFunctions.cpp | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/graphics/filmulator/Makefile b/graphics/filmulator/Makefile index a536c5e5e911..077ed370fcf7 100644 --- a/graphics/filmulator/Makefile +++ b/graphics/filmulator/Makefile @@ -1,6 +1,6 @@ PORTNAME= filmulator PORTVERSION= 0.11.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= graphics diff --git a/graphics/filmulator/files/patch-core_imwriteJpeg.cpp b/graphics/filmulator/files/patch-core_imwriteJpeg.cpp new file mode 100644 index 000000000000..b1ac49c5971d --- /dev/null +++ b/graphics/filmulator/files/patch-core_imwriteJpeg.cpp @@ -0,0 +1,11 @@ +--- core/imwriteJpeg.cpp.orig 2021-03-05 05:27:44 UTC ++++ core/imwriteJpeg.cpp +@@ -186,7 +186,7 @@ static void remove_exif_keys(Exiv2::ExifData &exifData + { + exifData.erase(pos); + } +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + //catch invalid tag + } + } diff --git a/graphics/filmulator/files/patch-database_exifFunctions.cpp b/graphics/filmulator/files/patch-database_exifFunctions.cpp new file mode 100644 index 000000000000..f181c867b16b --- /dev/null +++ b/graphics/filmulator/files/patch-database_exifFunctions.cpp @@ -0,0 +1,20 @@ +--- database/exifFunctions.cpp.orig 2021-03-05 05:27:44 UTC ++++ database/exifFunctions.cpp +@@ -123,7 +123,7 @@ int exifDefaultRotation(const std::string fullFilename + int exifOrientation; + try + { +- exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toLong(); ++ exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toInt64(); + } + catch (...) + { +@@ -295,7 +295,7 @@ int exifRating(const std::string fullFilename) + std::string maker = exifData["Exif.Image.Make"].toString(); + if (maker.compare("Canon") == 0) + { +- return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toLong())); ++ return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toInt64())); + } + return 0; + }