| 1 |
commit: 93eef355c173fb6a64c8b3659b7ecaa5ba4f0cad |
| 2 |
Author: Matt Turner <mattst88 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jul 2 00:40:27 2015 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 2 00:40:27 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=93eef355 |
| 7 |
|
| 8 |
x11-libs/libdrm: Sync from main tree. |
| 9 |
|
| 10 |
x11-libs/libdrm/libdrm-9999.ebuild | 17 ++++++++++------- |
| 11 |
x11-libs/libdrm/metadata.xml | 1 + |
| 12 |
2 files changed, 11 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild |
| 15 |
index 8589a76..e4f7933 100644 |
| 16 |
--- a/x11-libs/libdrm/libdrm-9999.ebuild |
| 17 |
+++ b/x11-libs/libdrm/libdrm-9999.ebuild |
| 18 |
@@ -15,22 +15,20 @@ else |
| 19 |
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2" |
| 20 |
fi |
| 21 |
|
| 22 |
-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" |
| 23 |
+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" |
| 24 |
VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware" |
| 25 |
for card in ${VIDEO_CARDS}; do |
| 26 |
IUSE_VIDEO_CARDS+=" video_cards_${card}" |
| 27 |
done |
| 28 |
|
| 29 |
-IUSE="${IUSE_VIDEO_CARDS} libkms" |
| 30 |
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" |
| 31 |
RESTRICT="test" # see bug #236845 |
| 32 |
|
| 33 |
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}] |
| 34 |
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] ) |
| 35 |
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" |
| 36 |
-DEPEND="${RDEPEND}" |
| 37 |
- |
| 38 |
-PATCHES=( |
| 39 |
-) |
| 40 |
+DEPEND="${RDEPEND} |
| 41 |
+ valgrind? ( dev-util/valgrind )" |
| 42 |
|
| 43 |
src_prepare() { |
| 44 |
if [[ ${PV} = 9999* ]]; then |
| 45 |
@@ -42,7 +40,9 @@ src_prepare() { |
| 46 |
|
| 47 |
src_configure() { |
| 48 |
XORG_CONFIGURE_OPTIONS=( |
| 49 |
- --enable-udev |
| 50 |
+ # Udev is only used by tests now. |
| 51 |
+ --disable-udev |
| 52 |
+ --disable-cairo-tests |
| 53 |
$(use_enable video_cards_exynos exynos-experimental-api) |
| 54 |
$(use_enable video_cards_freedreno freedreno) |
| 55 |
$(use_enable video_cards_intel intel) |
| 56 |
@@ -52,6 +52,9 @@ src_configure() { |
| 57 |
$(use_enable video_cards_tegra tegra-experimental-api) |
| 58 |
$(use_enable video_cards_vmware vmwgfx) |
| 59 |
$(use_enable libkms) |
| 60 |
+ # valgrind installs its .pc file to the pkgconfig for the primary arch |
| 61 |
+ --enable-valgrind=$(usex valgrind auto no) |
| 62 |
) |
| 63 |
+ |
| 64 |
xorg-2_src_configure |
| 65 |
} |
| 66 |
|
| 67 |
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml |
| 68 |
index c64af1c..92b2156 100644 |
| 69 |
--- a/x11-libs/libdrm/metadata.xml |
| 70 |
+++ b/x11-libs/libdrm/metadata.xml |
| 71 |
@@ -4,5 +4,6 @@ |
| 72 |
<herd>x11</herd> |
| 73 |
<use> |
| 74 |
<flag name='libkms'>Enable building of libkms, a library for applications to interface with KMS</flag> |
| 75 |
+<flag name='valgrind'>Compile in valgrind memory hints</flag> |
| 76 |
</use> |
| 77 |
</pkgmetadata> |
Archives