synced x11-libs/libdrm with main tree

7 files changed, 13 insertions, 298 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
deleted file mode 100644
index 31c530462..000000000
--- a/x11-libs/libdrm/ChangeLog
+++ /dev/null
@@ -1,240 +0,0 @@
-# ChangeLog for x11-libs/libdrm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.61 2009/01/06 17:18:33 remi Exp $
-
-  06 Jan 2009; Rémi Cardona <remi@gentoo.org> libdrm-2.4.3.ebuild:
-  remove cruft and change elogs into ewarns
-
-*libdrm-2.4.3 (06 Jan 2009)
-
-  06 Jan 2009; Rémi Cardona <remi@gentoo.org> +libdrm-2.4.3.ebuild:
-  bump to 2.4.3 (GEM fixes and modesetting premises)
-
-  12 Nov 2008; Rémi Cardona <remi@gentoo.org>
-  -files/2.4.0-intel-avoid-deadlock-in-intel_bufmgr_fake.patch,
-  -files/2.4.0-intel-ioctl-is-not-defined-to-return-errno.patch,
-  -libdrm-2.4.0.ebuild:
-  removing 2.4.0, it's completely broken according to upstream
-
-*libdrm-2.4.1 (12 Nov 2008)
-
-  12 Nov 2008; Rémi Cardona <remi@gentoo.org>
-  +files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch,
-  +libdrm-2.4.1.ebuild:
-  bump to 2.4.1 with a patch from git master
-
-*libdrm-2.4.0 (19 Oct 2008)
-
-  19 Oct 2008; Rémi Cardona <remi@gentoo.org>
-  +files/2.4.0-intel-avoid-deadlock-in-intel_bufmgr_fake.patch,
-  +files/2.4.0-intel-ioctl-is-not-defined-to-return-errno.patch,
-  +libdrm-2.4.0.ebuild:
-  bump to 2.4.0 (under p.mask, some drivers are broken, see bug #242698)
-
-*libdrm-2.3.1 (01 Jul 2008)
-
-  01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>; +libdrm-2.3.1.ebuild:
-  Bump. xorg-server 1.5/mesa 7.1 will actually build against this one.
-  TTM/GEM not included.
-
-  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; libdrm-2.3.0.ebuild:
-  Drop to ~mips to shut up repoman.
-
-*libdrm-2.3.1_pre20080528 (10 Jun 2008)
-
-  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
-  +libdrm-2.3.1_pre20080528.ebuild, -libdrm-9999.ebuild:
-  Add ebuild pulling a specific git revision instead of live git head.
-
-*libdrm-9999 (10 Jun 2008)
-
-  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; +libdrm-9999.ebuild:
-  Add live git version, for mesa 7.1.
-
-  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
-  Clean up.
-
-  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; -libdrm-2.0.2.ebuild:
-  Clean up.
-
-  07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> libdrm-2.3.0.ebuild:
-  Stable on sparc wrt #175465
-
-  02 Jul 2007; Raúl Porcel <armin76@gentoo.org> libdrm-2.3.0.ebuild:
-  alpha stable wrt #175465
-
-  24 Jun 2007; Joshua Kinard <kumba@gentoo.org> libdrm-2.3.0.ebuild:
-  Stable on mips, per #175465.
-
-  20 May 2007; Jeroen Roovers <jer@gentoo.org> libdrm-2.3.0.ebuild:
-  Stable for HPPA (bug #175465).
-
-  12 May 2007; nixnut <nixnut@gentoo.org> libdrm-2.3.0.ebuild:
-  Stable on ppc wrt bug 175465
-
-  04 May 2007; Daniel Gryniewicz <dang@gentoo.org> libdrm-2.3.0.ebuild:
-  Marked stable on amd64 for bug #175465
-
-  29 Apr 2007; Andrej Kacian <ticho@gentoo.org> libdrm-2.3.0.ebuild:
-  Stable on x86, bug #175465.
-
-  25 Apr 2007; Raúl Porcel <armin76@gentoo.org> libdrm-2.3.0.ebuild:
-  Stable on ia64 wrt bug #175465.
-
-  25 Apr 2007; Markus Rothe <corsair@gentoo.org> libdrm-2.3.0.ebuild:
-  Stable on ppc64; bug #175465
-
-  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
-  -libdrm-2.0.1.ebuild:
-  Clean out old version.
-
-  06 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> libdrm-2.0.2.ebuild:
-  Stable on Alpha.
-
-*libdrm-2.3.0 (10 Nov 2006)
-
-  10 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  -libdrm-2.2.0.ebuild, +libdrm-2.3.0.ebuild:
-  Version bump for 7.2RC2 with support for upcoming X servers.  Adds drmOpenOnce
-  and drmCloseOnce and support for the server to use the system libdrm, instead
-  of the (now) removed internal one.  These changes are only important for GIT
-  head or >=1.2.99.0 servers.
-
-*libdrm-2.2.0 (02 Nov 2006)
-
-  02 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +libdrm-2.2.0.ebuild:
-  Version bump with a large amount of changes.  Notables: Mach64 work and
-  support for the new memory manager.
-
-  14 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> libdrm-2.0.2.ebuild:
-  Stable on ia64.
-
-  13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  libdrm-2.0.2.ebuild:
-  AMD64/x86 stable for bug #144549 (X7.1).
-
-  12 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> libdrm-2.0.2.ebuild:
-  Stable on hppa
-
-  04 Sep 2006; Joshua Kinard <kumba@gentoo.org> libdrm-2.0.2.ebuild:
-  Marked stable on mips.
-
-  24 Aug 2006; Markus Rothe <corsair@gentoo.org> libdrm-2.0.2.ebuild:
-  Stable on ppc64
-
-  23 Aug 2006; Ferris McCormick <fmccor@gentoo.org> libdrm-2.0.2.ebuild:
-  Stable on sparc (part of general bookkeeping to sync sparc to a known state
-  now that xorg-x11-7.1 is stable on sparc).
-
-  20 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; libdrm-2.0.2.ebuild:
-  Stable on x86/ppc.
-
-  19 Jul 2006; Guy Martin <gmsoft@gentoo.org> libdrm-2.0.1.ebuild:
-  Stable on hppa.
-
-*libdrm-2.0.2 (14 Jul 2006)
-
-  14 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; +libdrm-2.0.2.ebuild:
-  Bump, change ewarn to elog.
-
-  10 Jul 2006; Aron Griffis <agriffis@gentoo.org> libdrm-2.0.1.ebuild:
-  Mark 2.0.1 stable on ia64
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; libdrm-2.0.1.ebuild:
-  ppc/sparc/mips/alpha/arm/sh stable
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; +libdrm-2.0.1.ebuild:
-  Restore mistakenly removed ebuild.
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; -libdrm-2.0.ebuild,
-  -libdrm-2.0.1.ebuild:
-  Pull old versions.
-
-  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> libdrm-2.0.1.ebuild:
-  Stable on amd64.
-
-  30 Jun 2006; Markus Rothe <corsair@gentoo.org> libdrm-2.0.1.ebuild:
-  Stable on ppc64
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; libdrm-2.0.1.ebuild:
-  x86 stable.
-
-*libdrm-2.0.1 (01 Apr 2006)
-
-  01 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +libdrm-2.0.1.ebuild:
-  Bump from upstream.  Includes some new defines required by Mesa 6.5/HEAD.
-
-  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> libdrm-2.0.ebuild:
-  Add ~x86-fbsd keyword.
-
-  10 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; libdrm-2.0.ebuild:
-  (#125506) Use --library for revdep-rebuild, not --soname.
-
-  09 Mar 2006; Aron Griffis <agriffis@gentoo.org> libdrm-2.0.ebuild:
-  Mark 2.0 ~ia64
-
-  14 Feb 2006; Markus Rothe <corsair@gentoo.org> libdrm-2.0.ebuild:
-  Added ~ppc64
-
-  31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> libdrm-2.0.ebuild:
-  Unstable on hppa.
-
-  26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> libdrm-2.0.ebuild:
-  Marked ~alpha
-
-  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> ChangeLog:
-  Bump for 7.0RC4.
-
-  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -libdrm-1.0.1.ebuild,
-  -libdrm-1.0.3.ebuild, -libdrm-1.0.4.ebuild, -libdrm-1.0.5.ebuild:
-  Pull old versions.
-
-  05 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> libdrm-2.0.ebuild:
-  Doh, now libdrm stays...
-
-  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> libdrm-2.0.ebuild:
-  Keep the old libdrm.so.1 around so things don't break horribly on upgrade.
-
-*libdrm-2.0 (04 Dec 2005)
-
-  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +libdrm-2.0.ebuild:
-  Version bump.
-
-*libdrm-1.0.5 (31 Oct 2005)
-
-  31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +libdrm-1.0.5.ebuild:
-  Bump with via fixes.
-
-*libdrm-1.0.4 (20 Oct 2005)
-
-  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +libdrm-1.0.4.ebuild:
-  Bump to remove libX11 dependency.
-
-  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
-  Add metadata.
-
-  28 Aug 2005; MATSUU Takuto <matsuu@gentoo.org> libdrm-1.0.3.ebuild:
-  Marked ~sh
-
-  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> libdrm-1.0.1.ebuild,
-  libdrm-1.0.3.ebuild:
-  Marked ~ppc
-
-*libdrm-1.0.3 (20 Aug 2005)
-
-  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +libdrm-1.0.3.ebuild:
-  Bump.
-
-  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> libdrm-1.0.1.ebuild:
-  Marked ~amd64
-
-  09 Aug 2005; Ferris McCormick <fmccor@gentoo.org> libdrm-1.0.1.ebuild:
-  Add ~sparc keyword (X modular testing).
-
-*libdrm-1.0.1 (08 Aug 2005)
-
-  08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +libdrm-1.0.1.ebuild:
-  Initial commit for modular X.
-
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index a66728883..3a948ba48 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -6,12 +6,8 @@ AUX 2.4.9-0003-libdrm-mode-align-subpixel-results.patch 901 RMD160 1a66e30396a1c
 AUX 2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch 1048 RMD160 358d8dfdc8b6ea36bffe476151a24467d96fc5eb SHA1 55bd0fb8342e5be26ee4498242670f13535ed2a7 SHA256 12cf1766699dd02c0df7558972ac67026742b0d016c749c3f5b0c5eba85e5dce
 DIST libdrm-2.4.11.tar.gz 523915 RMD160 2d23505423da4abed249c44b550097d05bc11da8 SHA1 3b24b3b2d7dd35ab16abc06ce80e9c86c59979ed SHA256 42876c0dd6caef0be0fc884a5a26d99854ebbbdae3afec5359a93fbeed7afe51
 DIST libdrm-2.4.5.tar.gz 563395 RMD160 11a512368c32fb6ed3fa17d7d728e244d61547db SHA1 9e919c4cda6454118ebd288edc3bc65fc6779a51 SHA256 4ada5afa0ac774b9affce9762e703d0a98bfcb3537a5230ef12955b0068259d1
-DIST libdrm-2.4.6.tar.bz2 417305 RMD160 e49f1d8d068f7e28b612e300b2b3e2b08565b870 SHA1 69dc8ddb2f41f6dc87c3c3d4ff7d09f1a89d3dd6 SHA256 6813f4ff5eb62d638bb452a6fc6ddbc26b7362f2d32b8be950c73a318239b006
 DIST libdrm-2.4.9.tar.gz 523793 RMD160 2d988da67c343dc480a46ea4370dbe0067c47212 SHA1 ca40ef9fe1cfbfd2538631d449a68bf5247bc285 SHA256 c74b2e188398978c6a358d7c0fa2c8db7ac13c548b32c297f14c2cc2550cb2dd
-EBUILD libdrm-2.4.11.ebuild 955 RMD160 8037a00652a7284333f809c349831d168b19483b SHA1 ede66f8b3f56cd1fc6bbf856b9d8948df0d1db72 SHA256 a28a4644bfc049fb348166c7b5c499bb7592862ccad92c5a0c46957d4feb3fed
-EBUILD libdrm-2.4.5.ebuild 989 RMD160 75f6dbb8e2a8a6adbf475166d1e53e3d2e070cd8 SHA1 411bf1d72436d4a15a8e25fb2a1ff03e11959e41 SHA256 5bf1a30470385da1e91e029c1dc02b43ccb803788708fa354f5fd432f010a6c2
-EBUILD libdrm-2.4.6.ebuild 1094 RMD160 1163261966bc22092ceecb2bd40104d1461a8622 SHA1 05d1c967a210d9c36caf75533f703b3931ad7188 SHA256 06909746d2197d5c2e994823043f351f5ba807b1c78bfe37c0cc6039edeb79ce
-EBUILD libdrm-2.4.9.ebuild 1229 RMD160 86b1f41253d70a95d9beac88f5710a0bbcd0a1be SHA1 3f1b5ee93049e6db28797dc8981ba8a4da895dc9 SHA256 025ce83e64fd378b1da26dfd4804a715c158feba66e2992aa07a8aa14951674b
+EBUILD libdrm-2.4.11.ebuild 1104 RMD160 67c7e74030a23d5239cd589ce61b29066b2c4b27 SHA1 f2266178ac6946aeadf2d8bf311969f3ba181c71 SHA256 71fb62880eb344bf00224a534ebb1dbfa41dba330a11e0919750115984ea9508
+EBUILD libdrm-2.4.5.ebuild 991 RMD160 2f1a0c7d0327af4ac30016b47dd8f8018358815c SHA1 ec9f192790cfccef05e3ea3aaf110671584fd221 SHA256 faed621423e2760bb1fad640ed25c602cf4d00ee8ddc19bb2739460c4a22e340
+EBUILD libdrm-2.4.9.ebuild 1303 RMD160 c33ba3ab47c97a249467c1095af7af2d9b3d3956 SHA1 cffcdb1059a5f9f91a7c48ce3de8c1604290b484 SHA256 dc087fa78dbf0be9a6689abfc79ccb4f01da179635288af16274da5d00ae97f4
 EBUILD libdrm-9999.ebuild 913 RMD160 4dfd384549c782366c942be239777b1d1475fb5e SHA1 b8d161f1b946b72db0b2200e06a3d74500795e86 SHA256 56b52bbe5f64743e3a241c35c7ec79962e6fb6dc6ff8a5240c01a771164e6ace
-MISC ChangeLog 8010 RMD160 0e973de7e2d9c762b12ca45a0963bd37f1ca3afd SHA1 235e4a37926ea50faab0dad0eefade45092e272a SHA256 edfd53fd32148e927444ec993c629dcc2e85aadbd152154651cdcab9be337097
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libdrm/libdrm-2.4.11.ebuild b/x11-libs/libdrm/libdrm-2.4.11.ebuild
index c83ef736c..c671e9848 100644
--- a/x11-libs/libdrm/libdrm-2.4.11.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.11.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.11.ebuild,v 1.1 2009/05/16 07:55:10 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.11.ebuild,v 1.2 2009/05/19 14:08:24 remi Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+# This is enabled due to Debian's patched and broken libtool script
+# Tarballs generated on "good" distros shouldn't need this hack
+# see bug #270071
+SNAPSHOT="yes"
 
 EAPI="2"
 
diff --git a/x11-libs/libdrm/libdrm-2.4.5.ebuild b/x11-libs/libdrm/libdrm-2.4.5.ebuild
index ff2057689..5bba10028 100644
--- a/x11-libs/libdrm/libdrm-2.4.5.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.5.ebuild,v 1.8 2009/04/16 02:03:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.5.ebuild,v 1.9 2009/05/15 14:34:12 armin76 Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="http://dri.freedesktop.org/"
 SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 RESTRICT="test" # see bug #236845
 
diff --git a/x11-libs/libdrm/libdrm-2.4.6.ebuild b/x11-libs/libdrm/libdrm-2.4.6.ebuild
deleted file mode 100644
index 95cbf0794..000000000
--- a/x11-libs/libdrm/libdrm-2.4.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.6.ebuild,v 1.2 2009/04/09 17:14:46 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-EAPI="2"
-
-inherit x-modular multilib-native
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs
-	sys-fs/udev[lib32?]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-makefile.patch
-)
-# FIXME, we should try to see how we can fit the --enable-udev configure flag
-
-src_unpack() {
-	x-modular_src_unpack
-	eautoreconf
-	elibtoolize
-}
-
-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/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.9.ebuild b/x11-libs/libdrm/libdrm-2.4.9.ebuild
index b4488b9f2..d860c46d8 100644
--- a/x11-libs/libdrm/libdrm-2.4.9.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.6.ebuild,v 1.2 2009/04/09 17:14:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.9.ebuild,v 1.1 2009/04/30 11:53:46 remi Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -28,6 +28,8 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
 )
 
+# FIXME, we should try to see how we can fit the --enable-udev configure flag
+
 pkg_postinst() {
 	x-modular_pkg_postinst
 
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
deleted file mode 100644
index 01c4c004e..000000000
--- a/x11-libs/libdrm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>