From 5df14c983fc9365d0e29b3e436fae6bb24701fbb Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Tue, 28 Apr 2015 03:04:18 +0000 Subject: [PATCH] adding patch to fix sparc failures wrt bz #547252 Package-Manager: portage-2.2.18/cvs/Linux x86_64 --- media-libs/netpbm/ChangeLog | 6 +++- media-libs/netpbm/Manifest | 31 ++++++++++--------- .../netpbm-10.66-wordaccess_be_aligned.patch | 13 ++++++++ media-libs/netpbm/netpbm-10.66.00.ebuild | 3 +- 4 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 89d87f2b1db7..b9ed8b6b107a 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.287 2015/04/14 10:59:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.288 2015/04/28 03:04:13 jmorgan Exp $ + + 28 Apr 2015; Jack Morgan netpbm-10.66.00.ebuild, + +files/netpbm-10.66-wordaccess_be_aligned.patch: + adding patch to fix sparc failures wrt bz #547252 14 Apr 2015; Agostino Sarubbo netpbm-10.66.00.ebuild: Stable for ia64, wrt bug #544404 diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index b793d668f26a..6792ccd22e4e 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -12,27 +12,28 @@ AUX netpbm-10.66-jbig-2.patch 725 SHA256 defe6bd506c73c48eeb94c7a0dd2a2e471823c4 AUX netpbm-10.66-jpeg-dirs.patch 722 SHA256 8cca55c06fd4f678c069a0ae3e63997a408d54bba9c44150c126d94fd6cce424 SHA512 95a4ab08702faa3d25c75b71329ea28e5eb5f4f0b200d34d7350633e9a999160fe58e8f57fadab30e273c61a06c8d148fdebecbffa5c0b5023c59647f6d4c3ae WHIRLPOOL 877efe30dea24809593bfa214509b69768e443a5f59c6441d94d63e80855e34b6725fbb79658cfb76accdff8acbb6b9a140f99864b82270146fad6e73e754d02 AUX netpbm-10.66-options-case.patch 3417 SHA256 1d286fc9da28b7cc264b6d227871e3d77f09cfa57fd680972c5147344930ae22 SHA512 2895b71269d321f84e79808a2fe65a8886ce3e173550051ca40563636b3e8561d5c812a3bb9f2e607c2dc7244b56492332a4299d165059d866ca00701adefe23 WHIRLPOOL 6afb3df9509357060879394f3d0c175bdf5db04719280aa5f98b2bb17dee1fb29b70e8594eaa0819cb905b2d00a4b32a61822f48deb60c541942e0e593fdba35 AUX netpbm-10.66-test.patch 347 SHA256 fb95a101811a6e8b983d6f82130e511658831e6ad2e873fa4632c4049a00bac2 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 WHIRLPOOL 5f59c43abf70d6bc74e6ac6050e25137421f0f3fd5e75e6fb8e77c54f2fc447f26c1a0aeb23ea70dca27bd44b11fdc88fbbd8bcbc1be338acb6f601b9fdcb943 +AUX netpbm-10.66-wordaccess_be_aligned.patch 621 SHA256 4e031c93bf1e50a55ce9c26f0c798abd0002ab1befb92388352db30045cf1b05 SHA512 0fbdc36605a3cb8f1c8f7c3772d01384eca557cbebbfa6ef7c8e6a8a3cada69d05521b98c7241743b3640d53655e119001174559bcdb594981effd64bef71b6a WHIRLPOOL 50ef0c5fcb6eae5da47e35f359695f074a46ad3fd297448423c99ccbd1a5b8e96474a68bc605741e2f7dbc4f0cfca3631473672d1ff8596dfbeb07054118a7bf DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b SHA512 3bebffb798e72e5ff872b482d43dffbd174496d1ca46e88bcb3c19f2b94cdfe2037aa1f19a22a40996503ccc03929bd28570722874a0c74265b083fbc66b24c4 WHIRLPOOL cbf1efd16ac7acef1fa318454f24afbd7f68eded7343168783ce8fd5dd389b9d97e7a9237cf4d6315cdeba462c9d84fb7011ddfa2df592b1fe15f4462ca0d623 DIST netpbm-10.51.00.tar.xz 1834148 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e SHA512 07b621bfebbd051a80eff09886bc2b3b4f82b01fa9087d6a76ed70a042493b69fb3295d471640a4576101ba19352a57eadf69c5721d9cc416d25ff563ee07c76 WHIRLPOOL 25cbfbdd575fe1c032ce1bb700181175b1386d481990e516ce62d953b1d37091c32ca2016c487d4963af1b8c79ec04953e59181334d2a53b9d5701acedabdf2a DIST netpbm-10.66.00.tar.xz 2575356 SHA256 7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af WHIRLPOOL fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf EBUILD netpbm-10.51.00-r2.ebuild 4876 SHA256 64ba1ded0af46f473325f4331d9c2f0bd4a01b01d2a9b13cfbd10100f6716cf1 SHA512 8a8a70195e352b5c975a74f060c6d412c781f4162aa00746c71e803bbb95c95c0487d1394b72099b52fd5b03cabb3fc13726b283905aad20028372d0f3e08537 WHIRLPOOL ad468b638a5d9ba18bf753a7cd69d1cacced523ec1ae0bece3f040f388cc1681ce40bfdb2f1109b8d5f6585eeb72a475685d78084891d8a56dd6da02ed829ba0 -EBUILD netpbm-10.66.00.ebuild 5536 SHA256 5b1db2e438754f975090d975bac601fd186bd534db60611eb6390dfce186fb5e SHA512 39401392df44803b13c1b16e7888d82c4872bf463394d077b7e21710658838e84f2b5739a1262f085e24b7b13ee22b3675b36d69b8204b1f6b13804664308549 WHIRLPOOL 91159d48123077e967d7134052439577a89cab540019049acf61de2ffbd99bfabd72c1251dc336747741c8f3609d9f37be8392620045b4f1d66dac0f23d78f87 -MISC ChangeLog 40328 SHA256 884c64edf19f67f6a1acb621eebba5896aa02ad9cdcfbef371280024b99696b0 SHA512 5d08f79cc0be28304231a7beae457ee0bdc46b20a581cf6f5c04824844b1c8726103e22f7d9e978abbba5126f30932357b0874dc10ed0a00f933170677ec6c74 WHIRLPOOL bdf862db8e73bd37824f563af5024e5baaf632d9573c95d2c6a0954de11de4ef152c9ee2e7c53dbb4f41ee6e29f8312f265756425299ec2f170cd8aa45f54bb6 +EBUILD netpbm-10.66.00.ebuild 5603 SHA256 7f65ef8fe09d4d62fbb9308f1ac6c8fe9d175eb24a21e972af821416200a3947 SHA512 4bc10d1caf90379b1967ede5414d66395d459221349f2bb69900d9f8f669df144eb4d5f684697a7d2c63d2c4c9326e09b0008c7cdbfd05cbe3ef8e38b758d31f WHIRLPOOL d28a1454fee46c0090f099152ceef0c91d5b61e8518902e5333b55bf6306b233edb342fdef8f5780405e834375fd9ad85423d7b56322cad611ec794b491517a0 +MISC ChangeLog 40508 SHA256 341fe8da3f8da2382b34e04e7d8b20f473658de17d4e8c02bbec2f1415b45179 SHA512 06e16ed34276bbf03ed60c842b9f689c14f0c5b9cbc8e4d998a3d2a55d1e4cf242989e6bbddf9973dd0f80d13b68886d840c48fa75f9b473598bd9cd9c3b2615 WHIRLPOOL a9c1e283354987e433fdea2780d0e54640d17ef06a2d4f7e2c5457fbaea98630c65cb84d3af285a0654a5c1a3167c2b6e14f03df37c644e3198e47f83f0bf010 MISC metadata.xml 261 SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b SHA512 e7bcb8f689bd7da37e414a3f33b125d52a5ec0d376e821edd58d352ffb502098fbe8b7d24c0eb073822e41a55c280f84558ca4314dd37ac20adcf6471bd712af WHIRLPOOL 9aa2223d48bacfa917affeb56dc180becb54fc612e69ce6d26496d45cc42fd1050e2a40c77957ee7f37b3e2665adc0c95f08b60fab1787d3292905f0a4c8092a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVLPMLAAoJELp701BxlEWfJcMP/R9/AR+5FhCe7vxtPAtHNBZG -Cm4AHgf9yO1ax2quyPqBXzqL+lJF1Ek17USnA0iabnTyrjwTXyxM8RwewVsq6Nkw -rR1NvkZIDZ1pLFGbbrc601o2FBfJZYTuM19qwkBolHfbY0Hx4Kwnzqu/uqLBbAAH -0xdtci1GHgZV7bhMkhtLM15rwV3rEnQ2Jdtm280h0koPBUhBrp9lQIciDhpLMqKA -dG7P8gBMsDDmpBLnzEMS0SjNXkOMfF9qc1L+MiX+8EaIDGAGZ+5US9WmSfnXN+yj -uxGkh+cfNYcCJTymn7jbZfXXnR38FPIpOp8tscW9Q+sRNzSlxGNWLfAsCjbBTwNn -PixH0clI+1BitlG2fST2mKs4keiKzywspPY08D0vtCCa9ywpzNehF7bgcVhZn/85 -VeLkhAipHsuponr5uAmV2bnHVnfc9JDh4GgCWibsbFDAOF7Y6VRiKkugcg32ZF/J -XnzOnNw8l+ebIr3CtQxm7teyCTAw6Ew74RlkYKo/vrDaOp2UOmYCRzXFgKFZ38nz -L7DL8dHcvx4iJ2suGkIAjbiojK5PnAZ4O6nmVWhG1RnNAxnRWx+fihpOIVidFPBC -tsdU85TGKsE5Os3pFZb1sLa8bJiDU/nVj2vGmkXJUhyZk1N2+D+X5eCQ5FHOarw6 -qp13Npm6nbsYApFbqXM+ -=PSQ9 +iQIcBAEBCAAGBQJVPvifAAoJEL9Txpt2HY4KabQP+QGUpJ1Qhg3ZdzWBunFhCqNM +oHVkDeOJDlUwco4wqIj4E0Iun4c0kDTEY/9ECdt+gHYIbU/0IdZx1fF69esP8Bsm +vYelgSa3To/D6XUP+ZMgCvENBae815bXrB/qnZ4f7X7u+TX/FatRI7TNsQaS/gx0 +w5zTfskVJstROBEhjdo+xrCyxKyxnbbijhfjrg65MPcc069v3fA7YH2XsDuu2k+N +my11eEw1OCIB5msyyuR6S3/3VnL9M+Ei+oZMBy168toSZFc2ACyp5INH0WaAHxtM +aFZEBeRDoRMk8hmgHGsB1D+o0l7gXKSC3iCKGlpQqDhZzm5pvXAhnSBEHdgeGa2z +G6ZTK2jLhGdNG42wvZMZflXsXGG502tzzz2oT9SkEtgd3Pi7KZyq8I2Hsetg9PWu +BKvlU0ANvUgaTO5AFo0n+KC0Ftr/MJJBICw8y9onJtA874EALQju4z4QyzfBFVIu +DIeY4MRczq8afG1gXP/eOaMQbhl65aeIGoCF66Phtic3tR90LuzWHcnOrZZBKiw5 +/JBwvl8VykF17ZSbVXvcVRxnQFdIIBCLRt2KPAA+8r3AQ9MC/zYF36l9a8mL2PDq +2oAV5YF9L6ALF0ZUaD12xmvR+t/Wt1Fwf8z5m26DOuSDWj1HUtfTz1gDG7uZWqYY +2Kj8/E2ZI0uGjGtKjQpo +=G8DK -----END PGP SIGNATURE----- diff --git a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch new file mode 100644 index 000000000000..fab864975bdc --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch @@ -0,0 +1,13 @@ +diff --git a/lib/util/wordaccess_be_aligned.h b/lib/util/wordaccess_be_aligned.h +index 0d5809e..f3bbb84 100644 +--- a/lib/util/wordaccess_be_aligned.h.orig ++++ b/lib/util/wordaccess_be_aligned.h +@@ -24,7 +24,7 @@ bytesToWordint(wordintBytes bytes) { + static __inline__ void + wordintToBytes(wordintBytes * const bytesP, + wordint const wordInt) { +- uint16_t const hi = ((wordInt >> 48) & 0xFF) ++ uint16_t const hi = ((wordInt >> 48) & 0xFF); + uint16_t const mh = ((wordInt >> 32) & 0xFF); + uint16_t const ml = ((wordInt >> 24) & 0xFF); + uint16_t const lo = ((wordInt >> 0) & 0xFF); diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild index 108a5357d5e9..739a110aad9d 100644 --- a/media-libs/netpbm/netpbm-10.66.00.ebuild +++ b/media-libs/netpbm/netpbm-10.66.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.66.00.ebuild,v 1.13 2015/04/14 10:59:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.66.00.ebuild,v 1.14 2015/04/28 03:04:13 jmorgan Exp $ EAPI="4" @@ -61,6 +61,7 @@ src_prepare() { epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch + epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch # make sure we use system urt sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die -- 2.26.2