summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-10-22 06:58:45 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-10-22 06:58:45 +0000
commit69692e66332a5b8e96f591917164ec48a21864f5 (patch)
tree8ae8f0f6b3ff995e91d26a11b7645ed83caf176b /x11-libs/libdrm
parentDrop local sound USE flag description, not used anymore. (diff)
downloadhistorical-69692e66332a5b8e96f591917164ec48a21864f5.tar.gz
historical-69692e66332a5b8e96f591917164ec48a21864f5.tar.bz2
historical-69692e66332a5b8e96f591917164ec48a21864f5.zip
Re-add patch which is required for libdrm-2.4.20-r1, bug #342117
Package-Manager: portage-2.2_rc98/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/libdrm')
-rw-r--r--x11-libs/libdrm/ChangeLog6
-rw-r--r--x11-libs/libdrm/Manifest3
-rw-r--r--x11-libs/libdrm/files/2.4.18-0001-datatypes.patch21
3 files changed, 28 insertions, 2 deletions
diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 135d0b1a8928..d4662be39336 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,10 @@
# 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.134 2010/10/21 14:08:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.135 2010/10/22 06:58:45 chithanh Exp $
+
+ 22 Oct 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +files/2.4.18-0001-datatypes.patch:
+ Re-add patch which is required for libdrm-2.4.20-r1, bug #342117
21 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-files/2.4.18-0001-datatypes.patch, -libdrm-2.4.18_pre20100211-r1.ebuild,
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index a94a49b4035e..06276ef3c441 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,7 @@
+AUX 2.4.18-0001-datatypes.patch 490 RMD160 2a71e2125e78a705617f5262697d1156f492229e SHA1 2abe750990073d02a8d723c254695ea3324f12d5 SHA256 0a2ae45b9b4d8d2a9decaba3e32d38ba6d60a081dc15a60ca88e84d1157d7669
DIST libdrm-2.4.20.tar.bz2 400812 RMD160 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a SHA1 f1448ac0f1c7a5f74a86d2fb50941fc12dc932db SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9
DIST libdrm-2.4.22.tar.bz2 399380 RMD160 067562ab8d935c17238717a486a0d120b0c29d79 SHA1 b9ead56fcea883d818dfc744edc96a768ebcf91e SHA256 0bb0e594e4094d9000d80f38e96e8f640b6364f96cfef5b970cf4481443c6b3d
EBUILD libdrm-2.4.20-r1.ebuild 1471 RMD160 728cb40b6525d3439aeeb23c6419574045125a42 SHA1 3ddbf3f3a04ca2fb06307b48beabcda9ad77016c SHA256 63e7424710e480687c75d9174df92780f947d5ceabf4a41fc48282dea8a610bb
EBUILD libdrm-2.4.22.ebuild 1126 RMD160 318319baf01d43914933cf6bcbcd4177e94664f8 SHA1 6d47199a1240123521901fac5c0ce9dce1e6145c SHA256 c39dd0b3ed3c1218f6335d93369a3384668dfbf541f47404c18b266b11f00525
-MISC ChangeLog 18632 RMD160 c85b3221803f4d606d2dbfc72f86500c830fc708 SHA1 bc9c818290a53bcd9abcc99e14f195a212277459 SHA256 510db13989ce44b8b97f0006e36b4d4e7bb02c5bdd66c6bc789beecdcc632bb3
+MISC ChangeLog 18806 RMD160 60f3b3d23657c8853d640e4cc5229eeb5f61aa34 SHA1 024620eb5bcec0cd59086ac1ef8ba172adba7813 SHA256 bdbebe9f9995361cebce02585de0aaf74785a6c1b5cba1d3a915c89df97579b7
MISC metadata.xml 272 RMD160 2d98b4981a3843af21c5172218e94f4ba6b82ac4 SHA1 74b5bba73e5a48760796f5b566cdf22bd32180d8 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771
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