summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-07-16 15:09:14 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-07-16 15:09:14 +0000
commit91c6d87fcdb70c12f23db5c4172491162207b2fa (patch)
tree9088a13151980b5efbbf3ef91b29ba916d69f3c9 /x11-libs/libdrm
parentVersion bump (diff)
downloadgentoo-2-91c6d87fcdb70c12f23db5c4172491162207b2fa.tar.gz
gentoo-2-91c6d87fcdb70c12f23db5c4172491162207b2fa.tar.bz2
gentoo-2-91c6d87fcdb70c12f23db5c4172491162207b2fa.zip
re-add libdrm patch for bug #298352
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libdrm')
-rw-r--r--x11-libs/libdrm/ChangeLog8
-rw-r--r--x11-libs/libdrm/libdrm-2.4.20-r1.ebuild47
2 files changed, 54 insertions, 1 deletions
diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 52c59c9fea3c..b4f1d631a1e6 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/libdrm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.120 2010/07/14 17:08:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.121 2010/07/16 15:09:14 chithanh Exp $
+
+*libdrm-2.4.20-r1 (16 Jul 2010)
+
+ 16 Jul 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +libdrm-2.4.20-r1.ebuild:
+ re-add libdrm patch for bug #298352
14 Jul 2010; Jeroen Roovers <jer@gentoo.org> libdrm-2.4.20.ebuild:
Stable for HPPA (bug #327777).
diff --git a/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild b/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild
new file mode 100644
index 000000000000..003a8a6f57c0
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild,v 1.1 2010/07/16 15:09:14 chithanh Exp $
+
+inherit x-modular
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+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"
+IUSE="kernel_linux"
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ # Fixes buidling of x11-drivers/xf86-video-openchrome, Gentoo bug 298352,
+ # upstream bug 26994
+ "${FILESDIR}"/2.4.18-0001-datatypes.patch
+ )
+
+pkg_setup() {
+ # libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is
+ # installed, bugs 297630, bug 316421 and bug 316541, and is presently only
+ # useful on amd64 and x86.
+ CONFIGURE_OPTIONS="--enable-udev
+ --enable-nouveau-experimental-api
+ --enable-vmwgfx-experimental-api
+ $(use_enable kernel_linux libkms)
+ $(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")"
+}
+
+pkg_postinst() {
+ x-modular_pkg_postinst
+
+ ewarn "libdrm's ABI may have changed without change in library name"
+ ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
+ ewarn "your video drivers in x11-drivers/*."
+}