commit: edb5226ef1fa4c533e62e968316965f4c6cd78c5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 03:29:45 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 20:36:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb5226e
x11-libs/libdrm: Drop old versions
x11-libs/libdrm/Manifest | 6 --
x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch | 104 ---------------------
.../libdrm/files/libdrm-2.4.68-sysmacros.patch | 43 ---------
x11-libs/libdrm/libdrm-2.4.59.ebuild | 57 -----------
x11-libs/libdrm/libdrm-2.4.65.ebuild | 60 ------------
x11-libs/libdrm/libdrm-2.4.68.ebuild | 62 ------------
x11-libs/libdrm/libdrm-2.4.70.ebuild | 61 ------------
x11-libs/libdrm/libdrm-2.4.73.ebuild | 62 ------------
x11-libs/libdrm/libdrm-2.4.74.ebuild | 62 ------------
9 files changed, 517 deletions(-)
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index bfcc9fc88df..a42507cd717 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,7 +1 @@
-DIST libdrm-2.4.59.tar.bz2 592722 SHA256
68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b SHA512
b9f61cfd47cf4a02c10e7fe79b0e9c5701383c76425cf4985a9b91d909f905334ca1ace7334aa0a4ab400694ad84a1a3bc1c3f29842d808026702b35fa9f87c3
WHIRLPOOL
6b0e1be70164db86152503e4b72373736f0462ff97ffac2c79a6c1fce83d658e6030d5435be5a61c1f6ca50728db4c7e3a5d8f5e48073fc74169696ff1b7c5be
-DIST libdrm-2.4.65.tar.bz2 645877 SHA256
71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4 SHA512
fabbb3ba163aa1307288472c11c6ce8f1e412cbd67ba3135a614f0e05bf4f881bf6ccc581e9cf05a7e2e965817bb71c0b5335263b5c0b0cb85829a0f29a6029d
WHIRLPOOL
b00d7aed0437ee0f64f60ed59becf41d165c101725cab700345203b2108a2adc9ed95d17acc0dff5706df86c87c13d058991417f42db40dfc523279cc5eb8547
-DIST libdrm-2.4.68.tar.bz2 735554 SHA256
5b4bd9a5922929bc716411cb74061fbf31b06ba36feb89bc1358a91a8d0ca9df SHA512
646ce2eb6b4d81120d5767f0c4014bfd042ea7030e33aa9a1d016129222d22a0dd012e530d37e1d580f4cc9f4d38e35176ce4d7abeccc086b38ba685cff8e38e
WHIRLPOOL
75defa050c11874c7cda511b0aafc559a9a94adb8d6f5beb0434ddd387b6014580462362e1c2a025c5057ee5273497d1e43e840e5230635408fd9f04837f21c8
-DIST libdrm-2.4.70.tar.bz2 692277 SHA256
b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b SHA512
f23833885f675168ce0590e7ed3d41ef081e864262007f17c3d02613dd13b9540a06420ed2ec2c83316a83039ebabbe3fc9759d9b61fc402be8830e993a799a5
WHIRLPOOL
e69761297eda6c52ec8f434a0f41f39bb47f92a2ed05b6dee413a63d88dd0b07f936382f0d46b63a4f5acf5b4c5c091ccea634dcb4912195aa86b8244f222c63
-DIST libdrm-2.4.73.tar.bz2 777305 SHA256
96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d SHA512
81f8ac6831926850dbbac9efc1becfc3c2e4a5299376521c38b8466e9cebfd24396c475ef96633be69e89ea8791430c02fcc19d190feb205eca29acaeb06cb55
WHIRLPOOL
02e9658e74bd039b54d4c6b67017d90e147b53d5d374933f3bb1b9a26f54071e549a595d2ad27382c8c0237e64abdc65fee5adc75c89a965773d065562df7477
-DIST libdrm-2.4.74.tar.bz2 781730 SHA256
d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b SHA512
5b9784bf00bb8179ad59f2fbe5600b51ede3f79dd1ea2cb50485ffaabf74e83d766b2deb6833b99692a303e6780286ecce41b88a2d7c15f9e839bc7182a8879d
WHIRLPOOL
25a85b5cbfa02b6e4e75f517dd445b5182593a04485ad6ac715e88ae6f7f3952de49096f17c27be7c9bcd2eab064147952e49c1d0957dd95d4e672ba68cd5bc0
DIST libdrm-2.4.75.tar.bz2 774589 SHA256
2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f SHA512
7d30029dfc384024eb6a82a04122064366572f5888ac4594fd9e02bc0a22ed2d154bef1840bd24f0543b77460d6359d7e424d424e10f4256ee3c898041be2292
WHIRLPOOL
24134409e59fe48bae02890b8153c063a49b114bcad9911487aa25ee594fe622ba04a3b2e486a2944ebe4177e205a8a970dd8d584550022780a70cb0447decf9
diff --git a/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
b/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
deleted file mode 100644
index 9e411001981..00000000000
--- a/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- a/include/drm/drm.h
-+++ b/include/drm/drm.h
-@@ -54,7 +54,11 @@ typedef int32_t __s32;
- typedef uint32_t __u32;
- typedef int64_t __s64;
- typedef uint64_t __u64;
-+#if defined(__sun)
-+typedef unsigned long long drm_handle_t;
-+#else
- typedef unsigned long drm_handle_t;
-+#endif
-
- #endif
-
-@@ -210,12 +214,22 @@ struct drm_ctx_priv_map {
- * \sa drmAddMap().
- */
- struct drm_map {
-+#ifdef __sun
-+ unsigned long long offset;
-+ /**< Requested physical address (0 for SAREA)*/
-+ unsigned long long handle;
-+ /**< User-space: "Handle" to pass to mmap() */
-+ /**< Kernel-space: kernel-virtual address */
-+#else
- unsigned long offset; /**< Requested physical address (0 for SAREA)*/
-+#endif
- unsigned long size; /**< Requested physical size (bytes) */
- enum drm_map_type type; /**< Type of memory to map */
- enum drm_map_flags flags; /**< Flags */
-+#ifndef __sun
- void *handle; /**< User-space: "Handle" to pass to mmap() */
- /**< Kernel-space: kernel-virtual address */
-+#endif
- int mtrr; /**< MTRR slot used */
- /* Private data */
- };
-@@ -379,6 +393,9 @@ struct drm_buf_map {
- void *virtual; /**< Mmap'd area in user-virtual */
- #endif
- struct drm_buf_pub *list; /**< Buffer information */
-+#ifdef __sun
-+ int fd;
-+#endif
- };
-
- /**
---- a/radeon/radeon_bo_gem.c
-+++ b/radeon/radeon_bo_gem.c
-@@ -38,6 +38,13 @@
- #include <string.h>
- #include <sys/mman.h>
- #include <errno.h>
-+
-+/* On solaris unistd.h and stropts.h are needed for ioctl */
-+#ifdef __sun
-+#include <unistd.h>
-+#include <stropts.h>
-+#endif
-+
- #include "libdrm.h"
- #include "xf86drm.h"
- #include "xf86atomic.h"
- #include "drm.h"
---- a/xf86drm.c
-+++ b/xf86drm.c
-@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
- {
- drm_map_t map;
-
-+#ifdef __sun
-+ map.handle = handle;
-+#else
- map.handle = (void *)(uintptr_t)handle;
-+#endif
-
- if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
- return -errno;
-@@ -1210,6 +1214,9 @@ drmBufMapPtr drmMapBufs(int fd)
- bufs.count = 0;
- bufs.list = NULL;
- bufs.virtual = NULL;
-+#ifdef __sun
-+ bufs.fd = fd;
-+#endif
- if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
- return NULL;
-
---- a/xf86drm.h
-+++ b/xf86drm.h
-@@ -64,6 +64,13 @@
-
- #endif
-
-+#if defined(__sun) && !defined(_IOC)
-+#define _IOC(dir, group, nr, size) \
-+ (dir == DRM_IOC_READWRITE ? _IOWRN(group, nr, size) : \
-+ (dir == DRM_IOC_WRITE ? _IOWN(group, nr, size) : \
-+ /* dir == DRM_IOC_READ */ _IORN(group, nr, size) ))
-+#endif
-+
- /* Defaults, if nothing set in xf86config */
- #define DRM_DEV_UID 0
- #define DRM_DEV_GID 0
diff --git a/x11-libs/libdrm/files/libdrm-2.4.68-sysmacros.patch
b/x11-libs/libdrm/files/libdrm-2.4.68-sysmacros.patch
deleted file mode 100644
index 9f410d663d0..00000000000
--- a/x11-libs/libdrm/files/libdrm-2.4.68-sysmacros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugs.gentoo.org/580088
-https://bugs.freedesktop.org/show_bug.cgi?id=94231
-
-From c57842fa1f58104f5c5df7e46bb2d0a60de96ee3 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vap...@gentoo.org>
-Date: Tue, 21 Jun 2016 12:18:15 -0400
-Subject: [PATCH] pull in sys/sysmacros.h when available
-
-This header provides major/minor/makedev funcs under most Linux C
-libs. Pull it in to fix building with newer versions that drop the
-implicit include via sys/types.h.
-
-Signed-off-by: Mike Frysinger <vap...@gentoo.org>
----
- configure.ac | 2 +-
- libkms/linux.c | 3 +++
- xf86drm.c | 3 +++
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/libkms/linux.c
-+++ b/libkms/linux.c
-@@ -44,6 +44,9 @@
- #ifdef HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h>
- #endif
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
-
- #include "libdrm_macros.h"
- #include "internal.h"
---- a/xf86drm.c
-+++ b/xf86drm.c
-@@ -57,6 +57,9 @@
- #ifdef HAVE_SYS_MKDEV_H
- # include <sys/mkdev.h> /* defines major(), minor(), and makedev() on Solaris
*/
- #endif
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
- #include <math.h>
-
- /* Not all systems have MAP_FAILED defined */
diff --git a/x11-libs/libdrm/libdrm-2.4.59.ebuild
b/x11-libs/libdrm/libdrm-2.4.59.ebuild
deleted file mode 100644
index 58702b4758d..00000000000
--- a/x11-libs/libdrm/libdrm-2.4.59.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/";
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-else
- SRC_URI="https://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 ~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"
-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=(
- "${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
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- --enable-udev
- $(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/libdrm-2.4.65.ebuild
b/x11-libs/libdrm/libdrm-2.4.65.ebuild
deleted file mode 100644
index 6245a56890d..00000000000
--- a/x11-libs/libdrm/libdrm-2.4.65.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/";
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-else
- SRC_URI="https://dri.freedesktop.org/${PN}/${P}.tar.bz2";
-fi
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="amdgpu 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 )"
-
-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
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- # Udev is only used by tests now.
- --disable-udev
- --disable-cairo-tests
- $(use_enable video_cards_amdgpu amdgpu)
- $(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)
- # 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/libdrm-2.4.68.ebuild
b/x11-libs/libdrm/libdrm-2.4.68.ebuild
deleted file mode 100644
index 319ed092e90..00000000000
--- a/x11-libs/libdrm/libdrm-2.4.68.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4
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 )"
-
-src_prepare() {
- if [[ ${PV} = 9999* ]]; then
- # tests are restricted, no point in building them
- sed -ie 's/tests //' "${S}"/Makefile.am
- fi
- epatch "${FILESDIR}"/${PN}-2.4.68-sysmacros.patch #580088
- xorg-2_src_prepare
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- # Udev is only used by tests now.
- --disable-udev
- --disable-cairo-tests
- $(use_enable video_cards_amdgpu amdgpu)
- $(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_vc4 vc4)
- $(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/libdrm-2.4.70.ebuild
b/x11-libs/libdrm/libdrm-2.4.70.ebuild
deleted file mode 100644
index bebf1f9c59c..00000000000
--- a/x11-libs/libdrm/libdrm-2.4.70.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/";
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-else
- SRC_URI="https://dri.freedesktop.org/${PN}/${P}.tar.bz2";
-fi
-
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4
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 )"
-
-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
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- # Udev is only used by tests now.
- --disable-udev
- --disable-cairo-tests
- $(use_enable video_cards_amdgpu amdgpu)
- $(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_vc4 vc4)
- $(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/libdrm-2.4.73.ebuild
b/x11-libs/libdrm/libdrm-2.4.73.ebuild
deleted file mode 100644
index 595bd79fadc..00000000000
--- a/x11-libs/libdrm/libdrm-2.4.73.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/";
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-else
- SRC_URI="https://dri.freedesktop.org/${PN}/${P}.tar.bz2";
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4
vivante 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 )"
-
-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
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- # Udev is only used by tests now.
- --disable-udev
- --disable-cairo-tests
- $(use_enable video_cards_amdgpu amdgpu)
- $(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_vc4 vc4)
- $(use_enable video_cards_vivante etnaviv-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/libdrm-2.4.74.ebuild
b/x11-libs/libdrm/libdrm-2.4.74.ebuild
deleted file mode 100644
index 595bd79fadc..00000000000
--- a/x11-libs/libdrm/libdrm-2.4.74.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/";
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-else
- SRC_URI="https://dri.freedesktop.org/${PN}/${P}.tar.bz2";
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4
vivante 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 )"
-
-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
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- # Udev is only used by tests now.
- --disable-udev
- --disable-cairo-tests
- $(use_enable video_cards_amdgpu amdgpu)
- $(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_vc4 vc4)
- $(use_enable video_cards_vivante etnaviv-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
-}
