From 895455146088a4723566d937d6c02fe2918c1a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= Date: Thu, 8 Dec 2011 19:15:06 -0800 Subject: [PATCH] Import libdrm 2.4.27. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required for the upcoming mesa upgrade. Change-Id: Ic4ee2ec916c56770d675440b48dc636190b6b178 Reviewed-on: https://gerrit.chromium.org/gerrit/12667 Tested-by: Stéphane Marchesin Reviewed-by: Tested-by: Reviewed-by: Stuart Abercrombie Tested-by: Stuart Abercrombie --- ...drm-2.4.24.ebuild => libdrm-2.4.27.ebuild} | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/portage-stable/x11-libs/libdrm/{libdrm-2.4.24.ebuild => libdrm-2.4.27.ebuild} (58%) diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.24.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.27.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.24.ebuild rename to sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.27.ebuild index 80329615a1..54d043dde7 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.24.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.27.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.24.ebuild,v 1.3 2011/03/28 22:08:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.27.ebuild,v 1.2 2011/10/30 05:18:43 mattst88 Exp $ EAPI=4 inherit xorg-2 @@ -15,29 +15,35 @@ 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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" VIDEO_CARDS="intel nouveau radeon vmware" for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=" video_cards_${card}" done -IUSE="${IUSE_VIDEO_CARDS} +libkms" +IUSE="${IUSE_VIDEO_CARDS} libkms" RESTRICT="test" # see bug #236845 -RDEPEND="dev-libs/libpthread-stubs" -DEPEND="${RDEPEND}" +RDEPEND="dev-libs/libpthread-stubs + video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )" +DEPEND="${RDEPEND} + >=x11-libs/libpciaccess-0.10" PATCHES=( "${FILESDIR}"/${PN}-2.4.23-solaris.patch ) pkg_setup() { - CONFIGURE_OPTIONS="--enable-udev + XORG_CONFIGURE_OPTIONS=( + --enable-udev $(use_enable video_cards_intel intel) $(use_enable video_cards_nouveau nouveau-experimental-api) $(use_enable video_cards_radeon radeon) $(use_enable video_cards_vmware vmwgfx-experimental-api) - $(use_enable libkms)" + $(use_enable libkms) + ) + + use elibc_FreeBSD && XORG_EAUTORECONF=yes xorg-2_pkg_setup }