Re-add 2.4.20-r1 for fbsd

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 76 insertions, 1 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/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/*."
+}