diff options
13 files changed, 20 insertions, 488 deletions
diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog index db392b030272..ade4d669e2b0 100644 --- a/x11-drivers/xf86-video-intel/ChangeLog +++ b/x11-drivers/xf86-video-intel/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for x11-drivers/xf86-video-intel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.11 2009/02/01 22:57:52 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.12 2009/02/01 23:53:42 remi Exp $ + + 01 Feb 2009; Rémi Cardona <remi@gentoo.org> + -files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patc + h, -files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch, + -files/2.4.2-0002-Disable-render-standby.patch, + -files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch, + -files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch, + -files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch + , + -files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.pat + ch, -xf86-video-intel-2.4.2-r3.ebuild, -xf86-video-intel-2.5.0.ebuild, + -xf86-video-intel-2.5.1.ebuild, xf86-video-intel-2.6.1.ebuild: + remove old ebuilds and don't use wildcards in PATCHES *xf86-video-intel-2.6.1 (01 Feb 2009) diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest index 7753b2ac2e71..b20f74a77344 100644 --- a/x11-drivers/xf86-video-intel/Manifest +++ b/x11-drivers/xf86-video-intel/Manifest @@ -2,14 +2,7 @@ AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 AUX 2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61 AUX 2.2.1-0001-fixup-pciaccess-version-detect.patch 824 RMD160 6e148f2fe467ba6e9d48e046f067ba405d10b0d1 SHA1 e80e2c8a24a4b54b35d6da5a28d4b70c0b20d8f1 SHA256 05d4ba845535c3bd6a28500251b9e6425af49e671a548d718cac81f57242823e AUX 2.3.2-0001-intel-fix-drm-check.patch 966 RMD160 f77d00d99bbc02d233fd3455055e6e8f6cd64f9e SHA1 93db1cf8fa34baf5728dfe1cbe0ffcdddb7ee065 SHA256 9edc49693ce22338057d3e06f391235cac82f3db3edce6dce1444175843c8b69 -AUX 2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch 1612 RMD160 d00b5607c258e8905ea91309d2244577918ddee8 SHA1 a995fb3718a6bd52a9248e766ad5d1f8adbaf1a8 SHA256 d8bfae95675f9ad5f81e12f42e6228e3a4311ce9690c4fff164ae69f12798782 -AUX 2.4.2-0002-Disable-render-standby.patch 1724 RMD160 52cd119e0d17b1d3439d1190e2551fc6f239594c SHA1 3e9d4649b2e6ee67f3a133631347b22aee8d83a4 SHA256 70dca79e533d9d1913fed90781c534af574e21e63fe5b858503ef8b3d6b02af4 -AUX 2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch 832 RMD160 a84da89567aa67b53bbc3c24b05724e45a3be212 SHA1 c69ef012f98b36c428688fa863f27d9f60fda601 SHA256 03a72ddddd2baec9e7769a6d8c906c71b33fc2a4b418ae1e4333fc568200ba8d AUX 2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch 832 RMD160 a84da89567aa67b53bbc3c24b05724e45a3be212 SHA1 c69ef012f98b36c428688fa863f27d9f60fda601 SHA256 03a72ddddd2baec9e7769a6d8c906c71b33fc2a4b418ae1e4333fc568200ba8d -AUX 2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch 1898 RMD160 258b1e4c931606390cd0874f98e9ee0ca0a7d289 SHA1 9547598d0bf15da75b7890efb11cfb6947d51008 SHA256 75671e4f9501e1ba59c9ea903860930971787423bd858bf9d06f60b7e777695a -AUX 2.5.0-0002-clean-up-man-pages-generation-and-installation.patch 1408 RMD160 7614486b272d4a689c1024efa346abca5bff7e94 SHA1 16217a652364318b1c021fcfa9eeadae5d73063f SHA256 014704c1d5c40443ffaaa0714927a6bc15b2f5538fe1e181f1663a0417180d46 -AUX 2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch 1211 RMD160 d25c957761de6602df9d2ee712b52fc22bbe0b4a SHA1 ae5ecc1c0733e2a095283f352fa765b82ae9d89e SHA256 304206372466cf5b65603472a86de15a44abd4843f0fadd78d21996ea68e27c5 -AUX 2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch 2123 RMD160 bfbdfbf0f2357aaba78a7d701d6474b9cfeedec4 SHA1 0935a784a3068bc75c3e76e90c0773dfda0608c3 SHA256 34b1119de22b38c089618be533552bd029f1da83a76a73e54c3f4f743ec31a2b AUX 2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c AUX 2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch 820 RMD160 6df19b267a211a1c013de7c1a302b73daeee74d7 SHA1 5345c0a409c2ca98ec2f315da152e175b49c6eb1 SHA256 5892c7acf43ac13ad032ace5dbaf4c3216a144b66be3757540b25cdd4cf31c9b AUX 2.6.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c @@ -19,9 +12,7 @@ DIST xf86-video-i810-1.7.4.tar.bz2 461513 RMD160 cbb8ebd7e36d07513e00c232cbb1e0b DIST xf86-video-intel-2.1.1.tar.bz2 584729 RMD160 47596231378bed5c9a48511318b6e56ab184f319 SHA1 5a4e6205818ddd8fc8529e2bd5f6310fdc247f84 SHA256 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c DIST xf86-video-intel-2.2.1.tar.bz2 604749 RMD160 5746abeb91d5b017d54cb26d2689b34c492496a7 SHA1 7180c7ab83e3334053bd1bec1cdd1755b529e19c SHA256 d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a DIST xf86-video-intel-2.3.2.tar.bz2 665611 RMD160 5137493fb00b7a6fe3c03750f42599939a69c11b SHA1 86be1572c68a438bb92d40fff262b71d9e40c976 SHA256 060aaa267ded1d5d0987d077b1d4c027f99ee507cee8fd2e5233f15842f9ed27 -DIST xf86-video-intel-2.4.2.tar.bz2 684445 RMD160 939bd7d3bc6f1709f312dcbcaadb2e1d0c95bc06 SHA1 fe071bf0c98b1cce96f6647d87a74217632fc2ad SHA256 5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b DIST xf86-video-intel-2.4.3.tar.bz2 661105 RMD160 0d4fe4b7d517d1740c80fe61a8fc44af604ec60e SHA1 8335294c9b76b1f9daad5082d2290555ba2dbce5 SHA256 1752a0f6f5fd28f5c8581f6411f37df7fde5fd4a0bbedc4bf423f9824423afcd -DIST xf86-video-intel-2.5.0.tar.bz2 721366 RMD160 ba6b52535cd5963f0ea3a629195899fb8ea9c621 SHA1 081709117a665af9d9f0339b58a298b8a7c786f8 SHA256 09d740bfebc994a9ba7d9840fb2080c14ff111fa3bd46379e9cfe10b9f7925b4 DIST xf86-video-intel-2.5.1.tar.bz2 716182 RMD160 f1d4b438931b564233dc4f76e3cb7fa1b9801aa2 SHA1 58f6f005a698e63cb34ba1b011b0ddce0b0b3862 SHA256 c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313 DIST xf86-video-intel-2.6.1.tar.bz2 789536 RMD160 642c0e0d296eaec18806059e60fdce9c448ce466 SHA1 c4d3fff72771c71eab152660be1fb33af679c06e SHA256 31a3ab9ce33542f1d6431eac992344d086345ccc8cd43a184c93c9d1b4a4086c EBUILD xf86-video-intel-1.6.5.ebuild 857 RMD160 c381cb8685bf2d849703fdfdd2122457772ee847 SHA1 4a9d49657a525d6195acb8bfcc1c9b640aa7fced SHA256 416809b3637c6d98a7ad0b328324350a6804100433800acd65b4ab613025c69f @@ -29,11 +20,8 @@ EBUILD xf86-video-intel-1.7.4.ebuild 813 RMD160 7d25d1a8ce062d450283a795b32349b1 EBUILD xf86-video-intel-2.1.1.ebuild 770 RMD160 a90c8eb0e29c12f6d332133dc750974bf72fb6b8 SHA1 8699ac1c4ee4c3d4685c8c727fc989d80e6f2f2d SHA256 b929bb28aed80927b57d4fd048ac8d0ae344de989b621f18f4e53876a61e9a45 EBUILD xf86-video-intel-2.2.1.ebuild 798 RMD160 8098615e8f977e0343d69a69842d84564ae78521 SHA1 927f32e20b1d0de8d65d8efbc1ea597571cf7a3e SHA256 0baaa670505f864f5479aae25183eeded75e249bb6f2786f04f52220b58eb3e9 EBUILD xf86-video-intel-2.3.2.ebuild 788 RMD160 f52a3ba4fe74fefb6a42ed09d6a9d15a93a44db5 SHA1 a9e2e45e45c0c5aa899e8ad9fb729a31b927a5d7 SHA256 fc81421faa513aac2aef49f49799c86ead6ff292eea1a984485a83268906f55b -EBUILD xf86-video-intel-2.4.2-r3.ebuild 937 RMD160 79e983699321c20ec785ce530ef2e4f91bf92597 SHA1 1369229a44f8cbc10a40bf8813ceb6bca38cb756 SHA256 f10c0b5addd9ccc9740912b90fb2d771078a84ab7d06e709f22573c5805620a4 EBUILD xf86-video-intel-2.4.3.ebuild 805 RMD160 a3f03f6d96d84fcc74662b9ea9e4023e9a130f24 SHA1 6279539da257cd4d804f72fca70823f24c3eac93 SHA256 5830b5a1365781e46a3ba4b153aa17975c14c23152c4ef7ee405dc1297c2363a -EBUILD xf86-video-intel-2.5.0.ebuild 1087 RMD160 00250a86d8f486ab017a588794609337455c3025 SHA1 ff9fa82000fd9d13178b36603b72eedcc6ac4844 SHA256 bb0018df376e60d524f8a60e29c9a4bff95e77ac0c6c3387b19afda0c4a1aacd EBUILD xf86-video-intel-2.5.1-r1.ebuild 904 RMD160 8d376f0cd1615344e30d3c5183261892c2ce635f SHA1 644ad3e4a23c926f94739ce7f80e1a3c5d6231f8 SHA256 e0882b1430572943182b47f2ae499bb4ba4d7d12b367e622fcbe80c72303d66a -EBUILD xf86-video-intel-2.5.1.ebuild 844 RMD160 3b81dcc4b05a8c6a4b851eea9dd0771f5aeb6942 SHA1 627005e1ff4e774618f7312e6e5a7a5ef3f19608 SHA256 bcc44830fb803d470a0b182d15c77124338bfc142fb3e833b315fdaec96414c3 -EBUILD xf86-video-intel-2.6.1.ebuild 831 RMD160 e1505bbe12fb605aae7fce9f8d2baca182893f4d SHA1 6acfa47ba169c5c9672cdb4c511ef96f23d27b80 SHA256 c5833eac1f0123093f4d777fab4c95c8c89e773b8e99df906e0c073120b4d66e -MISC ChangeLog 28902 RMD160 78e86c1a8e3e76a92ab623005741d4afcd786aa6 SHA1 179ae60f0aef33ccacbb7991170362ee0088a261 SHA256 244d86a041de8a5c5452ba0bae66376824ffdcaad7e5c508ce77d2cb1fc73c17 +EBUILD xf86-video-intel-2.6.1.ebuild 896 RMD160 309b6380d1d0ff4889bdbba1b5a3de100d51316f SHA1 2ca8b6fd648d588de2875229259cf5e08034b3d9 SHA256 db8b06927ac5e965bd4bd9e6a9fa7cfb9d729797a3241c8a599d61597857182e +MISC ChangeLog 29639 RMD160 fb517bb0cc04a880574cdb2b7a06f05635ed6a8a SHA1 204ce004fb37030de8c1e9d804ccd3ca88b4ed68 SHA256 35b55c6d25839de1cbf96a14c4c71ed8e7ce2376222b04c4b403eaee1d267f35 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc diff --git a/x11-drivers/xf86-video-intel/files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch b/x11-drivers/xf86-video-intel/files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch deleted file mode 100644 index 261e829cf054..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 95fe53b9fa5f44a1adb909909d609463d68578c2 Mon Sep 17 00:00:00 2001 -From: Jesse Barnes <jbarnes@virtuousgeek.org> -Date: Wed, 20 Aug 2008 14:40:29 -0700 -Subject: [PATCH] Don't allocate a pipe for hotplug detection - -It shouldn't be needed... -(cherry picked from commit 7b6f4d22211d71480caf6335a3eacaacff369371) - -diff --git a/src/i830_crt.c b/src/i830_crt.c -index 2a99f9c..8274c0c 100644 ---- a/src/i830_crt.c -+++ b/src/i830_crt.c -@@ -352,10 +352,9 @@ i830_crt_detect(xf86OutputPtr output) - xf86OutputStatus status; - Bool connected; - -- crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode); -- if (!crtc) -- return XF86OutputStatusUnknown; -- -+ /* -+ * Try hotplug detection where supported -+ */ - if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) || - IS_G33CLASS(pI830)) { - if (i830_crt_detect_hotplug(output)) -@@ -363,12 +362,19 @@ i830_crt_detect(xf86OutputPtr output) - else - status = XF86OutputStatusDisconnected; - -- goto out; -+ goto done; - } - -+ /* -+ * DDC is next best, no flicker -+ */ -+ crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode); -+ if (!crtc) -+ return XF86OutputStatusUnknown; -+ - if (i830_crt_detect_ddc(output)) { - status = XF86OutputStatusConnected; -- goto out; -+ goto out_release_pipe; - } - - /* Use the load-detect method if we have no other way of telling. */ -@@ -378,9 +384,10 @@ i830_crt_detect(xf86OutputPtr output) - else - status = XF86OutputStatusDisconnected; - --out: -+out_release_pipe: - i830ReleaseLoadDetectPipe (output, dpms_mode); - -+done: - return status; - } - --- -1.6.0.2 - diff --git a/x11-drivers/xf86-video-intel/files/2.4.2-0002-Disable-render-standby.patch b/x11-drivers/xf86-video-intel/files/2.4.2-0002-Disable-render-standby.patch deleted file mode 100644 index e80efaa6dd5f..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.4.2-0002-Disable-render-standby.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 86f82c429f5d7067c52d3b783988917869e13d1d Mon Sep 17 00:00:00 2001 -From: Zhenyu Wang <zhenyu.z.wang@intel.com> -Date: Thu, 11 Sep 2008 15:49:41 +0800 -Subject: [PATCH] Disable render standby - -Render standby is known to cause possible hang issue on some -mobile chips, so always disable it. - -diff --git a/src/i810_reg.h b/src/i810_reg.h -index 8690954..af8c6a3 100644 ---- a/src/i810_reg.h -+++ b/src/i810_reg.h -@@ -2815,4 +2815,7 @@ typedef enum { - - #define PEG_BAND_GAP_DATA 0x14d68 - -+#define MCHBAR_RENDER_STANDBY 0x111B8 -+#define RENDER_STANDBY_ENABLE (1 << 30) -+ - #endif /* _I810_REG_H */ -diff --git a/src/i830_driver.c b/src/i830_driver.c -index 6f87c51..209aa07 100644 ---- a/src/i830_driver.c -+++ b/src/i830_driver.c -@@ -2718,6 +2718,23 @@ i830_memory_init(ScrnInfoPtr pScrn) - return FALSE; - } - -+static void -+i830_disable_render_standby(ScrnInfoPtr pScrn) -+{ -+ I830Ptr pI830 = I830PTR(pScrn); -+ uint32_t render_standby; -+ -+ /* Render Standby might cause hang issue, try always disable it.*/ -+ if (IS_I965GM(pI830) || IS_GM45(pI830)) { -+ render_standby = INREG(MCHBAR_RENDER_STANDBY); -+ if (render_standby & RENDER_STANDBY_ENABLE) { -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disable render standby.\n"); -+ OUTREG(MCHBAR_RENDER_STANDBY, -+ (render_standby & (~RENDER_STANDBY_ENABLE))); -+ } -+ } -+} -+ - static Bool - I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - { -@@ -3053,6 +3070,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!vgaHWMapMem(pScrn)) - return FALSE; - -+ i830_disable_render_standby(pScrn); -+ - DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n"); - - if (!pI830->useEXA) { --- -1.6.0.2 - diff --git a/x11-drivers/xf86-video-intel/files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch b/x11-drivers/xf86-video-intel/files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch deleted file mode 100644 index 8084a5761dd6..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4d7cd8cec7ba56230b298986d7a91a7587984bc4 Mon Sep 17 00:00:00 2001 -From: Remi Cardona <remi@gentoo.org> -Date: Sun, 19 Oct 2008 23:45:14 +0200 -Subject: [PATCH] never enable DRI_MM on this branch - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 809e84d..04e31f3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -202,7 +202,7 @@ if test "$DRI" = yes; then - PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto]) - AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) - AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) -- PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no]) -+ DRI_MM="no" - if test "x$DRI_MM" = xyes; then - AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management]) - fi --- -1.6.0.2 - diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch deleted file mode 100644 index e197177b0b02..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c07321e220df325c315f2138b05ef70146fed5ad Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@linux.ie> -Date: Mon, 20 Oct 2008 18:46:49 -0700 -Subject: [PATCH 1/4] Default kernel mode setting to off, add configure flag to enable - -Should help avoid unpleasantness. ---- - configure.ac | 21 ++++++++++++++------- - 1 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 67ccbdf..a53b225 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -75,6 +75,11 @@ AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc], - [XVMC="$enableval"], - [XVMC=auto]) - -+AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms], -+ [Enable kernel mode setting support [[default=no]]]), -+ [KMS="$enableval"], -+ [KMS=no]) -+ - # Checks for extensions - XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -@@ -107,13 +112,15 @@ if test x$DRI != xno; then - [have_dristruct_h="yes"], [have_dristruct_h="no"]) - AC_CHECK_FILE([${sdkdir}/damage.h], - [have_damage_h="yes"], [have_damage_h="no"]) -- AC_CHECK_HEADER(xf86drmMode.h, -- [DRM_MODE=yes],[DRM_MODE=no] -- [#include "stdint.h"]) -- dnl exaGetPixmapDriverPrivate required for DRM_MODE. -- PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no]) -- if test "x$DRM_MODE" = xyes; then -- AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) -+ if test x$KMS != xno; then -+ AC_CHECK_HEADER(xf86drmMode.h, -+ [DRM_MODE=yes],[DRM_MODE=no] -+ [#include "stdint.h"]) -+ dnl exaGetPixmapDriverPrivate required for DRM_MODE. -+ PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no]) -+ if test "x$DRM_MODE" = xyes; then -+ AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) -+ fi - fi - fi - AC_MSG_CHECKING([whether to include DRI support]) --- -1.6.0.2 - diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch deleted file mode 100644 index 17c0047020ef..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7b847b328e314ac24cdad56dc9846a06b9d44e23 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr> -Date: Mon, 20 Oct 2008 11:27:36 +0200 -Subject: [PATCH 2/4] clean up man pages generation and installation - ---- - man/Makefile.am | 21 +++++---------------- - 1 files changed, 5 insertions(+), 16 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 7432d5a..2a1cc81 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -25,21 +25,14 @@ - # - - drivermandir = $(DRIVER_MAN_DIR) -- --DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%) -- --driverman_PRE = @DRIVER_NAME@.man -- - driverman_DATA = \ -- $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \ -- i810.@DRIVER_MAN_SUFFIX@ -+ $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) \ -+ i810.$(DRIVER_MAN_SUFFIX) - --EXTRA_DIST = @DRIVER_NAME@.man -+EXTRA_DIST = $(DRIVER_NAME).man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- - # Strings to replace in man pages - XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 -@@ -61,9 +54,5 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ - --BUILT_SOURCES = shadows.DONE -- --shadows.DONE: -- -rm -f i810.@DRIVER_MAN_SUFFIX@ -- echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \ -- i810.@DRIVER_MAN_SUFFIX@ -+i810.$(DRIVER_MAN_SUFFIX): -+ echo .so man$(DRIVER_MAN_SUFFIX)/$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) > $@ --- -1.6.0.2 - diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch deleted file mode 100644 index c5ebdc1f534e..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d437f3107635a85486faae15e48a7237b6d69e42 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr> -Date: Mon, 20 Oct 2008 13:17:32 +0200 -Subject: [PATCH 3/4] use standard automake macros for handling symlinks - ---- - configure.ac | 1 + - src/Makefile.am | 6 +++--- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a53b225..36852aa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,7 @@ AC_PROG_LIBTOOL - DOLT - AC_PROG_CC - AM_PROG_CC_C_O -+AC_PROG_LN_S - - AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no) - AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) -diff --git a/src/Makefile.am b/src/Makefile.am -index 9b32215..b16ba6c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -223,8 +223,8 @@ intel_drv_la_SOURCES += \ - $(INTEL_XVMC_SRCS) - endif - --install-data-local: install-intel_drv_laLTLIBRARIES -- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so) -+install-exec-hook: -+ (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so) - --uninstall-local: -+uninstall-hook: - (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) --- -1.6.0.2 - diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch deleted file mode 100644 index 8e46c35a0df4..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch +++ /dev/null @@ -1,76 +0,0 @@ -From ef7a85624b6bf3ab9935c8a797978a18e6334dec Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr> -Date: Wed, 22 Oct 2008 12:15:35 +0200 -Subject: [PATCH 4/4] add a configure switch for pre-2.0 compatibility symlinks - -Conflicts: - - configure.ac ---- - configure.ac | 8 ++++++++ - man/Makefile.am | 7 ++++--- - src/Makefile.am | 2 ++ - 3 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 36852aa..b725acf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -81,6 +81,11 @@ AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms], - [KMS="$enableval"], - [KMS=no]) - -+AC_ARG_ENABLE(symlinks, AC_HELP_STRING([--enable-symlinks], -+ [Disable old "i810" symlinks [[default=yes]]]), -+ [SYMLINKS="$enableval"], -+ [SYMLINKS="yes"]) -+ - # Checks for extensions - XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -@@ -262,6 +267,9 @@ if test "$XVMC" = yes; then - AC_SUBST([XVMCLIB_CFLAGS]) - fi - -+AC_MSG_CHECKING([whether to setup old "i810" symlinks]) -+AC_MSG_RESULT([$SYMLINKS]) -+AM_CONDITIONAL(SYMLINKS, [test "$SYMLINKS" = "yes"]) - - AC_SUBST([DRI_CFLAGS]) - AC_SUBST([XORG_CFLAGS]) -diff --git a/man/Makefile.am b/man/Makefile.am -index 2a1cc81..b07b3f0 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -25,9 +25,10 @@ - # - - drivermandir = $(DRIVER_MAN_DIR) --driverman_DATA = \ -- $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) \ -- i810.$(DRIVER_MAN_SUFFIX) -+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) -+if SYMLINKS -+driverman_DATA += i810.$(DRIVER_MAN_SUFFIX) -+endif - - EXTRA_DIST = $(DRIVER_NAME).man - -diff --git a/src/Makefile.am b/src/Makefile.am -index b16ba6c..881fbaa 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -223,8 +223,10 @@ intel_drv_la_SOURCES += \ - $(INTEL_XVMC_SRCS) - endif - -+if SYMLINKS - install-exec-hook: - (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so) - - uninstall-hook: - (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) -+endif --- -1.6.0.2 - diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild deleted file mode 100644 index 6eb3b867b4e5..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild,v 1.3 2008/11/26 23:26:27 dberkholz Exp $ - -SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.2 - x11-libs/libXvMC" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - x11-proto/glproto - >=x11-libs/libdrm-2.2 - x11-libs/libX11 )" - -CONFIGURE_OPTIONS="$(use_enable dri)" - -PATCHES=( -"${FILESDIR}/${PV}-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch" -"${FILESDIR}/${PV}-0002-Disable-render-standby.patch" -"${FILESDIR}/${PV}-0003-never-enable-DRI_MM-on-this-branch.patch" -) diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild deleted file mode 100644 index 6c2afdf23231..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild,v 1.3 2008/12/31 03:44:38 mr_bones_ Exp $ - -SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.2 - x11-libs/libXvMC" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - x11-proto/glproto - >=x11-libs/libdrm-2.4.0 - x11-libs/libX11 )" - -CONFIGURE_OPTIONS="$(use_enable dri) --disable-symlinks" - -PATCHES=( -"${FILESDIR}/${PV}-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch" -"${FILESDIR}/${PV}-0002-clean-up-man-pages-generation-and-installation.patch" -"${FILESDIR}/${PV}-0003-use-standard-automake-macros-for-handling-symlinks.patch" -"${FILESDIR}/${PV}-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch" -) diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild deleted file mode 100644 index b9361a8a808d..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild,v 1.2 2008/11/26 23:26:27 dberkholz Exp $ - -SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.2 - x11-libs/libXvMC" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - x11-proto/glproto - >=x11-libs/libdrm-2.4.0 - x11-libs/libX11 )" - -CONFIGURE_OPTIONS="$(use_enable dri) --disable-symlinks" - -PATCHES=( -"${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch" -) diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild index 4867fa122da8..b7f59b7a9b3d 100644 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild +++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.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-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild,v 1.1 2009/02/01 22:57:52 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild,v 1.2 2009/02/01 23:53:42 remi Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -29,4 +29,6 @@ DEPEND="${RDEPEND} CONFIGURE_OPTIONS="$(use_enable dri)" -PATCHES=("${FILESDIR}/${PV}*") +PATCHES=( +"${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch" +) |