From 360961dcece15e1a6735153fb876b21f23d82195 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 20 Mar 2015 08:12:35 +0000 Subject: [PATCH] Explicitly disable udev/cairo since they are used only by tests #299008 by Nathan Phillip Brink. Add USE=valgrind to control inclusion of memory hints #481120 by Franz Fellner. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- x11-libs/libdrm/ChangeLog | 10 +++- x11-libs/libdrm/Manifest | 21 ++++++-- x11-libs/libdrm/libdrm-2.4.59-r1.ebuild | 66 +++++++++++++++++++++++++ x11-libs/libdrm/metadata.xml | 1 + 4 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 x11-libs/libdrm/libdrm-2.4.59-r1.ebuild diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog index dc4f8ba385cc..4edc1a9e7421 100644 --- a/x11-libs/libdrm/ChangeLog +++ b/x11-libs/libdrm/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/libdrm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.285 2015/03/14 14:08:48 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.286 2015/03/20 08:12:34 vapier Exp $ + +*libdrm-2.4.59-r1 (20 Mar 2015) + + 20 Mar 2015; Mike Frysinger +libdrm-2.4.59-r1.ebuild, + metadata.xml: + Explicitly disable udev/cairo since they are used only by tests #299008 by + Nathan Phillip Brink. Add USE=valgrind to control inclusion of memory hints + #481120 by Franz Fellner. 14 Mar 2015; Markus Meier libdrm-2.4.59.ebuild: arm stable, bug #530652 diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index e5f1a906deac..59247a966292 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -21,13 +21,24 @@ EBUILD libdrm-2.4.53.ebuild 1879 SHA256 286ba155ecd1f79d0f4445555839fbaa901cce72 EBUILD libdrm-2.4.54.ebuild 1879 SHA256 5d8cd5d9e0ad0b6cb7ba87cc6697966cbba6435326f1f95d5be071a62f5cdadf SHA512 38c00e8463ee1b5ae7388341053d5fb316de8e4dcbcac38fe4255e3995668f49725708f2578ad4e73cec467e946d2685c0230a8454678bac6050a54c79a4686c WHIRLPOOL 267f19c80924ce8a7dfcf5f061a1aee7b18ae3bb33581e0437fc455a6ad166296b1b84ea173e0f110ae4a7b2a6d5ee9da5c5c5151ff4966c3548ecc27f19b6dc EBUILD libdrm-2.4.56.ebuild 1827 SHA256 e0a87e05602a6d1f2f6139bc7a146f574fbff4d17084026d207b76784fb28cdb SHA512 881c042330a7f66abb18a13f5e9383e0738f3044218f9bf07af5151e70c47757bfad694699dc1789af00eb464f71ac0c3471c3e6449de603a2cae01f50b3f603 WHIRLPOOL 072bde2549130b6ee9a6db0085e7e8716afd159f411abbe0a6aea784c3da27a7db00159c8f19032b0040de04b35daf407c61ab391b6525a1609ac52554d71b53 EBUILD libdrm-2.4.58.ebuild 1822 SHA256 f3f332d0bebc87b60bfbfa1a4331b7786da90b77beffc9451a6f70274068b4a7 SHA512 c9072169a6dcd96da9166a319739c9a5f471a53dca57bb30431b7bcbe164ae4a0dbb91ed9f0b1f0d5ca28bb742cc2dcb3703f871f4940dc227d0d0b2aca22f74 WHIRLPOOL fe5a73e9d32418b06b9f7aeeecf23c2e3fae0a54715b02edc7b785ce4569cd9727fd44c77db641341ad3de60fc452dd27cd9e969121ae215ad0f3ab170c05ce1 +EBUILD libdrm-2.4.59-r1.ebuild 2106 SHA256 3e78d034f0271a0f6acef2da4e1e6e58b3872fc823b89e419b27de1e79fff346 SHA512 94ae3a4fd223d163caaf9517b33a76039daeba3ef48eddaac500b2f5ad4a920d224d7e50bb4eb6b8daeaa96a79daba7b0c91371bc02052073aa8564aed387044 WHIRLPOOL 142960a87c3a6d66171ba68b27fe59e5a895504385b26fb1d047eac2872f4db8fe84e72876a3faedf2badb3875d648d8cb416ee8dcaeb6acb6a41ae5548c5532 EBUILD libdrm-2.4.59.ebuild 1863 SHA256 6ef67bea83921025b686f36863473ed4f32c6b28fe7f5e85e6b1b4ae76d7ce1a SHA512 635ad770b8cf5149a77ff5cd0be8f5226432e9ea666727e2cac74cf2d9317e49736601c2bfb07329ee98dc388561964792305ea5666fe7a8fcd580b553cf5ea7 WHIRLPOOL 555827add4e96fa779b81ff58e54e24fa0f4b2cbab74072fe81bf3c3f192bbebd62b3ca2b80d4fa8b457a12d069c8c0b71110243828689c5fe7a02c796f02796 -MISC ChangeLog 37999 SHA256 cbd4ca1333b85ce1af5d7df3c203b586911214c3706778b8a2c928954b88d7ec SHA512 5e93934c3e55ce4bd1db442c99d23ceb5119c0c9333223d8c530606e7ba7d74f430134f6a2d8e7add6d65b7eac3c90eda82152ddb538a4c131207a36c6c099fb WHIRLPOOL b28b67e9b69dfaef315f565ef556768765a67f1cc513c023ff0a8fa8f81f4f1faeb5eb10c9294e88426fe9fd5da6922f7deba6c401943d85082b089be9a9e227 -MISC metadata.xml 272 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771 SHA512 c08dfcd90f1451c0cd9251b91833e8742e723043c2e6632eaab523d61745d0173502ae792225522053671df98aeaf2229783bfd5fe202bf29a166857fe0d8fd1 WHIRLPOOL f3d828a14266066ab3dd5c2970165bf9d1cf3d1c9fffd8d691344c7cc1b8ef011957d66f64b0c328afa64b92d1e154dec619f8f3bd0789edc36be07d33c74900 +MISC ChangeLog 38309 SHA256 31786d51dccf9bc76343d4d1da4248029d2957a2384e8dfc1912601c49aa1f48 SHA512 d8f9e62b284d4467979792ef5f82ecd9c6e4875c93afda709fb349a32a36d18420969e22f47668ec6160419a141261f09ee2258f72f6e79d91594eafeba71a22 WHIRLPOOL 3824aa756fc3d84ad294a32492aefdb8af4e1e9267c807521970d1f89aa26bf7078135eb3858a688965b21ffc90bd86316c50ca75e8765c97d9c29398f8e41bb +MISC metadata.xml 334 SHA256 9d19c1397f594181749abef539a5ddd1d39fd5b9565a95de5788bc85231b68b2 SHA512 051cb32876b20b1c6d4dbe62dc3b1dabd268a6a26abb1e7b1d72d6fc7e2cb6c25751b1f56833d1c4f0773a563ce59a2cfb32bdfba6aaf75a019ad08a5c041601 WHIRLPOOL 7d9d0977b53fd1c058e9a2ebbed487528c40489b86eab6917ae06cd0c4ed64d14d9964d1ad93d73911e58b31c8a149a2c1c984b1b31012762de9319b6e793c46 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUEQecACgkQkKaRLQcq0GL0sACfXgYRs2aD3rV8KIIlEmyWQ6b/ -7HwAoJae/kVWwI+K8E+K8OeD6IsmmDDb -=Y21x +iQIcBAEBCAAGBQJVC9ZzAAoJEPGu1DbS6WIA9UoP/1lsn1Mn9JWkUZ9eMhX4GgXk +F6tvtiEeUiyBEMCA8nbbL6b03/aa0WucankD326G9XSEs2DQfTFM2ZHJVee6whLy +sD3YsVCRjGsPDVwSArvJoqVjGDUBSNvnvGRVpXaCRGyDCUV25t80qhPW49HiWk9m +VkZPcVrIL23gPskXHnK9A8MxOJQXBW6girtMDVWgtfrDCyIRMSxUdy/5v2ud6cJe +5Ftf2wHTjtQRQQcNQKVVv4YRA8CU6xsuTDVCER3FCmEXKs0i2Yaa3DHJc23ukvRc +M1PAH+cNWJxzTI7rjMjnxhWVd42NYqAZfpdGdvBHHpH6Up3tdQEiHUia4QgkdZq2 +9KnyOX62L5qtcAgaYCOlLQyQrn6KvU682JWmhOEwBYHvtpEcgUPoBXpdy2VHJIPi +uyLel+MuTWkcrrSaSAlo1dVE75kqm4KdXlzz9B9TzVyVQUdOrcw2+Eia2f8kqLh9 +F+zf2nUyaNBW5k+jeDsuE9NHkS7shqtXBWFUCRahjR0NPvqwF/QXVl3XPnnF60oQ +mbxwCARYd9P75qtplHa0y6KmMXd8YEZBL9hxJ/64CzXN8IqVO03dpbETWEJ2lYnx +AnBXkYj7FTFfEEHyxKgwjyRpnaIt1wCz3qXV+3o2yVoxloezn03WpN5PgNLIq2xC +7pK7BHYlqF39mhAUpAV6 +=xR8d -----END PGP SIGNATURE----- diff --git a/x11-libs/libdrm/libdrm-2.4.59-r1.ebuild b/x11-libs/libdrm/libdrm-2.4.59-r1.ebuild new file mode 100644 index 000000000000..ec9e62405805 --- /dev/null +++ b/x11-libs/libdrm/libdrm-2.4.59-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.59-r1.ebuild,v 1.1 2015/03/20 08:12:34 vapier Exp $ + +EAPI=5 + +XORG_MULTILIB=yes +inherit xorg-2 + +DESCRIPTION="X.Org libdrm library" +HOMEPAGE="http://dri.freedesktop.org/" +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" +else + SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2" +fi + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" +RESTRICT="test" # see bug #236845 + +RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}] + video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] ) + abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.4.58-solaris.patch +) + +src_prepare() { + if [[ ${PV} = 9999* ]]; then + # tests are restricted, no point in building them + sed -ie 's/tests //' "${S}"/Makefile.am + fi + xorg-2_src_prepare + + # There is no configure flag for this. + sed -i -r \ + -e "/have_valgrind=/s:=(yes|no):=$(usex valgrind):" \ + configure || die +} + +src_configure() { + XORG_CONFIGURE_OPTIONS=( + # Udev is only used by tests now. + --disable-udev + --disable-cairo-tests + $(use_enable video_cards_exynos exynos-experimental-api) + $(use_enable video_cards_freedreno freedreno) + $(use_enable video_cards_intel intel) + $(use_enable video_cards_nouveau nouveau) + $(use_enable video_cards_omap omap-experimental-api) + $(use_enable video_cards_radeon radeon) + $(use_enable video_cards_tegra tegra-experimental-api) + $(use_enable video_cards_vmware vmwgfx) + $(use_enable libkms) + ) + xorg-2_src_configure +} diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml index c64af1cb4797..92b215648248 100644 --- a/x11-libs/libdrm/metadata.xml +++ b/x11-libs/libdrm/metadata.xml @@ -4,5 +4,6 @@ x11 Enable building of libkms, a library for applications to interface with KMS +Compile in valgrind memory hints -- 2.26.2