gentoo auto-resync : 19:04:2024 - 12:05:02

2 files changed, 0 insertions, 158 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index dbc474bd50ff..df62c8b2299d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -3,7 +3,6 @@ AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55c
 AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
 AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68
-AUX netpbm-11.5.2-fix-tests-musl.patch 4779 BLAKE2B 049b20cecdaf40e77c37ad01cfe4e17b8006c3788f47971319e553bfbab760e7e0bb3a970060e74860a7c3326945f5505680519efe7c2feee5fa6ee08ba45202 SHA512 260f4282dcfd6dd0922b62e4c3f217e33d159ab2df779ec0c1df27f16c8075fb77927ce2aadd34c20475d38b7482506758e38b7571df7c3d5a92de9c5cc496d6
 AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee645e61accc13645a690dc7e75cde2c33afd1ac7f07abbcb85a97b7e113217af12617ec5ad314eca0324c7bfbe7beb445aee85de47649ffb SHA512 a3a46607904c8ff9757f0a136aa2336382033760bc69bcca5a5d7662ca824f9a7d4281fe3996efc57456c3b30ddf7319fb70a1cb950ef974507f82340a226abb
 DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace
 DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1
diff --git a/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch b/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch
deleted file mode 100644
index 4d8bd6c3b74d..000000000000
--- a/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Some tests are broken on musl.
-
-https://sourceforge.net/p/netpbm/code/4843/
-pnmindex, ppmtomitsu tests that don't use pnmcolormap
-
-So far, this only fixed ppmtomitsu.
-
-See also https://bugs.gentoo.org/907295
-
---- a/test/pnmindex.ok
-+++ b/test/pnmindex.ok
-@@ -7,12 +7,18 @@
- 3099638253 5290
- Test 4. Should print 1397700642 3160
- 1397700642 3160
--Test 5. Should print 2303488589 28514
--2303488589 28514
--Test 6. Should print 1706277976 100455
--1706277976 100455
--Test 7. Should print 801388440 100455
-+Test 5. Should print 243472565 28514
-+243472565 28514
-+Test 6. Should print 801388440 100455
- 801388440 100455
-+Test 7. Should print 256 twice
-+256
-+256
-+Test 8. Should print 100 twice
-+100
-+100
-+Test 9. Should print match
-+match
- Test Invalid
- Expected failure 1 (no output)
- Expected failure 2 (no output)
---- a/test/pnmindex.test
-+++ b/test/pnmindex.test
-@@ -3,6 +3,9 @@
- # Also requires: pamcat pamscale pbmtext pnmcolormap pnmindex
- # Also requires: pnminvert pnmquant pnmremap
- 
-+tmpdir=${tmpdir:-/tmp}
-+pnmindex256_ppm=${tmpdir}/pnmindex256.ppm
-+
- echo "Test 1. Should print 3391481002 889"
- pnmindex maze.pbm | cksum
- 
-@@ -17,18 +20,28 @@
- pnmindex -size 20 -across=3 testgrid.pbm testgrid.pbm testgrid.pbm \
-          testgrid.pbm testgrid.pbm testgrid.pbm | cksum
- 
--echo "Test 5. Should print 2303488589 28514"
--pnmindex testimg.ppm | cksum
-+echo "Test 5. Should print 243472565 28514"
-+pnmindex -noquant testimg.ppm | cksum
- 
--echo "Test 6. Should print 1706277976 100455"
--pnmindex -size 50 -across=2 testimg.ppm testimg.ppm testimg.ppm \
--         testimg.ppm testimg.ppm testimg.ppm | cksum
--
--echo "Test 7. Should print 801388440 100455"
-+echo "Test 6. Should print 801388440 100455"
- pnmindex -size 50 -across=2 -noquant testimg.ppm testimg.ppm testimg.ppm \
--         testimg.ppm testimg.ppm testimg.ppm | cksum
-+         testimg.ppm testimg.ppm testimg.ppm | tee ${pnmindex256_ppm} | cksum
- 
-+echo "Test 7. Should print 256 twice"
-+pnmindex testimg.ppm | ppmhist -nomap -noheader | wc -l
-+pnmindex -colors 256 testimg.ppm | ppmhist -nomap -noheader | wc -l
- 
-+echo "Test 8. Should print 100 twice"
-+pnmindex -colors 100 testimg.ppm | ppmhist -nomap -noheader | wc -l
-+pnmindex -colors 100 testimg.ppm testimg.ppm | ppmhist -nomap -noheader | wc -l
-+
-+
-+echo "Test 9. Should print match"
-+pnmindex -size 50 -across=2 -quant -colors=256 testimg.ppm testimg.ppm testimg.ppm \
-+         testimg.ppm testimg.ppm testimg.ppm |\
-+    pnmpsnr -rgb -target1=41.31 -target2=40.76 -target3=40.71 ${pnmindex256_ppm} -
-+
-+
- echo "Test Invalid"
- 
- . ${srcdir}/test-invalid.inc
---- a/test/ppmtomitsu.ok
-+++ b/test/ppmtomitsu.ok
-@@ -1,9 +1,9 @@
--Test 0. Should print 458455366 101484
--458455366 101484
-+Test 0. Should print 668243897 101532
-+668243897 101532
- Test 1. Should print 3110813682 101562
- 3110813682 101562
--Test 2. Should print 4168174994 34399
--4168174994 34399
-+Test 2. Should print 825518840 34209
-+825518840 34209
- Test 3. Should print 3201293405 310
- 3201293405 310
- Test 4. Should print 3354679572 752
-@@ -10,5 +10,5 @@
- 3354679572 752
- Test 5. Should print 3999654426 101549
- 3999654426 101549
--Test 6. Should print 4201246884 101549
--4201246884 101549
-+Test 6. Should print 3103038403 101549
-+3103038403 101549
---- a/test/ppmtomitsu.test
-+++ b/test/ppmtomitsu.test
-@@ -1,31 +1,31 @@
- #! /bin/sh
- # This script tests: ppmtomitsu
--# Also requires: pnmcolormap pnmremap
-+# Also requires: pamseq pamdepth
- 
- tmpdir=${tmpdir:-/tmp}
--testimg100_ppm=${tmpdir}/testimg100.ppm
-+testimg216_ppm=${tmpdir}/testimg216.ppm
- 
--echo "Test 0. Should print 458455366 101484"
--# equivalent to: Pnmquant 100 testimg.ppm
--pnmcolormap 100 testimg.ppm | pnmremap -nofloyd -mapfile=- testimg.ppm |\
-- tee ${testimg100_ppm} | cksum
-+echo "Test 0. Should print 668243897 101532"
- 
-+pamseq 3 5 -tupletype=RGB | pamdepth 255 | pnmremap -nofloyd -mapfile=- testimg.ppm |\
-+  tee ${testimg216_ppm} | cksum
-+
- echo "Test 1. Should print 3110813682 101562"
--ppmtomitsu testimg.ppm | cksum 
-+ppmtomitsu testimg.ppm | cksum
- 
--echo "Test 2. Should print 4168174994 34399"
--ppmtomitsu ${testimg100_ppm} | cksum 
-+echo "Test 2. Should print 825518840 34209"
-+ppmtomitsu ${testimg216_ppm} | cksum
- 
- echo "Test 3. Should print 3201293405 310"
--ppmtomitsu testgrid.pbm | cksum 
-+ppmtomitsu testgrid.pbm | cksum
- 
- echo "Test 4. Should print 3354679572 752"
--ppmtomitsu -tiny testgrid.pbm | cksum 
-+ppmtomitsu -tiny testgrid.pbm | cksum
- 
- echo "Test 5. Should print 3999654426 101549"
--ppmtomitsu -tiny testimg.ppm | cksum 
-+ppmtomitsu -tiny testimg.ppm | cksum
- 
--echo "Test 6. Should print 4201246884 101549"
--ppmtomitsu -tiny ${testimg100_ppm} | cksum 
-+echo "Test 6. Should print 3103038403 101549"
-+ppmtomitsu -tiny ${testimg216_ppm} | cksum
- 
--rm ${testimg100_ppm}
-+rm ${testimg216_ppm}