diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest index 528217b275..94f9732bfc 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest @@ -1,5 +1,6 @@ DIST libpng-1.6.40-apng-apng.patch.gz 10330 BLAKE2B e2a5ff10ebaf75019d20edb148ea26fd6b255842aa34e8af31a919ae3c059b28eb827831289f47428e5f55c239f23a600677fde58e74bf0a2db27b5001f9ccb1 SHA512 803c45c2bbaf6c12863a09fb4d307c629680835b11a01c456512c81ef705e4f96c29e98c2486970ff1d86335cb4bd7568a30482c3e69601275d2a31d294058db DIST libpng-1.6.40-libpng-apng-apng.patch.gz 10815 BLAKE2B 47b09d730d6be1d481ab48e511068a38fc3448339aaeab1d8ad21f26de6cb79006c64785de2e0514ff820a75101c0010b84cce923d10e8f6198e4e99916d08f2 SHA512 373cc9f0df15f7c77c0a59ddaac22374cfae37174b63a642e68e3a17a6d0bb1015399d771998c7eb6b356b634f157f0009743f4cc659f3b8e480a9533010ef9c DIST libpng-1.6.40.tar.xz 1021332 BLAKE2B 4dd2df57791ca68cc31ba966b9176ecb37458572c60eef34e31ff0d3266d25ad6ea9d2e8cae6bfaf7932b5c7bc231047d3ed139b3464304c41cc4d89611f5ba8 SHA512 a2ec37c529bf80f3fee3798191d080d06e14d6a1ffecd3c1a02845cb9693b5e308a1d82598a376101f9312d989d19f1fb6735b225d4b0b9f1b73f9f8a3edb17f -DIST libpng-1.6.41.tar.xz 1035328 BLAKE2B 43d8d1c563d9df46b663f706dca9563e31e6e47a2809a77a5d059de8cfa348721054df724d08ac24ef4717ffc101989941127df2d026c9537532375d9b432b68 SHA512 046d0328255572ee2ccab7e751ed457b07e0aedc72474c2f4675a8303e628de3ef8afa1a00c60d768eb788546d1cda1e8b800b2497d9c352694faba6dde2c5b4 DIST libpng-1.6.42.tar.xz 1035484 BLAKE2B 8a8895b673ff90416a00c9ff775d7bdc38ab1ab0d83fd6e70cfffea2ed78bd42896950a64bf48ad9a00ea50d8c5d5702975b0bae7bb3300d4de4c82b334e513e SHA512 a9e8641f79ebc811e8e1e94c4966737f8d0f3aef33c86834c419ca76050567891c065899c3bc0c945c59b5d50c5ff7d693cc51089d06efe92e71ae8014fa157c +DIST libpng-1.6.43-apng-apng.patch.gz 10333 BLAKE2B 11bc92064e52f8a045b9d2a7158808471faf3e94b08dceae6aa5cfef635731ef3740e69b27118b9a5b2f2d3b810f108b8c30192388c569de1371f34a5f49f592 SHA512 3a3320c682fe8a575e76e9ede0a2d2d62533cbb206b428bfdf2729c649aaf3061b21e55c1d8848d474e40615b4e9870d49927b14de237777135524f904bac36c +DIST libpng-1.6.43.tar.xz 1044076 BLAKE2B e8781001f001e6f514ca01ceafc51557e6cdedcbed3aa64df213d02635eec937cac4ccc0f34b636f582a7d141b67ec6c8d90a6ffb15c679ab0c3f4f8798be791 SHA512 c95d661fed548708ce7de5d80621a432272bdfe991f0d4db3695036e5fafb8a717b4e4314991bdd3227d7aa07f8c6afb6037c57fa0fe3349334a0b6c58268487 diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch b/sdk_container/src/third_party/portage-stable/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch deleted file mode 100644 index d2913b062f..0000000000 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch +++ /dev/null @@ -1,94 +0,0 @@ -https://bugs.gentoo.org/923298 -https://github.com/pnggroup/libpng/commit/ac944e2b364cff96e8458110c2ad06a63f8543b3 - -From ac944e2b364cff96e8458110c2ad06a63f8543b3 Mon Sep 17 00:00:00 2001 -From: Cosmin Truta -Date: Mon, 29 Jan 2024 15:30:10 +0200 -Subject: [PATCH] Fix a regression introduced in "chore: Clean up the return - statements" - -This fixes commit 27e548af2518ff8d278b45c40d11ad1bdd68eaa0. - -The macro `png_check_sig` has been deprecated and remained untested -for decades. And yet, somehow it escaped from all past API cleanups. - -Also update the libpng manual. - -Reported-by: Matthieu Darbois ---- a/libpng-manual.txt -+++ b/libpng-manual.txt -@@ -357,7 +357,7 @@ Customizing libpng. - return ERROR; - } - -- is_png = !png_sig_cmp(header, 0, number); -+ is_png = (png_sig_cmp(header, 0, number) == 0); - if (!is_png) - { - return NOT_PNG; -@@ -4692,7 +4692,7 @@ deprecated since libpng-1.0.16 and libpng-1.2.6. - The function - png_check_sig(sig, num) - was replaced with -- !png_sig_cmp(sig, 0, num) -+ png_sig_cmp(sig, 0, num) == 0 - It has been deprecated since libpng-0.90. - - The function -@@ -4756,8 +4756,8 @@ png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(), - png_set_asm_flags(), and png_mmx_supported() - - We removed the obsolete png_check_sig(), png_memcpy_check(), and --png_memset_check() functions. Instead use !png_sig_cmp(), memcpy(), --and memset(), respectively. -+png_memset_check() functions. Instead use png_sig_cmp() == 0, -+memcpy(), and memset(), respectively. - - The function png_set_gray_1_2_4_to_8() was removed. It has been - deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with ---- a/libpng.3 -+++ b/libpng.3 -@@ -876,7 +876,7 @@ Customizing libpng. - return ERROR; - } - -- is_png = !png_sig_cmp(header, 0, number); -+ is_png = (png_sig_cmp(header, 0, number) == 0); - if (!is_png) - { - return NOT_PNG; -@@ -5211,7 +5211,7 @@ deprecated since libpng-1.0.16 and libpng-1.2.6. - The function - png_check_sig(sig, num) - was replaced with -- !png_sig_cmp(sig, 0, num) -+ png_sig_cmp(sig, 0, num) == 0 - It has been deprecated since libpng-0.90. - - The function -@@ -5275,8 +5275,8 @@ png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(), - png_set_asm_flags(), and png_mmx_supported() - - We removed the obsolete png_check_sig(), png_memcpy_check(), and --png_memset_check() functions. Instead use !png_sig_cmp(), memcpy(), --and memset(), respectively. -+png_memset_check() functions. Instead use png_sig_cmp() == 0, -+memcpy(), and memset(), respectively. - - The function png_set_gray_1_2_4_to_8() was removed. It has been - deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with ---- a/png.h -+++ b/png.h -@@ -914,9 +914,9 @@ PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start, - size_t num_to_check)); - - /* Simple signature checking function. This is the same as calling -- * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) != 0). -+ * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) == 0). - */ --#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) != 0) -+#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) == 0) /* DEPRECATED */ - - /* Allocate and initialize png_ptr struct for reading, and any other memory. */ - PNG_EXPORTA(4, png_structp, png_create_read_struct, - diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.41-r1.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.43.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.41-r1.ebuild rename to sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.43.ebuild index e82599595c..d59d1ec901 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.41-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.43.ebuild @@ -5,8 +5,8 @@ EAPI=8 inherit libtool multilib-minimal -APNG_REPO=libpng-apng # sometimes libpng-apng is more up to date -APNG_VERSION="1.6.40" +APNG_REPO=apng # sometimes libpng-apng is more up to date +APNG_VERSION="1.6.43" DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" SRC_URI=" @@ -28,10 +28,6 @@ DEPEND="${RDEPEND}" DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO ) -PATCHES=( - "${FILESDIR}"/${P}-png_check_sig-abi.patch -) - src_prepare() { default