Fix building on fbsd, bug #433403.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 41 insertions, 4 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 8163e31015ee..442e799e44a8 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.204 2012/11/06 04:24:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.205 2012/11/10 22:35:34 chithanh Exp $
+
+  10 Nov 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/libdrm-2.4.40-bsd-etime.patch, libdrm-2.4.40.ebuild:
+  Fix building on fbsd, bug #433403.
 
 *libdrm-2.4.40 (06 Nov 2012)
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 18efe1887842..1eb1b856f1e0 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,7 @@
 AUX 2.4.18-0001-datatypes.patch 490 SHA256 0a2ae45b9b4d8d2a9decaba3e32d38ba6d60a081dc15a60ca88e84d1157d7669 SHA512 ca5505b7bcb92d27b3ca1c72b4a9226cf58cdc559199a9e268f55d4ba34fea92c367172ebcba367f682c7b989b797c97b6ddb6564061685fdfa029eae7e469a2 WHIRLPOOL 247c0230279dfa805e8b9a1a213e1e921a5299826078dab2972509676e4e6a303e3cee2e59547f11e8275d13ee703faff57881905f12149e026ca26e427590b6
 AUX libdrm-2.4.23-solaris.patch 3191 SHA256 1ddfb794d0edf64727af0a423250769b0be3132d55d53374b8ef68e2419478e6 SHA512 436182b8731e45cd705042706088f4c6a5a6d3b285a8b773718ba25b9669f900da461ac316594dff6acbaa36cb4d04b6650d521bc1ccba68b07ab17d2a3c09b6 WHIRLPOOL 2a2e536c15ed21f69c146f4d162b5c8b67965a91ebd94e8881d0612dc0183862ccbf971dcab5dcbf3e2da9a03fe65e84d64fc66dd8f79939e01d1edbf0a512f9
 AUX libdrm-2.4.28-solaris.patch 3202 SHA256 04440ea802761e27c6f3a39a8bbfba71d707c3b3380885540be2e0f56ef58334 SHA512 5e7edfdad3090a84ef1876281986d0e6af949af6c61eeaff17bf250891d6d7d9f594802f02fe01921c350b05c15e52bc27f3235c3cf4803441a524ea741471d2 WHIRLPOOL bedeb2a2faab18dff6bf5894a3adc9c7a3ccc6f825fa257125be7c25965de3c354f43b4c35b5e370a06d674ec205747fb1d1c5f86329f6c8cfa1cbc33aceeef4
+AUX libdrm-2.4.40-bsd-etime.patch 916 SHA256 9356a077fb1b267cb130e0c080f3bebffbce7ea63da04a5553976c8cd75cd56d SHA512 e768e22152c88e406be596adcca37e030c9343e57fea4014b47740e2208f858d82f3f93f5a00f4f7b5f5f2bd30e841a6393458467b7534fe14f2ce0420a9f25e WHIRLPOOL 8085dd7b3e7666c5c301e33ddb44cb44d7fb88e1d78e278ce0a717888eeb3c0f9bdaf18a3d028f43aa824764523f75e84c92785bfebf94967502043c00431e3f
 DIST libdrm-2.4.20.tar.bz2 400812 SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9 SHA512 fa7a042a80b71057b7d15a36c7902e1882abb23dea77cabfa2e78590d9477d8e0259364f0e2eb6005b316254be2c728e295c114b1fe365074438539bc3dd9392 WHIRLPOOL 92a9fba9f64d0c988e8e6bcbdd1798583a420bc1287b4e85c1ca9a84c5fd3c95e5079dc111eee89811038832a5a90139780292d43554257465c99726b7f27661
 DIST libdrm-2.4.25.tar.bz2 445388 SHA256 51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f SHA512 610c93b8104f324adbf9b1af1d026b3be68b150e255e65656dd0b2a830cb67e84536dacf1847f3e98667d93a3c9c97d32d19ad49c22bde2b0159622a18db0f65 WHIRLPOOL 0d09d80ec9e49dfc88945c71396f6568d071e15a09e265bf4a91e4bc86859d64616aaab12ad9bb6ed1e5b001529ead8522dfaf5b090384970ccc9b938134cc8f
 DIST libdrm-2.4.26.tar.bz2 448627 SHA256 b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc SHA512 7605a54f6876e3c73cb41bc85c7e8568962a969c3b6eb388fb480c4ba08951f91ab0d024171b98543addc2e440f5c7a4692d666d59a3b2be1793234a86332576 WHIRLPOOL 468e9ff9599a4ad12664dc8a57f6207624c98c05fdfc8497bca304e5dde33a999331b3fb8cfb513c51c0127dc28c92d8aa58588da1753a99ab0a4ec65c653f9c
@@ -30,6 +31,6 @@ EBUILD libdrm-2.4.35.ebuild 1616 SHA256 c9d6f2c8f974c9963ffb26164fa6195408c190c4
 EBUILD libdrm-2.4.37.ebuild 1612 SHA256 41600bbd034b5ea4bf3c7d9f8059f52473a8c06bd4b3b2b42254f50df87ff646 SHA512 8674927bbd07e1113b165e4f3bc07e2c293344dda863cabe5f0248f29b7533d84ac3330a95fa11f47a8fd3e51af34eefbd8e61ba2a71c59fcfebc49a80531cd9 WHIRLPOOL 621a26fef213a6f9538bc6f3565c6cd83ff3eea59946eed9023bd58e54b7b786c06b9ab6ca0e155d957fd9b90cc094504573f76ab6e6f487fc77d5f73c14beee
 EBUILD libdrm-2.4.38.ebuild 1619 SHA256 7c17649c22058a8736b4fba5188322d0ccf3c9ccd32ae57659282af8b48fbd5c SHA512 6cf697421c84af66bdd00975f6b0069679bc28c11947b130d724176b5d999f0b59cae986fbbc11fc366f0526a40b266e1f75c4906f137b24fa97776e1f4701c8 WHIRLPOOL 96f9e6b013ecb459fc755116f53315ebf4e81d94f680d4b27e11ed8c9ad370ecc14c0b0349a3fa1c52868162b78e4a6b8e08d89b0c2ee2a16d7abcf82064c233
 EBUILD libdrm-2.4.39.ebuild 1619 SHA256 6d69b3cf56d066383b9884609fd45aa62ef48a996206451756992236347cf07b SHA512 b363baf8814bd1e73b85dec9b690abb7509140484b41c2a9fa1737194f32062b2ac9bc4d8e882c667ee5fa091d236083de49f1d4cfb8ce8c15547db7d67513fc WHIRLPOOL 1dd55b23b8b9d5b0df54b16f84a0db019dac617cb53a6e79cbb130495f28ce90584d5a2361dbe9bb2bc4765f1ef214912a9609f9e08eb8650494c89fd3dd8fa8
-EBUILD libdrm-2.4.40.ebuild 1606 SHA256 2308658f5ce11263ea8d132c5ff43eed979fb0d6149b7ca8db67fe29062966cc SHA512 4c54b7f6bd0bc1486c3598accfa3ea28816c8ebc83466cc8378adae8c96dbd021365bf056cf0a1620875232944de8eea5f0d51e25963c09028d05ae077449ee8 WHIRLPOOL 4753d5da0c6b79cdcf1838c9aa2279aab55591689c9dbc15cf0ca8d04fdf606e6612ff71550b0fcec0096684d7c23e26762f2a37fdce97a2dc7d7edc7a7f7df3
-MISC ChangeLog 27680 SHA256 5140374a38bd9df2aba9c75b849c65a1a938bc9a4c205b26335c9f6ab5bf2631 SHA512 ed7b4002760fbae71333436606542ef757763cdbf8a8f12c47c130be5da1465debaa16d750527155c9edfa1709edb77d0a69c49891863ebe336a840cbfd5b3a1 WHIRLPOOL ae4566af1cd72fe9e170363270940839010ec488b245f60fa011d1c8af0d524ffb3c5c6cb28eaf575fdd14367a9e49fa0ea895740fdf02eb1e461fdecb1b0521
+EBUILD libdrm-2.4.40.ebuild 1650 SHA256 0d9edd1f9318af9f4fd8a6bce3f3b7d8b48364bb5147ee780b8b32787e931f91 SHA512 9e395aa8cde80be4cd993124a0f05c2084e36a3748c3ef8ea330be2e1fe56eb9d57cbebc9729eb440924642e3ff07652a5e01e3cdb47e82be6bef77187643f03 WHIRLPOOL 8f9a105f4e7578ebedc9103813585b4553849c37870f73fdb2477af3f5d8e8193781ae618780d4842ebbf084bc0246e2e1977d1860dcae6fde34e35fdebb25c0
+MISC ChangeLog 27849 SHA256 d254a300ab7f79427de7ccf607560f61875f8aae5dcfbe70e04b8b9c33fea2a6 SHA512 f9d0dfef1b0219ffb3940c30bd9860b3e9247dab1511105828a4315646eb9babdaa34cf18283835b2482d0342cc9a88a96258f561cb8be4416a5c72430b5888b WHIRLPOOL e274df542108e711dd97b4b96b3297cd06e1d73d6e274cd6094e2840dabba97bc321c2d05ff125eba790d08270f3a68c46b63435e005b915323fdc6e8a9677a6
 MISC metadata.xml 272 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771 SHA512 c08dfcd90f1451c0cd9251b91833e8742e723043c2e6632eaab523d61745d0173502ae792225522053671df98aeaf2229783bfd5fe202bf29a166857fe0d8fd1 WHIRLPOOL f3d828a14266066ab3dd5c2970165bf9d1cf3d1c9fffd8d691344c7cc1b8ef011957d66f64b0c328afa64b92d1e154dec619f8f3bd0789edc36be07d33c74900
diff --git a/x11-libs/libdrm/files/libdrm-2.4.40-bsd-etime.patch b/x11-libs/libdrm/files/libdrm-2.4.40-bsd-etime.patch
new file mode 100644
index 000000000000..9c4090beb0dd
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.40-bsd-etime.patch
@@ -0,0 +1,31 @@
+From 7d42b49c0cf19dbb4531cd84efae51f95db2eea1 Mon Sep 17 00:00:00 2001
+From: David Shao <davshao@gmail.com>
+Date: Sat, 10 Nov 2012 05:24:56 +0000
+Subject: intel: Fix missing ETIME on BSD operating systems
+
+Originally posted to Free Desktop bug #52549 by David Shao.
+Resolves Gentoo Bug #433403.
+Commit message by Richard Yao.
+
+Reviewed-by: Richard Yao <ryao@gentoo.org>
+Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
+References: https://bugs.freedesktop.org/show_bug.cgi?id=52549
+
+Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
+---
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 8d45839..512bc6f 100644
+--- a/intel/intel_bufmgr_gem.c
++++ b/intel/intel_bufmgr_gem.c
+@@ -54,6 +54,9 @@
+ #include <stdbool.h>
+ 
+ #include "errno.h"
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
+ #include "libdrm_lists.h"
+ #include "intel_bufmgr.h"
+ #include "intel_bufmgr_priv.h"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/libdrm/libdrm-2.4.40.ebuild b/x11-libs/libdrm/libdrm-2.4.40.ebuild
index 46ab2634b173..a70b7ad8962c 100644
--- a/x11-libs/libdrm/libdrm-2.4.40.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.40.ebuild
@@ -1,6 +1,6 @@
 # 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.40.ebuild,v 1.1 2012/11/06 04:24:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.40.ebuild,v 1.2 2012/11/10 22:35:34 chithanh Exp $
 
 EAPI=4
 inherit xorg-2
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.28-solaris.patch
+	"${FILESDIR}"/${PN}-2.4.40-bsd-etime.patch
 )
 
 src_prepare() {