Re-add 2.4.20-r1 for fbsd

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 80 insertions, 22 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 0400c0a6e20c..6ad7cf6d615a 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.189 2012/06/01 09:19:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.190 2012/06/03 12:00:16 chithanh Exp $
+
+*libdrm-2.4.20-r1 (03 Jun 2012)
+
+  03 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/2.4.18-0001-datatypes.patch, +libdrm-2.4.20-r1.ebuild:
+  Re-add 2.4.20-r1 for fbsd
 
   01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/2.4.18-0001-datatypes.patch, -libdrm-2.4.20-r1.ebuild,
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 88b29fe03bf4..df921a8cc3ea 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 2.4.18-0001-datatypes.patch 490 RMD160 2a71e2125e78a705617f5262697d1156f492229e SHA1 2abe750990073d02a8d723c254695ea3324f12d5 SHA256 0a2ae45b9b4d8d2a9decaba3e32d38ba6d60a081dc15a60ca88e84d1157d7669
 AUX libdrm-2.4.23-solaris.patch 3191 RMD160 562eb2f40642112ba419838494173f64969e49f1 SHA1 6d07a6cda05942c593c9d60e2c56b982d565f356 SHA256 1ddfb794d0edf64727af0a423250769b0be3132d55d53374b8ef68e2419478e6
 AUX libdrm-2.4.28-solaris.patch 3202 RMD160 309af61f8356acd5ea4c0f3a80e2a80fe248cbf6 SHA1 edeb3b2a257f793770fe4655cb822c0b7b296c12 SHA256 04440ea802761e27c6f3a39a8bbfba71d707c3b3380885540be2e0f56ef58334
+DIST libdrm-2.4.20.tar.bz2 400812 RMD160 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a SHA1 f1448ac0f1c7a5f74a86d2fb50941fc12dc932db SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9
 DIST libdrm-2.4.25.tar.bz2 445388 RMD160 5c3174e53b71de148a64fb51f5235de202786bb2 SHA1 b950f29cd1c4bb9f1c98a926486a47256b0a4194 SHA256 51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f
 DIST libdrm-2.4.26.tar.bz2 448627 RMD160 c7892a9ef0038d2d0192fece9b43ff5b18be4a63 SHA1 e7215e804bbd30e42132d3df874122d2f6a9c929 SHA256 b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc
 DIST libdrm-2.4.27.tar.bz2 491451 RMD160 cc08ca54ba272f1ad34183d0b96d331c5ee024c4 SHA1 f5b40d30a7f2bfa369ab9b3bd9a0aa844a7f1e16 SHA256 ea6b04dd3298e36c7a43aadd5f80f48baeafe4caaabcf78b01dc919c5c757973
@@ -12,6 +11,7 @@ DIST libdrm-2.4.31.tar.bz2 475677 RMD160 c1855503bb1b8013d15b65b461eb5ea8cf80e53
 DIST libdrm-2.4.32.tar.bz2 557890 RMD160 18a2f5fa8d1fdbe99330288de9d3552d7ee27897 SHA1 4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842 SHA256 9ba8a1613de57af8f501a162747ed69aff30d63fc1316602770974bdd9ee984e
 DIST libdrm-2.4.33.tar.bz2 446817 RMD160 59ce56197f2f6f7069d2ddc23024e0ad680e20f4 SHA1 4da2c635491724e44326871e6a49ccfec0b6b5a6 SHA256 2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea
 DIST libdrm-2.4.34.tar.bz2 572571 RMD160 b0935df1355e33f04560947cd67bb08af3844e8a SHA1 861757baff4b37e564e13f5350c1b5d01c66a181 SHA256 a468570e7c85107b7c2f8eaceeebaa8f8a0da86482618f445bb74fa0b0d0f8d0
+EBUILD libdrm-2.4.20-r1.ebuild 1418 RMD160 b1d9ddbb9826a89aae7a667d484d19777a735a9c SHA1 2df98b068ac6852498f168024b5b61bd3e903bb9 SHA256 a33ee71b007fea79b7bf8fc4753ebc9f99fcd378df7979085a01c96eb693651d
 EBUILD libdrm-2.4.25.ebuild 1338 RMD160 901a8001f0554399345e89115d60f442ab3d5062 SHA1 63e711f4bb927ee26f736a0b065d8d48fc55e405 SHA256 d8803aabcf209b9dc914de82bad87687576a237cb010ffc0853571833e85b450
 EBUILD libdrm-2.4.26.ebuild 1392 RMD160 54a53d503da402e82d642744f9e9b724855f4042 SHA1 894dd31776d5b32d4f20e9691876435944574d49 SHA256 93b14933eebcb354c92cec29268671b7b20162a68575a8b77c129f3bdc011a0d
 EBUILD libdrm-2.4.27.ebuild 1389 RMD160 d235c9ed5dbd22206c4cc6a7a8291b8115a339ee SHA1 e683ef8d633143b353d18d8e6a1f6b8371aee681 SHA256 73d1fbce36aa3577b3209c28ed86cd1a899026527ca98330a8a952008c5a7e20
@@ -21,22 +21,5 @@ EBUILD libdrm-2.4.31.ebuild 1402 RMD160 548821a19375610edf398c3e49188d20afd86972
 EBUILD libdrm-2.4.32.ebuild 1372 RMD160 c152e310e2eabb3040ba312d7aea498984641374 SHA1 e7c198bca4795e0b8015d170426093044425e56c SHA256 ba02a5c69a078ecfef3068f48ac5b068e6c733d9f5fadbd4c271688c03a6c2c3
 EBUILD libdrm-2.4.33.ebuild 1567 RMD160 554333360905f99597fca1a12614b47d44febbc5 SHA1 65651ec2820a36d92b6052e3e5d7e54ef123270a SHA256 7e90d98d80cee08c3e9c59d347077759b8143cd854e0663d554221d969bd0207
 EBUILD libdrm-2.4.34.ebuild 1550 RMD160 07d8623cef19538222c8472f079bb2517a9946ff SHA1 51cf35890740f2ff0aa31f054456ae97220f1ef8 SHA256 9b5e4ae1561d442aac31857bac05f9cd61fb2117c0030e3cc9568b25f7a2ea93
-MISC ChangeLog 25629 RMD160 92b169355a9c0c112e35e972d5f4138852524f99 SHA1 c4cec8a00c4d5de09a8200f007f4b5052ffea40e SHA256 e536b0d4a64d9b24ce02c5481d5bec2db27991cccd5d1fe78662af875ab56b74
+MISC ChangeLog 25823 RMD160 3f797a087a573134e7a2df4991c6136cd471bd72 SHA1 7dd3bfcb56397975231163cbaa7944805f8b2913 SHA256 79d104dd5986bbe6e165533d2fcb97cd337ab4c4e036cd00319112e0c84ac167
 MISC metadata.xml 272 RMD160 2d98b4981a3843af21c5172218e94f4ba6b82ac4 SHA1 74b5bba73e5a48760796f5b566cdf22bd32180d8 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPyIlPAAoJEOSiRoyO7jvouIUQALHpAP0PeS4hDTeJt6iuvL0V
-47nZ+aWZ7ArBI9jJJZ9UzyvFpLDK6c1oxbt3bWapcdfDcUfEPHlkVBucIZFUWiQH
-70pPG6uOvEWX+tl8OADXRAuIuVCreNIljlSGtgFVwArJZBeNNjeC7wlVBWch6/IY
-qbqB7IkLjwKrzbpTYW4DWu6ayYlR3GphqQQh6iEkJf16VrxC/W1sQuIsDWOHT5c8
-dxeYJ/ONzixk+d3yMn33unBXg5gxFzIGEqkP5Y4YilB67XEgOnZ4m+NYkc8mkG2C
-SJqlLURWkgj4sU7nWvYkFYxMEsr5zCFkyRM6iGE5BlbE/JzkBMmX7FZCWpEvxS1y
-ealkbg/sOiEaCPKky9+fI6X54zLF5Kyej1bPwnEnBAuG0Y09KRowu7vbT6PaPw/K
-NLZ7pE72PktWFbW7Ccu9JO40qux+DEnUyf5kTVZpjEfhcKcRtoHDQyH0yVbVeu9V
-IBcAK5m+/T2QrQ38wIManEQXXm3VYgNu1561MbMOvBQziSMIym7RQincWN5O92Rg
-mi4PF60XqE2v6lA1SK7//4N4Fjd4FDOJ/ebgU0kcSYLuwklR3/2l3lpszsjdrO0b
-udM0NzD+yCquHrvKUMosTWsh2+GXRa2nyk34GX20+4koGw5v/yyNkZeK5Imdwe5/
-7AemdQWufZlmHSYd/k0g
-=p265
------END PGP SIGNATURE-----
diff --git a/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch b/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch
new file mode 100644
index 000000000000..6a1bfafcbb1b
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch
@@ -0,0 +1,21 @@
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index dfc390e..49b3b54 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
+@@ -308,11 +308,11 @@ struct drm_mode_crtc_lut {
+ #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT
+ 
+ struct drm_mode_crtc_page_flip {
+-	uint32_t crtc_id;
+-	uint32_t fb_id;
+-	uint32_t flags;
+-	uint32_t reserved;
+-	uint64_t user_data;
++	__u32 crtc_id;
++	__u32 fb_id;
++	__u32 flags;
++	__u32 reserved;
++	__u64 user_data;
+ };
+ 
+ #endif
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..41a39bd74de0
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 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.13 2012/06/03 12:00:16 chithanh Exp $
+
+EAPI=3
+inherit xorg-2
+
+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="~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/*."
+}