public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/
Date: Thu,  2 Jul 2015 00:39:46 +0000 (UTC)	[thread overview]
Message-ID: <1435797627.93eef355c173fb6a64c8b3659b7ecaa5ba4f0cad.mattst88@gentoo> (raw)

commit:     93eef355c173fb6a64c8b3659b7ecaa5ba4f0cad
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Jul  2 00:40:27 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 00:40:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=93eef355

x11-libs/libdrm: Sync from main tree.

 x11-libs/libdrm/libdrm-9999.ebuild | 17 ++++++++++-------
 x11-libs/libdrm/metadata.xml       |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 8589a76..e4f7933 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -15,22 +15,20 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 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"
+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}"
-
-PATCHES=(
-)
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
 
 src_prepare() {
 	if [[ ${PV} = 9999* ]]; then
@@ -42,7 +40,9 @@ src_prepare() {
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
-		--enable-udev
+		# 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)
@@ -52,6 +52,9 @@ src_configure() {
 		$(use_enable video_cards_tegra tegra-experimental-api)
 		$(use_enable video_cards_vmware vmwgfx)
 		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
 	)
+
 	xorg-2_src_configure
 }

diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index c64af1c..92b2156 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -4,5 +4,6 @@
 <herd>x11</herd>
 <use>
 <flag name='libkms'>Enable building of libkms, a library for applications to interface with KMS</flag>
+<flag name='valgrind'>Compile in valgrind memory hints</flag>
 </use>
 </pkgmetadata>


             reply	other threads:[~2015-07-02  0:39 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-02  0:39 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-08-23  3:24 [gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/ Matt Turner
2015-01-29 16:27 Chi-Thanh Christopher Nguyen
2013-05-16 22:47 David Heidelberger
2013-04-20 20:36 Chi-Thanh Christopher Nguyen
2013-03-06 23:28 Chi-Thanh Christopher Nguyen
2012-08-28 21:25 Matt Turner
2012-05-18  0:27 Chi-Thanh Christopher Nguyen
2012-04-14 18:00 Chi-Thanh Christopher Nguyen
2012-03-28 23:39 Chi-Thanh Christopher Nguyen
2012-03-02 19:44 Matt Turner
2011-12-13 17:41 Chi-Thanh Christopher Nguyen
2011-12-12  1:30 Chi-Thanh Christopher Nguyen
2011-11-28  8:06 Michał Górny
2011-10-30  5:19 Matt Turner
2011-10-14 19:25 Matt Turner
2011-07-30  2:21 Matt Turner
2011-06-10 19:48 Matt Turner
2011-04-15 19:04 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435797627.93eef355c173fb6a64c8b3659b7ecaa5ba4f0cad.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox