diff options
| author |   Remi Cardona <remi@gentoo.org> | 2009-10-22 13:31:09 +0000 |
|---|---|---|
| committer | Remi Cardona <remi@gentoo.org> | 2009-10-22 13:31:09 +0000 |
| commit | 7aff715a18d15a1db7e523d57c08a3d1fc7abb4e (patch) | |
| tree | 8fd9419d5e5a17f4506cba9779a16e94adedf3a2 | |
| parent | Version bump (diff) | |
| download | historical-7aff715a18d15a1db7e523d57c08a3d1fc7abb4e.tar.gz historical-7aff715a18d15a1db7e523d57c08a3d1fc7abb4e.tar.bz2 historical-7aff715a18d15a1db7e523d57c08a3d1fc7abb4e.zip | |
x11-drivers/xf86-video-intel: drop old ebuilds
Package-Manager: portage-2.2_rc46/cvs/Linux i686
21 files changed, 26 insertions, 1652 deletions
diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog index 1870c363de59..0d9dbf393654 100644 --- a/x11-drivers/xf86-video-intel/ChangeLog +++ b/x11-drivers/xf86-video-intel/ChangeLog @@ -1,6 +1,30 @@ # 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.39 2009/10/05 13:37:22 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.40 2009/10/22 13:31:08 remi Exp $ + + 22 Oct 2009; Rémi Cardona <remi@gentoo.org> + -files/2.1.1-fix_build_without_dri.patch, + -files/2.7.99.902-0001-Fix-XV-scan-line-calculation-when-rotated.patch, + -files/2.7.0-0001-KMS-hook-up-output-properties-for-randr.patch, + -files/2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.pat + ch, + -files/2.6.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.pat + ch, -files/2.2.1-0001-fixup-pciaccess-version-detect.patch, + -files/2.3.2-0001-intel-fix-drm-check.patch, + -files/2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch, + -xf86-video-intel-2.4.3.ebuild, + -files/2.7.99.902-0002-Reset-framebuffer-offset-when-rebinding-aperture-22 + 7.patch, -xf86-video-intel-2.5.1-r1.ebuild, + -files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch, + -xf86-video-intel-2.7.99.902-r1.ebuild, -xf86-video-intel-2.8.0.ebuild, + -files/2.7.99.902-0003-Use-batch_start_atomic-to-fix-batchbuffer-wrapping- + p.patch, + -files/2.7.99.902-0004-Fix-915-class-Render-after-the-8xx-class-Render-fix + .patch, + -files/2.7.99.902-0005-Really-fix-i915-render.-Fail-at-commit-amend.patch, + -files/2.7.99.902-0006-accessing-a-pixmap-if-prepare_access-fails-is-verbo + t.patch, -files/2.7.99.902-0007-Update-to-xextproto-7.1-support.patch: + drop old ebuilds 05 Oct 2009; Christian Faulhammer <fauli@gentoo.org> xf86-video-intel-2.8.1.ebuild: diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest index 06cb0e62cf1c..f8b802ae77a8 100644 --- a/x11-drivers/xf86-video-intel/Manifest +++ b/x11-drivers/xf86-video-intel/Manifest @@ -1,46 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -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.3-0001-never-enable-DRI_MM-on-this-branch.patch 832 RMD160 a84da89567aa67b53bbc3c24b05724e45a3be212 SHA1 c69ef012f98b36c428688fa863f27d9f60fda601 SHA256 03a72ddddd2baec9e7769a6d8c906c71b33fc2a4b418ae1e4333fc568200ba8d -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 AUX 2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c AUX 2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch 809 RMD160 6f6d7f25efddeb2db9d35e2ea92d408a54af5a56 SHA1 2208274bb58f76503cf2d10d236e6591c48681cf SHA256 4236e01b101a69ca27dfc9c06c367d2b0a381afa343dc3a2b65504559b24fc3c -AUX 2.7.0-0001-KMS-hook-up-output-properties-for-randr.patch 7360 RMD160 4220ba1238738098dadcf27ed70dfe97e9273188 SHA1 99427c926e22e9a8f6b2a4bf70ca7c6e94f0f1c4 SHA256 0771442935e5f64f7f45bcad6ef1984082492396e499fbe57c22dc2e99e4c475 -AUX 2.7.99.902-0001-Fix-XV-scan-line-calculation-when-rotated.patch 1562 RMD160 da7527100785a3d04ac1a16ee9315be3af674bdd SHA1 e476b1f7afdf6094e1d34a11c4334ebed71cfd56 SHA256 cdeaa91dac2a94a9da97a3c52650e23919a83c66dba2fe67dd198bf802356693 -AUX 2.7.99.902-0002-Reset-framebuffer-offset-when-rebinding-aperture-227.patch 929 RMD160 6eb70b4ec1a811a040206006487860c6443901c9 SHA1 5b845931d2864f665d72e4c7f5708686a0b63a76 SHA256 404df671263dbbc8fdd464fc2a5328e8691a575f46c82d9f7643e1f7ac742b37 -AUX 2.7.99.902-0003-Use-batch_start_atomic-to-fix-batchbuffer-wrapping-p.patch 12168 RMD160 c5d7585f4f7669e14af615442d42aaae5a9f0356 SHA1 0d7cd9449b11a553994b21e680a43277a3e157c5 SHA256 469761e23335ab6d26f99ee1cee71d0683720fd3b6d6bd9a9af8e7596b82bafb -AUX 2.7.99.902-0004-Fix-915-class-Render-after-the-8xx-class-Render-fix.patch 3742 RMD160 9edf20437b7cb498fc01e6fc4648891c9a964f65 SHA1 adeb628a12e505a6dc36afc687d551235862bbb3 SHA256 fc14902689710349af25427656078a77a922d5c57d9bb0d42458450e3a08a864 -AUX 2.7.99.902-0005-Really-fix-i915-render.-Fail-at-commit-amend.patch 2717 RMD160 609e9ba7c85cec0e1bf267f60d96ca00821c5185 SHA1 0bb9f5b9196d9b7539e40265ff22ff67bfdd57b0 SHA256 74c194342a2fd516146ed6a061575007eec975699ab3e782161d760be9c739f1 -AUX 2.7.99.902-0006-accessing-a-pixmap-if-prepare_access-fails-is-verbot.patch 1181 RMD160 93dc9f717a73fffa506ddefed385a5ccf0d91a97 SHA1 129d243fe03873ff474cb6589cc11956f7e41df3 SHA256 d4c3a58918d58f192ed2add22d18437e3e5de665b133ff1c71eb989fb1f104c5 -AUX 2.7.99.902-0007-Update-to-xextproto-7.1-support.patch 5021 RMD160 a003b7cb1c7f914345134ad2a19fdaaad20dbccf SHA1 9cbfe46bdb34134fc871d948ca3d7259678466f0 SHA256 e90e48b506e3f4976a0b36c5820aae7e04d06574e3e362c881f27100a9bc08ca AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347 -DIST xf86-video-intel-2.4.3.tar.bz2 661105 RMD160 0d4fe4b7d517d1740c80fe61a8fc44af604ec60e SHA1 8335294c9b76b1f9daad5082d2290555ba2dbce5 SHA256 1752a0f6f5fd28f5c8581f6411f37df7fde5fd4a0bbedc4bf423f9824423afcd -DIST xf86-video-intel-2.5.1.tar.bz2 716182 RMD160 f1d4b438931b564233dc4f76e3cb7fa1b9801aa2 SHA1 58f6f005a698e63cb34ba1b011b0ddce0b0b3862 SHA256 c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313 DIST xf86-video-intel-2.6.3.tar.bz2 790275 RMD160 7b31866c2fd42fbb2d46efb137bf968d80221fb1 SHA1 96fe7e8b804ab8833b1d462f99c08be29bb9e283 SHA256 b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258 DIST xf86-video-intel-2.7.1.tar.bz2 780625 RMD160 25208fe03f0fe849974a703f4a81e734e67cad18 SHA1 f863ee65b4b7779077af9f819b07033264284628 SHA256 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 -DIST xf86-video-intel-2.7.99.902.tar.bz2 749574 RMD160 101c437c6e22f7367b6736e3b9acc87e75c5e999 SHA1 0d5824dea1e56da4f80771ae6089a9f078668d59 SHA256 b847203c381968ec57de52c7da1878716c8e82da940130f248942865913720d0 -DIST xf86-video-intel-2.8.0.tar.bz2 750394 RMD160 da08598a0f19bab17f014a8ef84ccfbe028ae023 SHA1 77ea9054e46662d84d5b33a088a48cb175662915 SHA256 35892e804c58af82ac8ab857dd5ca7731fed728603dc1975cb067e99f96e75a1 DIST xf86-video-intel-2.8.1.tar.bz2 748928 RMD160 9416290dcbc7631f165a3378bf7aa189a1dea880 SHA1 76ae4c8fbd14a7a16e3f8dc2f2588947635db2bc SHA256 c6778fc7e43c701d5829514329ee70f5dc539ff8f5b3c79587577b617a535c81 DIST xf86-video-intel-2.9.0.tar.bz2 791890 RMD160 71fbffb7ddbaf320c146b98d34d47422cd36980e SHA1 62e29344824a5de421178fec568d7ff0688309f8 SHA256 69f4f4992ceee24ab3dace23abdd995c2fc776538732d7e2457b7c21b8142e51 -EBUILD xf86-video-intel-2.4.3.ebuild 813 RMD160 b5f5c33a1ab316648293884c6c2dae071537e2cd SHA1 a0ff1d4b0eb69755cfef75edc2d664e5edfdddf9 SHA256 ac174dea13fe6748ae929bc8a3b9b2f862186946b5e82bb88b54261868ddbc63 -EBUILD xf86-video-intel-2.5.1-r1.ebuild 917 RMD160 011db76a0fbeb6a2df73cf4a77d6da6ebcc40809 SHA1 2ede1c90d2c2045b1ec5312a6e348f3b8d7ca4fb SHA256 51051e0bbdce98b798723e867f2c07e6f51f3df810c39edca49a6a04ca168602 EBUILD xf86-video-intel-2.6.3-r1.ebuild 972 RMD160 a33e6cbb3d14a837e54e2cb3c520ef34a0fd86fb SHA1 98273299cb4a32b87dbcf1105fbbc146115ac52b SHA256 9618a7f6a25aebc3e53ebccce0bdd87ce1c5e675875453ab190fcac84a3405ce EBUILD xf86-video-intel-2.7.1.ebuild 808 RMD160 b3ea159f250693c41ffe0779b0f509173c983ceb SHA1 39eac29032ff5774dbdf2493cb745ab4f7d7bb22 SHA256 d9b0176904e8ce6682e2f725f49905519b764410f1ef1701f6e2e904587db85d -EBUILD xf86-video-intel-2.7.99.902-r1.ebuild 1377 RMD160 d6f3722ea3e700a1b6e273f19f4445d87cb45979 SHA1 0859daf659ecabd41bcf9eb76ce176fbb505a2df SHA256 632184cd6e772c4e7119d1fc4effed8524c0a687118abef27f76ff8dd2b31394 -EBUILD xf86-video-intel-2.8.0.ebuild 809 RMD160 100849761516a6e6a3b8091dcb27673c1307cbdb SHA1 a4446fbff052e97122b62e9d6b87c0cf658d3d51 SHA256 bf6e2b04e05450b8aad2841408183a68e80be99722ae10ba59f9db3d3b256412 EBUILD xf86-video-intel-2.8.1.ebuild 808 RMD160 c1a4856720ac75c7040d5c4cd3cf1786b97e14a6 SHA1 99234ae6c3ecca8ef977460e3d983a0659c40f19 SHA256 6f6c28dc383ee6b904eeb4823299159dcb8fef3e0a5699dc7f1ab481284fc6c9 EBUILD xf86-video-intel-2.9.0.ebuild 855 RMD160 aae1a09b97dab3264ed67f75d21279318a392cbe SHA1 dbf348ed3cc429e98e2de7bbac0d219d768a4c15 SHA256 fdbc5148843c3483f339162cf30d571f19e0a09742809b5f20ff14263a0c5636 -MISC ChangeLog 35461 RMD160 08c18800677b92061de1ec1b0686ee5a68226aad SHA1 e1f1894465e4f7f5ca51b5fedd751af682d00dec SHA256 96b1d6bd1588d891b70900762b8428a67a014ae83f545fcb58dc64d7cc9687e8 +MISC ChangeLog 36753 RMD160 2cff7b46797c62b8be04f1cd7573a7cc3c895316 SHA1 2095dfa5868f97fa6ff1745c883ed7125cdbefb3 SHA256 aa16c0f926875cb83d24a07a445e5a0e9e72fdb6167db209be1a8a23b32a5818 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrJ9pgACgkQNQqtfCuFneOt+wCeNrU0sszHbkh1VPvX1hHMl2Be -KTAAn3IX+foxV3KhiHyoQN+8K2I7OiZ3 -=EJm2 ------END PGP SIGNATURE----- diff --git a/x11-drivers/xf86-video-intel/files/2.1.1-fix_build_without_dri.patch b/x11-drivers/xf86-video-intel/files/2.1.1-fix_build_without_dri.patch deleted file mode 100644 index bc06c9755b04..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.1.1-fix_build_without_dri.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> -Date: Thu, 3 Jan 2008 19:16:15 +0000 (-0800) -Subject: Fix compilation error when not using DRI -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=f2ffc0f6e038357dda268363e52c11ada1d0b810 - -Fix compilation error when not using DRI - -This patch complements 88f8b688e2316ae4a1f7485f0010ce90de54783a which -added uint64_t typed variables to avoid unsigned long overflows in -32-bit architectures but didn't include <stdint.h> with the required -definition. - -When XF86DRI and _XF86DRI_SERVER_ are defined this header gets -indirectly included through "i830_dri.h", thanks to "i830_common.h" -which masquerades this problem as released in 2.1.0 and that manifests -with : - -In file included from i810_driver.c:88: -i830.h:137: error: expected specifier-qualifier-list before 'uint64_t' -i830.h:240: error: expected specifier-qualifier-list before 'uint64_t' - -Patch from Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> ---- - ---- a/src/i830.h -+++ b/src/i830.h -@@ -40,6 +40,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #define I830DEBUG - #endif - -+#include <stdint.h> -+ - #ifndef REMAP_RESERVED - #define REMAP_RESERVED 0 - #endif diff --git a/x11-drivers/xf86-video-intel/files/2.2.1-0001-fixup-pciaccess-version-detect.patch b/x11-drivers/xf86-video-intel/files/2.2.1-0001-fixup-pciaccess-version-detect.patch deleted file mode 100644 index 0644a02c11b1..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.2.1-0001-fixup-pciaccess-version-detect.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 13ae79b415d944891cfdc2cd2d5397fec36a4e8e Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Fri, 7 Mar 2008 08:04:37 +1000 -Subject: [PATCH] fixup pciaccess version detect - ---- - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9e7c5b9..da44018 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -115,9 +115,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - CFLAGS="$save_CFLAGS" - - if test x$XSERVER_LIBPCIACCESS = xyes; then -- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0]) -+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) - else -- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0], -+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10], - have_libpciaccess=yes, - have_libpciaccess=no) - fi --- -1.5.4.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.3.2-0001-intel-fix-drm-check.patch b/x11-drivers/xf86-video-intel/files/2.3.2-0001-intel-fix-drm-check.patch deleted file mode 100644 index 8ae16e3ae25e..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.3.2-0001-intel-fix-drm-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 55678c64bc6e3ed613ea6db14c105c18a0cf28ce Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@linux.ie> -Date: Tue, 1 Jul 2008 18:51:18 +1000 -Subject: [PATCH] intel: fix drm check. - -The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed -with GEM etc. ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index af87299..2dabd4f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -201,7 +201,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.3.1],[DRI_MM=yes], [DRI_MM=no]) -+ PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no]) - if test "x$DRI_MM" = xyes; then - AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management]) - fi --- -1.5.5.4 - diff --git a/x11-drivers/xf86-video-intel/files/2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch b/x11-drivers/xf86-video-intel/files/2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch deleted file mode 100644 index 8084a5761dd6..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.4.3-0001-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.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch b/x11-drivers/xf86-video-intel/files/2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch deleted file mode 100644 index 132acca1a206..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 63ca3cc11b28f328aafc4564f5df51698e09a7d3 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Fri, 14 Nov 2008 13:55:52 +0100 -Subject: [PATCH] clean up man page generation and remove all traces of the i810 driver - ---- - man/Makefile.am | 20 ++------------------ - src/Makefile.am | 6 ------ - src/i810.h | 1 - - src/i810_driver.c | 19 +------------------ - 4 files changed, 3 insertions(+), 43 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 7432d5a..ac08621 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -25,21 +25,12 @@ - # - - drivermandir = $(DRIVER_MAN_DIR) -+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) - --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@ -- --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 -@@ -60,10 +51,3 @@ 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@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 232ac53..8e3cfad 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -222,9 +222,3 @@ if XVMC - 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) -- --uninstall-local: -- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) -diff --git a/src/i810.h b/src/i810.h -index 7ea2043..c88771e 100644 ---- a/src/i810.h -+++ b/src/i810.h -@@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #define I810_VERSION 4000 - #define I810_NAME "intel" - #define I810_DRIVER_NAME "intel" --#define I810_LEGACY_DRIVER_NAME "i810" - - #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR - #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR -diff --git a/src/i810_driver.c b/src/i810_driver.c -index cc28ad8..404789d 100644 ---- a/src/i810_driver.c -+++ b/src/i810_driver.c -@@ -466,21 +466,6 @@ static XF86ModuleVersionInfo intelVersRec = { - - _X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL }; - --static XF86ModuleVersionInfo i810VersRec = { -- "i810", -- MODULEVENDORSTRING, -- MODINFOSTRING1, -- MODINFOSTRING2, -- XORG_VERSION_CURRENT, -- INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, -- ABI_CLASS_VIDEODRV, -- ABI_VIDEODRV_VERSION, -- MOD_CLASS_VIDEODRV, -- {0, 0, 0, 0} --}; -- --_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL }; -- - static pointer - i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) - { -@@ -715,9 +700,7 @@ I810Probe(DriverPtr drv, int flags) - * driver, and return if there are none. - */ - if ((numDevSections = -- xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 && -- (numDevSections = -- xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) { -+ xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) { - return FALSE; - } - --- -1.6.0.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch b/x11-drivers/xf86-video-intel/files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch deleted file mode 100644 index 599e21b4ae39..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cd63414bc0efa0b9f1691e28be9ddfca9fef0486 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Mon, 24 Nov 2008 13:31:20 +0100 -Subject: [PATCH] include <X11/Xmd.h> to define CARD16 needed by edid.h - ---- - src/bios_reader/bios_reader.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c -index 2a6906d..1e41778 100644 ---- a/src/bios_reader/bios_reader.c -+++ b/src/bios_reader/bios_reader.c -@@ -38,9 +38,11 @@ - - #include "../i830_bios.h" - --typedef uint8_t CARD8; --typedef uint16_t CARD16; --typedef uint32_t CARD32; -+/* backwards compatibility with edid.h from xorg-server 1.5 and older */ -+#ifndef CARD16 -+#include <X11/Xmd.h> -+#endif -+ - #define _PARSE_EDID_ - #include "edid.h" - --- -1.6.0.4 - diff --git a/x11-drivers/xf86-video-intel/files/2.6.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch b/x11-drivers/xf86-video-intel/files/2.6.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch deleted file mode 100644 index 132acca1a206..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.6.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 63ca3cc11b28f328aafc4564f5df51698e09a7d3 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Fri, 14 Nov 2008 13:55:52 +0100 -Subject: [PATCH] clean up man page generation and remove all traces of the i810 driver - ---- - man/Makefile.am | 20 ++------------------ - src/Makefile.am | 6 ------ - src/i810.h | 1 - - src/i810_driver.c | 19 +------------------ - 4 files changed, 3 insertions(+), 43 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 7432d5a..ac08621 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -25,21 +25,12 @@ - # - - drivermandir = $(DRIVER_MAN_DIR) -+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) - --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@ -- --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 -@@ -60,10 +51,3 @@ 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@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 232ac53..8e3cfad 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -222,9 +222,3 @@ if XVMC - 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) -- --uninstall-local: -- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) -diff --git a/src/i810.h b/src/i810.h -index 7ea2043..c88771e 100644 ---- a/src/i810.h -+++ b/src/i810.h -@@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #define I810_VERSION 4000 - #define I810_NAME "intel" - #define I810_DRIVER_NAME "intel" --#define I810_LEGACY_DRIVER_NAME "i810" - - #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR - #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR -diff --git a/src/i810_driver.c b/src/i810_driver.c -index cc28ad8..404789d 100644 ---- a/src/i810_driver.c -+++ b/src/i810_driver.c -@@ -466,21 +466,6 @@ static XF86ModuleVersionInfo intelVersRec = { - - _X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL }; - --static XF86ModuleVersionInfo i810VersRec = { -- "i810", -- MODULEVENDORSTRING, -- MODINFOSTRING1, -- MODINFOSTRING2, -- XORG_VERSION_CURRENT, -- INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, -- ABI_CLASS_VIDEODRV, -- ABI_VIDEODRV_VERSION, -- MOD_CLASS_VIDEODRV, -- {0, 0, 0, 0} --}; -- --_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL }; -- - static pointer - i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) - { -@@ -715,9 +700,7 @@ I810Probe(DriverPtr drv, int flags) - * driver, and return if there are none. - */ - if ((numDevSections = -- xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 && -- (numDevSections = -- xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) { -+ xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) { - return FALSE; - } - --- -1.6.0.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.0-0001-KMS-hook-up-output-properties-for-randr.patch b/x11-drivers/xf86-video-intel/files/2.7.0-0001-KMS-hook-up-output-properties-for-randr.patch deleted file mode 100644 index 61727fbfc758..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.0-0001-KMS-hook-up-output-properties-for-randr.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 296a986e5258e2fd13ec494071b7063bd639cd68 Mon Sep 17 00:00:00 2001 -From: Zhenyu Wang <zhenyu.z.wang@intel.com> -Date: Mon, 23 Mar 2009 19:19:58 +0800 -Subject: [PATCH 1/1] KMS: hook up output properties for randr - -This gets output properties from kernel, then hook them up -for randr. So we can control output properties through randr -like in UMS. - -Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> ---- - src/drmmode_display.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 171 insertions(+), 0 deletions(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index a276ff7..7b97a64 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -35,6 +35,7 @@ - #include "i830.h" - #include "intel_bufmgr.h" - #include "xf86drmMode.h" -+#include "X11/Xatom.h" - - typedef struct { - int fd; -@@ -52,11 +53,20 @@ typedef struct { - } drmmode_crtc_private_rec, *drmmode_crtc_private_ptr; - - typedef struct { -+ drmModePropertyPtr mode_prop; -+ uint64_t value; -+ int num_atoms; /* if range prop, num_atoms == 1; if enum prop, num_atoms == num_enums + 1 */ -+ Atom *atoms; -+} drmmode_prop_rec, *drmmode_prop_ptr; -+ -+typedef struct { - drmmode_ptr drmmode; - int output_id; - drmModeConnectorPtr mode_output; - drmModeEncoderPtr mode_encoder; - drmModePropertyBlobPtr edid_blob; -+ int num_props; -+ drmmode_prop_ptr props; - } drmmode_output_private_rec, *drmmode_output_private_ptr; - - static void -@@ -508,9 +518,15 @@ static void - drmmode_output_destroy(xf86OutputPtr output) - { - drmmode_output_private_ptr drmmode_output = output->driver_private; -+ int i; - - if (drmmode_output->edid_blob) - drmModeFreePropertyBlob(drmmode_output->edid_blob); -+ for (i = 0; i < drmmode_output->num_props; i++) { -+ drmModeFreeProperty(drmmode_output->props[i].mode_prop); -+ xfree(drmmode_output->props[i].atoms); -+ } -+ xfree(drmmode_output->props); - drmModeFreeConnector(drmmode_output->mode_output); - xfree(drmmode_output); - output->driver_private = NULL; -@@ -542,7 +558,162 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) - } - } - -+static Bool -+drmmode_property_ignore(drmModePropertyPtr prop) -+{ -+ if (!prop) -+ return TRUE; -+ /* ignore blob prop */ -+ if (prop->flags & DRM_MODE_PROP_BLOB) -+ return TRUE; -+ /* ignore standard property */ -+ if (!strcmp(prop->name, "EDID") || -+ !strcmp(prop->name, "DPMS")) -+ return TRUE; -+ -+ return FALSE; -+} -+ -+static void -+drmmode_output_create_resources(xf86OutputPtr output) -+{ -+ drmmode_output_private_ptr drmmode_output = output->driver_private; -+ drmModeConnectorPtr mode_output = drmmode_output->mode_output; -+ drmmode_ptr drmmode = drmmode_output->drmmode; -+ drmModePropertyPtr drmmode_prop; -+ int i, j, err; -+ -+ drmmode_output->props = xcalloc(mode_output->count_props, sizeof(drmmode_prop_rec)); -+ if (!drmmode_output->props) -+ return; -+ -+ drmmode_output->num_props = 0; -+ for (i = 0, j = 0; i < mode_output->count_props; i++) { -+ drmmode_prop = drmModeGetProperty(drmmode->fd, mode_output->props[i]); -+ if (drmmode_property_ignore(drmmode_prop)) { -+ drmModeFreeProperty(drmmode_prop); -+ continue; -+ } -+ drmmode_output->props[j].mode_prop = drmmode_prop; -+ drmmode_output->props[j].value = mode_output->prop_values[i]; -+ drmmode_output->num_props++; -+ j++; -+ } -+ -+ for (i = 0; i < drmmode_output->num_props; i++) { -+ drmmode_prop_ptr p = &drmmode_output->props[i]; -+ drmmode_prop = p->mode_prop; -+ -+ if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) { -+ INT32 range[2]; -+ -+ p->num_atoms = 1; -+ p->atoms = xcalloc(p->num_atoms, sizeof(Atom)); -+ if (!p->atoms) -+ continue; -+ p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE); -+ range[0] = drmmode_prop->values[0]; -+ range[1] = drmmode_prop->values[1]; -+ err = RRConfigureOutputProperty(output->randr_output, p->atoms[0], -+ FALSE, TRUE, -+ drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE, -+ 2, range); -+ if (err != 0) { -+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, -+ "RRConfigureOutputProperty error, %d\n", err); -+ } -+ err = RRChangeOutputProperty(output->randr_output, p->atoms[0], -+ XA_INTEGER, 32, PropModeReplace, 1, &p->value, FALSE, TRUE); -+ if (err != 0) { -+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, -+ "RRChangeOutputProperty error, %d\n", err); -+ } -+ } else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) { -+ p->num_atoms = drmmode_prop->count_enums + 1; -+ p->atoms = xcalloc(p->num_atoms, sizeof(Atom)); -+ if (!p->atoms) -+ continue; -+ p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE); -+ for (j = 1; j <= drmmode_prop->count_enums; j++) { -+ struct drm_mode_property_enum *e = &drmmode_prop->enums[j-1]; -+ p->atoms[j] = MakeAtom(e->name, strlen(e->name), TRUE); -+ } -+ err = RRConfigureOutputProperty(output->randr_output, p->atoms[0], -+ FALSE, FALSE, -+ drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE, -+ p->num_atoms - 1, (INT32 *)&p->atoms[1]); -+ if (err != 0) { -+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, -+ "RRConfigureOutputProperty error, %d\n", err); -+ } -+ for (j = 0; j < drmmode_prop->count_enums; j++) -+ if (drmmode_prop->enums[j].value == p->value) -+ break; -+ /* there's always a matching value */ -+ err = RRChangeOutputProperty(output->randr_output, p->atoms[0], -+ XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, TRUE); -+ if (err != 0) { -+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, -+ "RRChangeOutputProperty error, %d\n", err); -+ } -+ } -+ } -+} -+ -+static Bool -+drmmode_output_set_property(xf86OutputPtr output, Atom property, -+ RRPropertyValuePtr value) -+{ -+ drmmode_output_private_ptr drmmode_output = output->driver_private; -+ drmmode_ptr drmmode = drmmode_output->drmmode; -+ int i; -+ -+ for (i = 0; i < drmmode_output->num_props; i++) { -+ drmmode_prop_ptr p = &drmmode_output->props[i]; -+ -+ if (p->atoms[0] != property) -+ continue; -+ -+ if (p->mode_prop->flags & DRM_MODE_PROP_RANGE) { -+ uint32_t val; -+ -+ if (value->type != XA_INTEGER || value->format != 32 || -+ value->size != 1) -+ return FALSE; -+ val = *(uint32_t *)value->data; -+ -+ drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id, -+ p->mode_prop->prop_id, (uint64_t)val); -+ return TRUE; -+ } else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) { -+ Atom atom; -+ const char *name; -+ int j; -+ -+ if (value->type != XA_ATOM || value->format != 32 || value->size != 1) -+ return FALSE; -+ memcpy(&atom, value->data, 4); -+ name = NameForAtom(atom); -+ -+ /* search for matching name string, then set its value down */ -+ for (j = 0; j < p->mode_prop->count_enums; j++) { -+ if (!strcmp(p->mode_prop->enums[j].name, name)) { -+ drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id, -+ p->mode_prop->prop_id, p->mode_prop->enums[j].value); -+ return TRUE; -+ } -+ } -+ } -+ } -+ /* no property found? */ -+ return FALSE; -+} -+ - static const xf86OutputFuncsRec drmmode_output_funcs = { -+ .create_resources = drmmode_output_create_resources, -+#ifdef RANDR_12_INTERFACE -+ .set_property = drmmode_output_set_property, -+#endif - .dpms = drmmode_output_dpms, - #if 0 - --- -1.6.2.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.99.902-0001-Fix-XV-scan-line-calculation-when-rotated.patch b/x11-drivers/xf86-video-intel/files/2.7.99.902-0001-Fix-XV-scan-line-calculation-when-rotated.patch deleted file mode 100644 index fcf38da59624..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.99.902-0001-Fix-XV-scan-line-calculation-when-rotated.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b74bf3f9a65af9e72921d4e9028d9d4d023f8bc6 Mon Sep 17 00:00:00 2001 -From: Barry Scott <barry.scott@onelan.co.uk> -Date: Mon, 13 Jul 2009 16:34:20 -0700 -Subject: [PATCH 1/7] Fix XV scan line calculation when rotated. - ---- - src/i830_video.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/i830_video.c b/src/i830_video.c -index 4bba902..92b6324 100644 ---- a/src/i830_video.c -+++ b/src/i830_video.c -@@ -2539,7 +2539,7 @@ I830PutImage(ScrnInfoPtr pScrn, - - if (sync) { - BoxPtr box; -- int y1, y2; -+ pixman_box16_t box_in_crtc_coordinates; - int pipe = -1, event, load_scan_lines_pipe; - - if (pixmap_is_scanout(pPixmap)) -@@ -2555,16 +2555,17 @@ I830PutImage(ScrnInfoPtr pScrn, - } - - box = REGION_EXTENTS(unused, clipBoxes); -- y1 = box->y1 - crtc->y; -- y2 = box->y2 - crtc->y; -+ box_in_crtc_coordinates = *box; -+ if (crtc->transform_in_use) -+ pixman_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &box_in_crtc_coordinates); - - BEGIN_BATCH(5); - /* The documentation says that the LOAD_SCAN_LINES command - * always comes in pairs. Don't ask me why. */ - OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe); -- OUT_BATCH((y1 << 16) | y2); -+ OUT_BATCH((box_in_crtc_coordinates.y1 << 16) | box_in_crtc_coordinates.y2); - OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe); -- OUT_BATCH((y1 << 16) | y2); -+ OUT_BATCH((box_in_crtc_coordinates.y1 << 16) | box_in_crtc_coordinates.y2); - OUT_BATCH(MI_WAIT_FOR_EVENT | event); - ADVANCE_BATCH(); - } --- -1.6.3.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.99.902-0002-Reset-framebuffer-offset-when-rebinding-aperture-227.patch b/x11-drivers/xf86-video-intel/files/2.7.99.902-0002-Reset-framebuffer-offset-when-rebinding-aperture-227.patch deleted file mode 100644 index 72d34c568e43..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.99.902-0002-Reset-framebuffer-offset-when-rebinding-aperture-227.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e386e7b14b139f15205e14b173e8222bf38d9e18 Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Wed, 15 Jul 2009 09:43:04 -0700 -Subject: [PATCH 2/7] Reset framebuffer offset when rebinding aperture (22760). - -scrn->fbOffset may be changed when binding objects to the aperture during -server initialization or VT enter. This was accidentally removed when the -NoAlloc option was eliminated. - -Signed-off-by: Keith Packard <keithp@keithp.com> ---- - src/i830_memory.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/i830_memory.c b/src/i830_memory.c -index f2f3966..cc9d376 100644 ---- a/src/i830_memory.c -+++ b/src/i830_memory.c -@@ -1581,6 +1581,9 @@ i830_bind_all_memory(ScrnInfoPtr pScrn) - i830_update_cursor_offsets(pScrn); - i830_set_max_gtt_map_size(pScrn); - -+ if (pI830->front_buffer) -+ pScrn->fbOffset = pI830->front_buffer->offset; -+ - return TRUE; - } - --- -1.6.3.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.99.902-0003-Use-batch_start_atomic-to-fix-batchbuffer-wrapping-p.patch b/x11-drivers/xf86-video-intel/files/2.7.99.902-0003-Use-batch_start_atomic-to-fix-batchbuffer-wrapping-p.patch deleted file mode 100644 index 5ed5fbc8982c..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.99.902-0003-Use-batch_start_atomic-to-fix-batchbuffer-wrapping-p.patch +++ /dev/null @@ -1,377 +0,0 @@ -From a1e6abb5ca89d699144d10fdc4309b3b78f2f7a9 Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Wed, 15 Jul 2009 14:15:10 -0700 -Subject: [PATCH 3/7] Use batch_start_atomic to fix batchbuffer wrapping problems with 8xx render. - -Bug #22483. ---- - src/i830.h | 9 +++ - src/i830_driver.c | 2 +- - src/i830_render.c | 201 ++++++++++++++++++++++++++++++----------------------- - 3 files changed, 123 insertions(+), 89 deletions(-) - -diff --git a/src/i830.h b/src/i830.h -index f7ca687..ec57662 100644 ---- a/src/i830.h -+++ b/src/i830.h -@@ -468,6 +468,14 @@ typedef struct _I830Rec { - /** Transform pointers for src/mask, or NULL if identity */ - PictTransform *transform[2]; - float coord_adjust; -+ -+ /* i830 render accel state */ -+ PixmapPtr render_src, render_mask, render_dst; -+ PicturePtr render_src_picture, render_mask_picture, render_dst_picture; -+ uint32_t render_dst_format; -+ Bool needs_render_state_emit; -+ uint32_t cblend, ablend, s8_blendctl; -+ - /* i915 render accel state */ - uint32_t mapstate[6]; - uint32_t samplerstate[6]; -@@ -790,6 +798,7 @@ Bool i915_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask, - void i915_composite(PixmapPtr pDst, int srcX, int srcY, - int maskX, int maskY, int dstX, int dstY, int w, int h); - void i915_batch_flush_notify(ScrnInfoPtr pScrn); -+void i830_batch_flush_notify(ScrnInfoPtr scrn); - /* i965_render.c */ - unsigned int gen4_render_state_size(ScrnInfoPtr pScrn); - void gen4_render_state_init(ScrnInfoPtr pScrn); -diff --git a/src/i830_driver.c b/src/i830_driver.c -index dfc2bdf..33079fe 100644 ---- a/src/i830_driver.c -+++ b/src/i830_driver.c -@@ -2757,7 +2757,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - else if (IS_I9XX(pI830)) - pI830->batch_flush_notify = i915_batch_flush_notify; - else -- pI830->batch_flush_notify = NULL; -+ pI830->batch_flush_notify = i830_batch_flush_notify; - - miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); -diff --git a/src/i830_render.c b/src/i830_render.c -index b1d6f50..ecee6f2 100644 ---- a/src/i830_render.c -+++ b/src/i830_render.c -@@ -255,7 +255,7 @@ i8xx_get_card_format(PicturePtr pPict) - FatalError("Unsupported format type %d\n", pPict->format); - } - --static Bool -+static void - i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit) - { - -@@ -299,7 +299,7 @@ i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit) - break; - default: - filter = 0; -- I830FALLBACK("Bad filter 0x%x\n", pPict->filter); -+ FatalError("Bad filter 0x%x\n", pPict->filter); - } - filter |= (MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT); - -@@ -344,10 +344,6 @@ i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit) - TEX_STREAM_MAP_IDX(unit)); - ADVANCE_BATCH(); - } -- -- i830_debug_sync(pScrn); -- -- return TRUE; - } - - Bool -@@ -391,29 +387,27 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture, - { - ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); -- uint32_t dst_format, dst_pitch; - Bool is_affine_src, is_affine_mask; - Bool is_nearest = FALSE; - -+ pI830->render_src_picture = pSrcPicture; -+ pI830->render_src = pSrc; -+ pI830->render_mask_picture = pMaskPicture; -+ pI830->render_mask = pMask; -+ pI830->render_dst_picture = pDstPicture; -+ pI830->render_dst = pDst; -+ - i830_exa_check_pitch_3d(pSrc); - if (pMask) - i830_exa_check_pitch_3d(pMask); - i830_exa_check_pitch_3d(pDst); - -- IntelEmitInvarientState(pScrn); -- pI830->last_3d = LAST_3D_RENDER; -- -- if (!i830_get_dest_format(pDstPicture, &dst_format)) -+ if (!i830_get_dest_format(pDstPicture, &pI830->render_dst_format)) - return FALSE; -- dst_pitch = intel_get_pixmap_pitch(pDst); - -- if (!i830_texture_setup(pSrcPicture, pSrc, 0)) -- I830FALLBACK("fail to setup src texture\n"); - if (pSrcPicture->filter == PictFilterNearest) - is_nearest = TRUE; - if (pMask != NULL) { -- if (!i830_texture_setup(pMaskPicture, pMask, 1)) -- I830FALLBACK("fail to setup mask texture\n"); - if (pMaskPicture->filter == PictFilterNearest) - is_nearest = TRUE; - } else { -@@ -434,45 +428,7 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture, - I830FALLBACK("non-affine transform unsupported on 8xx hardware\n"); - - { -- uint32_t cblend, ablend, blendctl, vf2; -- -- BEGIN_BATCH(30); -- -- /* color buffer */ -- OUT_BATCH(_3DSTATE_BUF_INFO_CMD); -- OUT_BATCH(BUF_3D_ID_COLOR_BACK| BUF_3D_USE_FENCE | -- BUF_3D_PITCH(dst_pitch)); -- OUT_RELOC_PIXMAP(pDst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); -- OUT_BATCH(MI_NOOP); -- -- OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD); -- OUT_BATCH(dst_format); -- -- /* defaults */ -- OUT_BATCH(_3DSTATE_DFLT_Z_CMD); -- OUT_BATCH(0); -- -- OUT_BATCH(_3DSTATE_DFLT_DIFFUSE_CMD); -- OUT_BATCH(0); -- -- OUT_BATCH(_3DSTATE_DFLT_SPEC_CMD); -- OUT_BATCH(0); -- -- OUT_BATCH(_3DSTATE_DRAW_RECT_CMD); -- OUT_BATCH(0); -- OUT_BATCH(0); /* ymin, xmin */ -- OUT_BATCH(DRAW_YMAX(pDst->drawable.height - 1) | -- DRAW_XMAX(pDst->drawable.width - 1)); -- OUT_BATCH(0); /* yorig, xorig */ -- -- OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) | -- I1_LOAD_S(3) | 1); -- if (pMask) -- vf2 = 2 << 12; /* 2 texture coord sets */ -- else -- vf2 = 1 << 12; -- OUT_BATCH(vf2); /* TEXCOORDFMT_2D */ -- OUT_BATCH(S3_CULLMODE_NONE | S3_VERTEXHAS_XY); -+ uint32_t cblend, ablend, blendctl; - - /* If component alpha is active in the mask and the blend operation - * uses the source alpha, then we know we don't need the source -@@ -541,36 +497,90 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture, - ablend |= TB0A_ARG2_SEL_ONE; - } - -- OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 | -- LOAD_TEXTURE_BLEND_STAGE(0)|1); -- OUT_BATCH(cblend); -- OUT_BATCH(ablend); -- OUT_BATCH(0); -- - blendctl = i830_get_blend_cntl(op, pMaskPicture, pDstPicture->format); -- OUT_BATCH(_3DSTATE_INDPT_ALPHA_BLEND_CMD | DISABLE_INDPT_ALPHA_BLEND); -- OUT_BATCH(MI_NOOP); -- OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(8) | 0); -- OUT_BATCH(S8_ENABLE_COLOR_BLEND | S8_BLENDFUNC_ADD | blendctl | -- S8_ENABLE_COLOR_BUFFER_WRITE); -- -- OUT_BATCH(_3DSTATE_ENABLES_1_CMD | DISABLE_LOGIC_OP | -- DISABLE_STENCIL_TEST | DISABLE_DEPTH_BIAS | -- DISABLE_SPEC_ADD | DISABLE_FOG | DISABLE_ALPHA_TEST | -- ENABLE_COLOR_BLEND | DISABLE_DEPTH_TEST); -- /* We have to explicitly say we don't want write disabled */ -- OUT_BATCH(_3DSTATE_ENABLES_2_CMD | ENABLE_COLOR_MASK | -- DISABLE_STENCIL_WRITE | ENABLE_TEX_CACHE | -- DISABLE_DITHER | ENABLE_COLOR_WRITE | -- DISABLE_DEPTH_WRITE); -- ADVANCE_BATCH(); -+ -+ pI830->cblend = cblend; -+ pI830->ablend = ablend; -+ pI830->s8_blendctl = blendctl; - } - - i830_debug_sync(pScrn); - -+ pI830->needs_render_state_emit = TRUE; -+ - return TRUE; - } - -+static void -+i830_emit_composite_state(ScrnInfoPtr pScrn) -+{ -+ I830Ptr pI830 = I830PTR(pScrn); -+ uint32_t vf2; -+ -+ pI830->needs_render_state_emit = FALSE; -+ -+ IntelEmitInvarientState(pScrn); -+ pI830->last_3d = LAST_3D_RENDER; -+ -+ BEGIN_BATCH(24); -+ -+ OUT_BATCH(_3DSTATE_BUF_INFO_CMD); -+ OUT_BATCH(BUF_3D_ID_COLOR_BACK| BUF_3D_USE_FENCE | -+ BUF_3D_PITCH(intel_get_pixmap_pitch(pI830->render_dst))); -+ OUT_RELOC_PIXMAP(pI830->render_dst, -+ I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); -+ OUT_BATCH(MI_NOOP); -+ -+ OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD); -+ OUT_BATCH(pI830->render_dst_format); -+ -+ OUT_BATCH(_3DSTATE_DRAW_RECT_CMD); -+ OUT_BATCH(0); -+ OUT_BATCH(0); /* ymin, xmin */ -+ OUT_BATCH(DRAW_YMAX(pI830->render_dst->drawable.height - 1) | -+ DRAW_XMAX(pI830->render_dst->drawable.width - 1)); -+ OUT_BATCH(0); /* yorig, xorig */ -+ -+ OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | -+ I1_LOAD_S(2) | -+ I1_LOAD_S(3) | 1); -+ if (pI830->render_mask) -+ vf2 = 2 << 12; /* 2 texture coord sets */ -+ else -+ vf2 = 1 << 12; -+ OUT_BATCH(vf2); /* TEXCOORDFMT_2D */ -+ OUT_BATCH(S3_CULLMODE_NONE | S3_VERTEXHAS_XY); -+ -+ OUT_BATCH(_3DSTATE_INDPT_ALPHA_BLEND_CMD | DISABLE_INDPT_ALPHA_BLEND); -+ OUT_BATCH(MI_NOOP); -+ OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(8) | 0); -+ OUT_BATCH(S8_ENABLE_COLOR_BLEND | S8_BLENDFUNC_ADD | pI830->s8_blendctl | -+ S8_ENABLE_COLOR_BUFFER_WRITE); -+ -+ OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 | -+ LOAD_TEXTURE_BLEND_STAGE(0)|1); -+ OUT_BATCH(pI830->cblend); -+ OUT_BATCH(pI830->ablend); -+ OUT_BATCH(0); -+ -+ OUT_BATCH(_3DSTATE_ENABLES_1_CMD | DISABLE_LOGIC_OP | -+ DISABLE_STENCIL_TEST | DISABLE_DEPTH_BIAS | -+ DISABLE_SPEC_ADD | DISABLE_FOG | DISABLE_ALPHA_TEST | -+ ENABLE_COLOR_BLEND | DISABLE_DEPTH_TEST); -+ /* We have to explicitly say we don't want write disabled */ -+ OUT_BATCH(_3DSTATE_ENABLES_2_CMD | ENABLE_COLOR_MASK | -+ DISABLE_STENCIL_WRITE | ENABLE_TEX_CACHE | -+ DISABLE_DITHER | ENABLE_COLOR_WRITE | -+ DISABLE_DEPTH_WRITE); -+ ADVANCE_BATCH(); -+ -+ i830_texture_setup(pI830->render_src_picture, pI830->render_src, 0); -+ if (pI830->render_mask) { -+ i830_texture_setup(pI830->render_mask_picture, -+ pI830->render_mask, 1); -+ } -+} -+ - /** - * Do a single rectangle composite operation. - * -@@ -582,7 +592,6 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - { - ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); -- Bool has_mask; - Bool is_affine_src, is_affine_mask; - int per_vertex, num_floats; - float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3]; -@@ -590,12 +599,6 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - is_affine_src = i830_transform_is_affine (pI830->transform[0]); - is_affine_mask = i830_transform_is_affine (pI830->transform[1]); - -- if (pI830->scale_units[1][0] == -1 || pI830->scale_units[1][1] == -1) { -- has_mask = FALSE; -- } else { -- has_mask = TRUE; -- } -- - per_vertex = 2; /* dest x/y */ - if (is_affine_src) - { -@@ -630,7 +633,7 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - return; - per_vertex += 4; /* src x/y/z/w */ - } -- if (has_mask) { -+ if (pI830->render_mask) { - if (is_affine_mask) { - if (!i830_get_transformed_coordinates(maskX, maskY, - pI830->transform[1], -@@ -666,6 +669,16 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - } - - num_floats = 3 * per_vertex; -+ -+ intel_batch_start_atomic(pScrn, -+ 58 + /* invarient */ -+ 24 + /* setup */ -+ 20 + /* 2 * setup_texture */ -+ 6 + num_floats /* verts */); -+ -+ if (pI830->needs_render_state_emit) -+ i830_emit_composite_state(pScrn); -+ - BEGIN_BATCH(6 + num_floats); - - OUT_BATCH(MI_NOOP); -@@ -683,7 +696,7 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - OUT_BATCH_F(0.0); - OUT_BATCH_F(src_w[2]); - } -- if (has_mask) { -+ if (pI830->render_mask) { - OUT_BATCH_F(mask_x[2] / pI830->scale_units[1][0]); - OUT_BATCH_F(mask_y[2] / pI830->scale_units[1][1]); - if (!is_affine_mask) { -@@ -700,7 +713,7 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - OUT_BATCH_F(0.0); - OUT_BATCH_F(src_w[1]); - } -- if (has_mask) { -+ if (pI830->render_mask) { - OUT_BATCH_F(mask_x[1] / pI830->scale_units[1][0]); - OUT_BATCH_F(mask_y[1] / pI830->scale_units[1][1]); - if (!is_affine_mask) { -@@ -717,7 +730,7 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - OUT_BATCH_F(0.0); - OUT_BATCH_F(src_w[0]); - } -- if (has_mask) { -+ if (pI830->render_mask) { - OUT_BATCH_F(mask_x[0] / pI830->scale_units[1][0]); - OUT_BATCH_F(mask_y[0] / pI830->scale_units[1][1]); - if (!is_affine_mask) { -@@ -727,4 +740,16 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - } - - ADVANCE_BATCH(); -+ -+ intel_batch_end_atomic(pScrn); -+ -+ i830_debug_sync(pScrn); -+} -+ -+void -+i830_batch_flush_notify(ScrnInfoPtr scrn) -+{ -+ I830Ptr i830 = I830PTR(scrn); -+ -+ i830->needs_render_state_emit = TRUE; - } --- -1.6.3.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.99.902-0004-Fix-915-class-Render-after-the-8xx-class-Render-fix.patch b/x11-drivers/xf86-video-intel/files/2.7.99.902-0004-Fix-915-class-Render-after-the-8xx-class-Render-fix.patch deleted file mode 100644 index 8d457c1d7530..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.99.902-0004-Fix-915-class-Render-after-the-8xx-class-Render-fix.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 8dd7ccf37e2de6d80b556e6d18af244cefc1e417 Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Thu, 16 Jul 2009 11:40:51 -0700 -Subject: [PATCH 4/7] Fix 915-class Render after the 8xx-class Render fix. - -The two shared i830_composite.c, so giving i830 atomic batch support -triggered anger about starting i830's atomic area while in i915's atomic -area. Instead, split the emit-a-primitive stuff from the state emission. ---- - src/i830.h | 3 +++ - src/i830_render.c | 45 +++++++++++++++++++++++++++++---------------- - src/i915_render.c | 3 ++- - 3 files changed, 34 insertions(+), 17 deletions(-) - -diff --git a/src/i830.h b/src/i830.h -index ec57662..54dddd8 100644 ---- a/src/i830.h -+++ b/src/i830.h -@@ -788,6 +788,9 @@ i830_transform_is_affine (PictTransformPtr t); - - void i830_composite(PixmapPtr pDst, int srcX, int srcY, - int maskX, int maskY, int dstX, int dstY, int w, int h); -+void i830_emit_composite_primitive(PixmapPtr pDst, int srcX, int srcY, -+ int maskX, int maskY, int dstX, int dstY, -+ int w, int h); - void i830_done_composite(PixmapPtr pDst); - /* i915_render.c */ - Bool i915_check_composite(int op, PicturePtr pSrc, PicturePtr pMask, -diff --git a/src/i830_render.c b/src/i830_render.c -index ecee6f2..c5196cc 100644 ---- a/src/i830_render.c -+++ b/src/i830_render.c -@@ -581,14 +581,10 @@ i830_emit_composite_state(ScrnInfoPtr pScrn) - } - } - --/** -- * Do a single rectangle composite operation. -- * -- * This function is shared between i830 and i915 generation code. -- */ - void --i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, -- int dstX, int dstY, int w, int h) -+i830_emit_composite_primitive(PixmapPtr pDst, int srcX, int srcY, -+ int maskX, int maskY, -+ int dstX, int dstY, int w, int h) - { - ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); -@@ -670,15 +666,6 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - - num_floats = 3 * per_vertex; - -- intel_batch_start_atomic(pScrn, -- 58 + /* invarient */ -- 24 + /* setup */ -- 20 + /* 2 * setup_texture */ -- 6 + num_floats /* verts */); -- -- if (pI830->needs_render_state_emit) -- i830_emit_composite_state(pScrn); -- - BEGIN_BATCH(6 + num_floats); - - OUT_BATCH(MI_NOOP); -@@ -740,6 +727,32 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - } - - ADVANCE_BATCH(); -+} -+ -+ -+/** -+ * Do a single rectangle composite operation. -+ * -+ * This function is shared between i830 and i915 generation code. -+ */ -+void -+i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, -+ int dstX, int dstY, int w, int h) -+{ -+ ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; -+ I830Ptr pI830 = I830PTR(pScrn); -+ -+ intel_batch_start_atomic(pScrn, -+ 58 + /* invarient */ -+ 24 + /* setup */ -+ 20 + /* 2 * setup_texture */ -+ 6 + 30 /* verts */); -+ -+ if (pI830->needs_render_state_emit) -+ i830_emit_composite_state(pScrn); -+ -+ i830_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX, dstY, -+ w, h); - - intel_batch_end_atomic(pScrn); - -diff --git a/src/i915_render.c b/src/i915_render.c -index ab04e9c..2d11986 100644 ---- a/src/i915_render.c -+++ b/src/i915_render.c -@@ -556,7 +556,8 @@ i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, - if (pI830->i915_render_state.needs_emit) - i915_emit_composite_setup(pScrn); - -- i830_composite(pDst, srcX, srcY, maskX, maskY, dstX, dstY, w, h); -+ i830_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX, dstY, -+ w, h); - - intel_batch_end_atomic(pScrn); - } --- -1.6.3.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.99.902-0005-Really-fix-i915-render.-Fail-at-commit-amend.patch b/x11-drivers/xf86-video-intel/files/2.7.99.902-0005-Really-fix-i915-render.-Fail-at-commit-amend.patch deleted file mode 100644 index 38263027a980..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.99.902-0005-Really-fix-i915-render.-Fail-at-commit-amend.patch +++ /dev/null @@ -1,76 +0,0 @@ -From bb3007384298cb57625ec0b3868dff9b23568f3e Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Thu, 16 Jul 2009 12:56:07 -0700 -Subject: [PATCH 5/7] Really fix i915 render. Fail at commit --amend. - ---- - src/i830.h | 2 -- - src/i915_render.c | 25 +++++++++++++------------ - 2 files changed, 13 insertions(+), 14 deletions(-) - -diff --git a/src/i830.h b/src/i830.h -index 54dddd8..21c98f5 100644 ---- a/src/i830.h -+++ b/src/i830.h -@@ -482,8 +482,6 @@ typedef struct _I830Rec { - - struct { - int op; -- PicturePtr pSrcPicture, pMaskPicture, pDstPicture; -- PixmapPtr pSrc, pMask, pDst; - uint32_t dst_format; - Bool is_nearest; - Bool needs_emit; -diff --git a/src/i915_render.c b/src/i915_render.c -index 2d11986..c81366a 100644 ---- a/src/i915_render.c -+++ b/src/i915_render.c -@@ -322,6 +322,13 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture, - i830_get_pixmap_bo(pDst), - }; - -+ pI830->render_src_picture = pSrcPicture; -+ pI830->render_src = pSrc; -+ pI830->render_mask_picture = pMaskPicture; -+ pI830->render_mask = pMask; -+ pI830->render_dst_picture = pDstPicture; -+ pI830->render_dst = pDst; -+ - i830_exa_check_pitch_3d(pSrc); - if (pMask) - i830_exa_check_pitch_3d(pMask); -@@ -351,12 +358,6 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture, - } - - pI830->i915_render_state.op = op; -- pI830->i915_render_state.pSrcPicture = pSrcPicture; -- pI830->i915_render_state.pMaskPicture = pMaskPicture; -- pI830->i915_render_state.pDstPicture = pDstPicture; -- pI830->i915_render_state.pSrc = pSrc; -- pI830->i915_render_state.pMask = pMask; -- pI830->i915_render_state.pDst = pDst; - pI830->i915_render_state.needs_emit = TRUE; - - return TRUE; -@@ -367,12 +368,12 @@ i915_emit_composite_setup(ScrnInfoPtr pScrn) - { - I830Ptr pI830 = I830PTR(pScrn); - int op = pI830->i915_render_state.op; -- PicturePtr pSrcPicture = pI830->i915_render_state.pSrcPicture; -- PicturePtr pMaskPicture = pI830->i915_render_state.pMaskPicture; -- PicturePtr pDstPicture = pI830->i915_render_state.pDstPicture; -- PixmapPtr pSrc = pI830->i915_render_state.pSrc; -- PixmapPtr pMask = pI830->i915_render_state.pMask; -- PixmapPtr pDst = pI830->i915_render_state.pDst; -+ PicturePtr pSrcPicture = pI830->render_src_picture; -+ PicturePtr pMaskPicture = pI830->render_mask_picture; -+ PicturePtr pDstPicture = pI830->render_dst_picture; -+ PixmapPtr pSrc = pI830->render_src; -+ PixmapPtr pMask = pI830->render_mask; -+ PixmapPtr pDst = pI830->render_dst; - uint32_t dst_format = pI830->i915_render_state.dst_format, dst_pitch; - uint32_t blendctl; - int out_reg = FS_OC; --- -1.6.3.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.99.902-0006-accessing-a-pixmap-if-prepare_access-fails-is-verbot.patch b/x11-drivers/xf86-video-intel/files/2.7.99.902-0006-accessing-a-pixmap-if-prepare_access-fails-is-verbot.patch deleted file mode 100644 index cceab079830d..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.99.902-0006-accessing-a-pixmap-if-prepare_access-fails-is-verbot.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 57c7cbade9556e7b21867e61353f0928fd553616 Mon Sep 17 00:00:00 2001 -From: Owain Ainsworth <zerooa@googlemail.com> -Date: Thu, 16 Jul 2009 20:38:43 +0100 -Subject: [PATCH 6/7] accessing a pixmap if prepare_access fails is verboten. - -Don't do it, treat this the same as every other prepare access call in uxa. - -Reviewed-by: Keith Packard <keithp@keithp.com> -Signed-off-by: Owain Ainsworth <zerooa@googlemail.com> ---- - uxa/uxa.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/uxa/uxa.c b/uxa/uxa.c -index 1f2d75b..22c7c40 100644 ---- a/uxa/uxa.c -+++ b/uxa/uxa.c -@@ -244,9 +244,10 @@ uxa_validate_gc (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) - /* We can't inline stipple handling like we do for GCTile because it sets - * fbgc privates. - */ -- uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW); -- fbValidateGC (pGC, changes, pDrawable); -- uxa_finish_access(&pGC->stipple->drawable); -+ if (uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW)) { -+ fbValidateGC (pGC, changes, pDrawable); -+ uxa_finish_access(&pGC->stipple->drawable); -+ } - } else { - fbValidateGC (pGC, changes, pDrawable); - } --- -1.6.3.3 - diff --git a/x11-drivers/xf86-video-intel/files/2.7.99.902-0007-Update-to-xextproto-7.1-support.patch b/x11-drivers/xf86-video-intel/files/2.7.99.902-0007-Update-to-xextproto-7.1-support.patch deleted file mode 100644 index d3df598d89da..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.7.99.902-0007-Update-to-xextproto-7.1-support.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 16 Jul 2009 11:40:15 +1000 -Subject: [PATCH 7/7] Update to xextproto 7.1 support. - -DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers -need to include dpmsconst.h if xextproto 7.1 is available. - -SHM is now shm.h instead of shmstr. Requires definition of ShmFuncs that's -not exported by the server. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - configure.ac | 4 ++++ - src/ch7017/ch7017.c | 5 +++++ - src/ch7xxx/ch7xxx.c | 5 +++++ - src/ivch/ivch.c | 5 +++++ - src/sil164/sil164.c | 5 +++++ - src/tfp410/tfp410.c | 5 +++++ - uxa/uxa-priv.h | 31 ++++++++++++++++++++++++++++++- - 7 files changed, 59 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 077c1ff..3857470 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -101,6 +101,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES]) -+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], -+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), -+ HAVE_XEXTPROTO_71="no") -+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) - - sdkdir=$(pkg-config --variable=sdkdir xorg-server) - drm_cflags=$(pkg-config --cflags libdrm) -diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c -index 759fc24..01e414f 100644 ---- a/src/ch7017/ch7017.c -+++ b/src/ch7017/ch7017.c -@@ -39,8 +39,13 @@ - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "ch7017_reg.h" -diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c -index 8a439e4..13ba102 100644 ---- a/src/ch7xxx/ch7xxx.c -+++ b/src/ch7xxx/ch7xxx.c -@@ -39,8 +39,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "ch7xxx.h" -diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c -index 873afcc..dffe334 100644 ---- a/src/ivch/ivch.c -+++ b/src/ivch/ivch.c -@@ -36,8 +36,13 @@ - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - #include <unistd.h> - - #include "../i2c_vid.h" -diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c -index 410a681..c90bed3 100644 ---- a/src/sil164/sil164.c -+++ b/src/sil164/sil164.c -@@ -40,8 +40,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "sil164.h" -diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c -index c2c4fc3..4d3bb8a 100644 ---- a/src/tfp410/tfp410.c -+++ b/src/tfp410/tfp410.c -@@ -39,8 +39,13 @@ - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "tfp410.h" -diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h -index 3d2b776..d469474 100644 ---- a/uxa/uxa-priv.h -+++ b/uxa/uxa-priv.h -@@ -42,9 +42,13 @@ - #define NEED_EVENTS - #include <X11/Xproto.h> - #ifdef MITSHM -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/shm.h> -+#else - #define _XSHM_SERVER_ - #include <X11/extensions/shmstr.h> - #endif -+#endif - #include "scrnintstr.h" - #include "pixmapstr.h" - #include "windowstr.h" -@@ -321,9 +325,34 @@ uxa_get_image (DrawablePtr pDrawable, int x, int y, int w, int h, - extern const GCOps uxa_ops; - - #ifdef MITSHM -+/* XXX these come from shmint.h, which isn't exported by the server */ -+ -+#ifdef HAVE_XEXTPROTO_71 -+/* Up to xextproto 7.1, these were provided in shmstr.h */ -+typedef struct _ShmFuncs { -+ PixmapPtr (* CreatePixmap)(ScreenPtr pScreen, -+ int width, -+ int height, -+ int depth, -+ char *addr); -+ void (* PutImage)(DrawablePtr dst, -+ GCPtr pGC, -+ int depth, -+ unsigned int format, -+ int w, -+ int h, -+ int sx, -+ int sy, -+ int sw, -+ int sh, -+ int dx, -+ int dy, -+ char *data); -+} ShmFuncs, *ShmFuncsPtr; -+#endif -+ - extern ShmFuncs uxa_shm_funcs; - --/* XXX these come from shmint.h, which isn't exported by the server */ - void - ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); - --- -1.6.3.3 - diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild deleted file mode 100644 index 4f93279c8872..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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.4.3.ebuild,v 1.4 2009/05/04 16:50:13 ssuominen Exp $ - -SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~ia64 ~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 )" - -PATCHES=( -"${FILESDIR}/${PV}-0001-never-enable-DRI_MM-on-this-branch.patch" -) - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild deleted file mode 100644 index 13f55f031d73..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# 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.5.1-r1.ebuild,v 1.4 2009/05/04 16:50:13 ssuominen Exp $ - -SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~ia64 ~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 )" - -PATCHES=( -"${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch" -"${FILESDIR}/${PV}-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch" -) - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.7.99.902-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.7.99.902-r1.ebuild deleted file mode 100644 index 64753b9c5c65..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.7.99.902-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# 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.7.99.902-r1.ebuild,v 1.1 2009/07/20 21:29:02 remi Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.6 - x11-libs/libXvMC" -DEPEND="${RDEPEND} - >=x11-proto/dri2proto-1.99.3 - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xineramaproto - x11-proto/glproto - x11-proto/xextproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2.4.11 - x11-libs/libX11 )" - -PATCHES=( -"${FILESDIR}/${PV}-0001-Fix-XV-scan-line-calculation-when-rotated.patch" -"${FILESDIR}/${PV}-0002-Reset-framebuffer-offset-when-rebinding-aperture-227.patch" -"${FILESDIR}/${PV}-0003-Use-batch_start_atomic-to-fix-batchbuffer-wrapping-p.patch" -"${FILESDIR}/${PV}-0004-Fix-915-class-Render-after-the-8xx-class-Render-fix.patch" -"${FILESDIR}/${PV}-0005-Really-fix-i915-render.-Fail-at-commit-amend.patch" -"${FILESDIR}/${PV}-0006-accessing-a-pixmap-if-prepare_access-fails-is-verbot.patch" -"${FILESDIR}/${PV}-0007-Update-to-xextproto-7.1-support.patch" -) - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.8.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.8.0.ebuild deleted file mode 100644 index bca0a02abacf..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.8.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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.8.0.ebuild,v 1.1 2009/07/22 08:13:33 remi Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.6 - x11-libs/libXvMC" -DEPEND="${RDEPEND} - >=x11-proto/dri2proto-1.99.3 - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xineramaproto - x11-proto/glproto - x11-proto/xextproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2.4.11 - x11-libs/libX11 )" - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} |