From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- app-arch/pixz/Manifest | 3 -- .../pixz-1.0.6-avoid-unaligned-accesses.patch | 44 --------------------- app-arch/pixz/pixz-1.0.6-r1.ebuild | 46 ---------------------- 3 files changed, 93 deletions(-) delete mode 100644 app-arch/pixz/files/pixz-1.0.6-avoid-unaligned-accesses.patch delete mode 100644 app-arch/pixz/pixz-1.0.6-r1.ebuild (limited to 'app-arch/pixz') diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest index c46969100cf3..fcd83a5dff07 100644 --- a/app-arch/pixz/Manifest +++ b/app-arch/pixz/Manifest @@ -1,7 +1,4 @@ -AUX pixz-1.0.6-avoid-unaligned-accesses.patch 1253 BLAKE2B e852f1c991bc7ba282b47516598d09a41182f01ceade67276dcfb192767c1bf33a36cf992d5de201bddc24790896af9e22e83f3fcd48a84f3ea3f6c9cfd7e50e SHA512 6390ec34f3d7d07be6ef6842a631d2e2ef87abe54e5f745846a6c08a4c1a7c15d50d3327afae131dd4b64a66ff187ada1d4cdae4f4503c33e249dc238082ce9a -DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7 DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d -EBUILD pixz-1.0.6-r1.ebuild 1182 BLAKE2B 028af73c2881e148fcfb20f037c58666353ca0842276e744a2fa89b229139a566bf30d06294e42919ee7510b4970743c3b6bc0c24f7963aa21d733718dac318c SHA512 8861d797668b563dfcc1b736320239125530d3932e4ada96467d37e8240f1aa31d785c807a3994577e5a5fdbc48efa8ad973602a2d5937401021c4cc405b0411 EBUILD pixz-1.0.7.ebuild 1153 BLAKE2B d66b37b1874a4687d50453c036c8089d0886d65a48603a9c3f28a5b68f1ffb93c4cb8221aa0f8fd699a9eb3c38f9e3812fe4129c32a2453c674a0c4525b6320a SHA512 305f8e96edb4b34b9c8b48f2746fff3e42605cbc111d4f5f24d9f810141b12d5224ef1c194885df9e83f25955804d3212d38fe099615cd5d1455ae3087958414 EBUILD pixz-9999.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401 diff --git a/app-arch/pixz/files/pixz-1.0.6-avoid-unaligned-accesses.patch b/app-arch/pixz/files/pixz-1.0.6-avoid-unaligned-accesses.patch deleted file mode 100644 index 24c53c9acc4a..000000000000 --- a/app-arch/pixz/files/pixz-1.0.6-avoid-unaligned-accesses.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://github.com/vasi/pixz/pull/82 - -From 8b9a198d86e435929ed0c2246217d241ed1e707c Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Sun, 1 Sep 2019 23:58:26 -0700 -Subject: [PATCH] Avoid unaligned accesses - -Architectures like SPARC do not allow unaligned accesses. Avoid them by -memcpy()ing the data to an aligned buffer. On x86 systems where -unaligned loads are fast, the memcpy() will be compiled away and the -same code generated as before. ---- - src/endian.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/endian.c b/src/endian.c -index 51aea58..122c7da 100644 ---- a/src/endian.c -+++ b/src/endian.c -@@ -13,6 +13,7 @@ void xle64enc(uint8_t *d, uint64_t n) { - #elif defined(__linux__) || defined(__FreeBSD__) - - #include -+#include - #ifdef __linux__ - #include - #include -@@ -37,11 +38,14 @@ void xle64enc(uint8_t *d, uint64_t n) { - #endif - - uint64_t xle64dec(const uint8_t *d) { -- return le64toh(*(uint64_t*)d); -+ uint64_t tmp; -+ memcpy(&tmp, d, sizeof(tmp)); -+ return le64toh(tmp); - } - - void xle64enc(uint8_t *d, uint64_t n) { -- *(uint64_t*)d = htole64(n); -+ uint64_t tmp = htole64(n); -+ memcpy(d, &tmp, sizeof(tmp)); - } - - #else diff --git a/app-arch/pixz/pixz-1.0.6-r1.ebuild b/app-arch/pixz/pixz-1.0.6-r1.ebuild deleted file mode 100644 index 4ef78d45feb3..000000000000 --- a/app-arch/pixz/pixz-1.0.6-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/vasi/${PN}.git" - inherit git-r3 autotools -else - SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" -fi - -DESCRIPTION="Parallel Indexed XZ compressor" -HOMEPAGE="https://github.com/vasi/pixz" - -LICENSE="BSD-2" -SLOT="0" -IUSE="static" - -LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)] - >=app-arch/xz-utils-5[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc" - -PATCHES=( - "${FILESDIR}"/${P}-avoid-unaligned-accesses.patch -) - -src_prepare() { - default - [[ ${PV} == "9999" ]] && eautoreconf -} - -src_configure() { - use static && append-ldflags -static - append-flags -std=gnu99 - # Workaround silly logic that breaks cross-compiles. - # https://github.com/vasi/pixz/issues/67 - export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no) - econf -} -- cgit v1.2.3