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
commit9ba569c48afdbcb6744db506789bf5a213a02a30 (patch)
tree2f92fda0c165be979e125ebe446845c077c7a48e /x11-libs
parentVersion bump (diff)
downloadhistorical-9ba569c48afdbcb6744db506789bf5a213a02a30.tar.gz
historical-9ba569c48afdbcb6744db506789bf5a213a02a30.tar.bz2
historical-9ba569c48afdbcb6744db506789bf5a213a02a30.zip
re-add libdrm patch for bug #298352
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libdrm/ChangeLog8
-rw-r--r--x11-libs/libdrm/Manifest3
-rw-r--r--x11-libs/libdrm/libdrm-2.4.20-r1.ebuild47
3 files changed, 56 insertions, 2 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/Manifest b/x11-libs/libdrm/Manifest
index 320a945d92da..9fdd7e04be06 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -19,7 +19,8 @@ EBUILD libdrm-2.4.18.ebuild 1112 RMD160 685e5e3cbbf0f71dd4572f5eb0f40d8374c829b3
EBUILD libdrm-2.4.18_pre20100211-r1.ebuild 1402 RMD160 fb0203bf2aab95447a9aa4f4fb744f8275fd2ba8 SHA1 e37f308fea6a91bd6765e310894c6be693d58137 SHA256 73a34fceaec4f78a5e7307672f33f4510ceec915fa12a28ea2d229ae94653ea3
EBUILD libdrm-2.4.18_pre20100211.ebuild 1129 RMD160 a11bbd10c51eb382841dca4cc9f187d5c70df428 SHA1 9c67caecfcda79a595d8a17ec908293e6cd4b67d SHA256 57fb476ee18022161219c9503ad37eba8773512932137e1ff9a176ba9aad796d
EBUILD libdrm-2.4.19.ebuild 1157 RMD160 33616037c5d4dfbcb7ecef4347223cc62d6883dc SHA1 08669dc6973253ee74bcc7006fae0c8a3510dab8 SHA256 5ec6eee1696bccd73ab928b77590dbe3f85f407a2aed52c9e7dd8c3a97247da3
+EBUILD libdrm-2.4.20-r1.ebuild 1484 RMD160 0f9cba4c39639b0728256b851443ed7b02ed4a10 SHA1 5bacacd3eb7fe435e8f85db32d3236ba0a4e9b4a SHA256 1285b641fbadd537b38a78055b59c8ebde83d493210250da356ac69dcaa47686
EBUILD libdrm-2.4.20.ebuild 1319 RMD160 2de0568e10275957ea13256881281218b7463c15 SHA1 cda29538743241ce955ea88660856d81f74bf4e6 SHA256 c3057c3011c9c01e50748d97af745045965f306fdb28d7ee4e60b00488e6e5d1
EBUILD libdrm-2.4.21.ebuild 1327 RMD160 51a2f2afc9c5b3066a594a8a09107d28ec2cf83e SHA1 48a769c355af57019fcf3d2c3827e52fb12bedbf SHA256 3382ee2e74529f15e2fb7fbcd561f5193a63b2f68cdd2816bac84c03108cccaa
-MISC ChangeLog 16453 RMD160 16ae4251c9846abbda69e1171c3741c071d91944 SHA1 7d9752bb094389ef1355e3e2f5605c9a536aa9cf SHA256 a5966bcde47f4c542577ee07e413d8327c2200d3dd04a17408996da4ece01c2f
+MISC ChangeLog 16627 RMD160 59684a5f5a044e6364c0519a6cf481517d9783fa SHA1 7ed6f39af4f9210253c0d236afb134da7b37aa7f SHA256 e352fdddd38dd8612a93593a0b2c7e9dc399c616a75b4261d541ef1814f822c0
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
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/*."
+}