From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- x11-libs/pixman/Manifest | 4 ++-- x11-libs/pixman/pixman-0.40.0.ebuild | 7 ++++++- x11-libs/pixman/pixman-9999.ebuild | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'x11-libs/pixman') diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest index cb2373f34a0c..06ddb45f154e 100644 --- a/x11-libs/pixman/Manifest +++ b/x11-libs/pixman/Manifest @@ -1,4 +1,4 @@ DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 -EBUILD pixman-0.40.0.ebuild 1666 BLAKE2B 8339d9706ca95fe69b4867a434d38a3e18d361c6bea96019ada8c9112559b5b025262415a30ba53f5e91e0b66a890ab906d9c76c5e0712b31434c6b8e731e928 SHA512 2cd680ad534d5eec4783a8339c128af3d32553f041fcf34e226041946fd1db30476b4c6ac2f28f88d0556e2578cf708b9c1edd627452f757908462c8add5d3f5 -EBUILD pixman-9999.ebuild 1661 BLAKE2B 50684ad73e5be11ede13f57afbd56ba5653550774654cfc3f6fb82b2501479e72db9e5e67277b17146e4517e643ba0c0ab30bd2057524dfadb4ed52cdbbd8cc2 SHA512 168e5004344045e3146023463bd5f364d073a71ff3c1097b84f6a4e1c93552ea16d2649d5c1597f68bde71d0cb53c12eab190db0177c6da33a7c6a4073ee7709 +EBUILD pixman-0.40.0.ebuild 1851 BLAKE2B 40f21271b618365fa23f17272896597b0a5ba6bb249e1aa72244b1079a1e5cceb200e51d974ca1a65cc6e6add176f2631823214f59f2890b37b8d37d6a9b57cc SHA512 bd3ff7029cb8fa8bf202eb9967b75c2b9b27c4dd3504420f066756b7cd02c7048ff4b73339bf7cbe0f688249aac136c056bcafc4973f0c0d93a2ff24b0fd15d5 +EBUILD pixman-9999.ebuild 1859 BLAKE2B ccc5b9b92936bd435c60e99f5ce1b2bdc5231fc522b5c4f4a998b2da259ba45edc1ce749646c71d07c702b26d33680ceb5a2f0aa90e7699856f42a7afbc2a76e SHA512 f14a343095a5312c67423b89387942b27581263f114d5a091553e2f0e13f52b55233b833ecad9438435aa2026679e566d44263cc13dd4c5f6cf9fd6ba6d013f5 MISC metadata.xml 392 BLAKE2B 5ad5ba991fefef08fe1fa364ce726a90a338c6840947cd6fb9ac57b7e4cdff0389d9a6fac955164529a51ee5ec92cd2e478e4d330484593fcfdfc8d5325ca21b SHA512 ae68e9a2a492e899bff3ea5c70c88f054fde927c18e9d4a3c08030c8b2f5b6f2977bf9590b4d4776bb1151a3cd9de72bc18460c0ebdc2f506c8ff51b99a5b3c5 diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild index 90fff3bb9046..a269bcee7084 100644 --- a/x11-libs/pixman/pixman-0.40.0.ebuild +++ b/x11-libs/pixman/pixman-0.40.0.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs +inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" @@ -28,6 +28,11 @@ multilib_src_configure() { local openmp=disabled tc-has-openmp && openmp=enabled + if use arm && tc-is-clang ; then + # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 + append-cflags $(test-flags-CC -fno-integrated-as) + fi + local emesonargs=( $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index d79304a2d1a2..e6332d538639 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -9,14 +9,14 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs +inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi @@ -28,6 +28,11 @@ multilib_src_configure() { local openmp=disabled tc-has-openmp && openmp=enabled + if use arm && tc-is-clang ; then + # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 + append-cflags $(test-flags-CC -fno-integrated-as) + fi + local emesonargs=( $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) -- cgit v1.2.3