Merge branch 'shared/xorg-7.4-update' into org.openembedded.dev

author: Graeme Gregory <dp@xora.org.uk> 2008-11-12 16:20:40 +0000
committer: Graeme Gregory <dp@xora.org.uk> 2008-11-12 16:20:40 +0000
commit: c2d4ecfceeeca4174ddd8d2d495e20df323fd112 (patch)
tree: 016219928ef9556472f6720d315938fbaaf0debb
parent: 8476a8f3212064b5ebb979d9f6b96043af5db2e5 (diff)
parent: a1ca202a5c8f8a7502639297b55ccffe30493022 (diff)
61 files changed, 789 insertions, 280 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index c5d1359063..1dd3f9d802 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1654,6 +1654,10 @@ sha256=a226f7b37694669aa6efe6c30462e2d44f5881ca70604dac15c23fce66992872
 md5=0e0dacaae704aed08a940389250e61e9
 sha256=fd8a9e9e916314f9385f497d1f9b81d0885487f7741ad7be790972f44fc68b25
 
+[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.3.tar.bz2]
+md5=98200c358e5401d648b980564d9ae39d
+sha256=863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2]
 md5=bbb3df097821d3edb4d5a4b2ae731de6
 sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
@@ -4014,6 +4018,10 @@ sha256=4ea7d0a314b6c7ec65c92f44a3dad39ac9535b1bb9f54768573f60b69902e5cd
 md5=0259436c430034f24f3b239113c9630e
 sha256=80094cd7060a08bda61eef0e481800e8f94d4bbb08b8297dcf6aecea99a09a07
 
+[http://xorg.freedesktop.org/releases/individual/font/font-util-1.0.1.tar.bz2]
+md5=b81535f78fe05732931f02841e5ca37b
+sha256=048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-util-X11R7.0-1.0.0.tar.bz2]
 md5=73cc445cb20a658037ad3a7ac571f525
 sha256=02eefdacc36d5df3707b3e454f5842d06c9c2eb9591e4cae93ccd3d66c78368f
@@ -7666,6 +7674,10 @@ sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5
 md5=dfd5de47e232db0891410bec8ee6707b
 sha256=2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde
 
+[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.1.tar.bz2]
+md5=81521249353fa33be7a4bb0062c2fbb9
+sha256=9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libFS-X11R7.0-1.0.0.tar.bz2]
 md5=12d2d89e7eb6ab0eb5823c3296f4e7a5
 sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1
@@ -7710,6 +7722,10 @@ sha256=e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8
 md5=184cbf502b3cd5d7ba5f9d1290a99606
 sha256=57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04
 
+[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.1.0.tar.bz2]
+md5=05a04c2b6382fb0054f6c70494e22733
+sha256=7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libSM-X11R7.0-1.0.0.tar.bz2]
 md5=8a4eec299e8f14e26200718af7b2dcfc
 sha256=df219b7d5c2fac93bc7c8eb411ed365492eaeb3727ecbb04999890fd694d4e80
@@ -7966,6 +7982,10 @@ sha256=9a1d1c4c494203fcc64e697c7d341ccd12ecfcf2983b09746f8a7113443fe3a4
 md5=1309301e2d979bd475dc58325cb8c056
 sha256=68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXft-2.1.13.tar.bz2]
+md5=bc8881851f3bd8dcc625fac37350a1c6
+sha256=ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXft-X11R7.0-2.1.8.2.tar.bz2]
 md5=c42292b35325a9eeb24eb0f8d3a6ec52
 sha256=0473d1db21968f05b39ff9832b18545ba6b93be76d2e61b04a14208c515680f3
@@ -8070,6 +8090,10 @@ sha256=2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407
 md5=1b244b5d19f0ccab01d7083436cd3558
 sha256=206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.2.3.tar.bz2]
+md5=5cd67cc02a50c9644ba0a1846ea3b08e
+sha256=f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrandr-X11R7.0-1.1.0.2.tar.bz2]
 md5=e10aed44c2e1e5d9e6848a62ff2c90c7
 sha256=6b6a3fcf44621bf163ba2db6dbcc518bff4e8cf74695d1b86595387a3ff3c6fb
@@ -8194,6 +8218,10 @@ sha256=4adbde13bbb3109897fc7b5d05bdab4709c4dd1aa7313f47b8093f52f10e617c
 md5=8de1ca6c55aaad7d8cae19b4f0b3da32
 sha256=e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.0.2.tar.bz2]
+md5=304d37bd0a10d9b58aa9b64469ad73e5
+sha256=3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86vm-X11R7.0-1.0.0.tar.bz2]
 md5=ed59db622581b33ec2a62e12b2f9c274
 sha256=f972bbd632cf9047a28b4c467a2f7c2c72f9b36959a98649b3dfef6bf898b8df
@@ -10442,6 +10470,10 @@ sha256=b3dd85e34b22cf757eafb6ef15c5505d5ec5e71803caef4b69ddc7fd5d46fabe
 md5=aacda46598ce3af8ca16e2a8132db1b2
 sha256=c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
 
+[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.3.tar.bz2]
+md5=b01e4f71c20fc1c79ed727759c1df40c
+sha256=2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/luit-X11R7.0-1.0.1.tar.bz2]
 md5=30428b8ff783a0cfd61dab05a17cfaa7
 sha256=fb423dc3ae75e64a256172c873732fe869ae482409cf1f3e7d980d222f070cee
@@ -14118,6 +14150,10 @@ sha256=3a8b96d7955a022045c781c1b8ac266fa8cdd47295744d60e7c00a6e88abbb3d
 md5=bee5d87d40615e67c84ab0b0c65049ba
 sha256=c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86
 
+[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.4.tar.bz2]
+md5=839e968d7197b9563f0fd8a5a3aac2e3
+sha256=23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/sessreg-X11R7.0-1.0.0.tar.bz2]
 md5=8289a5b947165449c23bdfad9af02b4c
 sha256=3769ad5059a2841a8ee28fc8a7d3a3ca8eb59f4fd46d0bd629829f3841202734
@@ -14326,6 +14362,10 @@ sha256=2984645b207c52ea9b8ef3951af8bd0c5aab469607fabf63ade05f8fe87309c1
 md5=a282846532ecbd6b4a28072373b3a70b
 sha256=b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
 
+[http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2]
+md5=31da204a0255ba8c6a65386e65dc1c90
+sha256=76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/smproxy-X11R7.0-1.0.1.tar.bz2]
 md5=60f54881b6fb27a8ba238629e4097c4d
 sha256=c56617fd511eac4bdcff5b9b171be0aeacb7d8ddfe48615aa61295cf90b62888
@@ -16114,10 +16154,18 @@ sha256=cbb271f6c3586210f31953933c4d06bd34272df9c596f5e26124ca3caf8529be
 md5=8d2731e6e95f173f41a0ddc875d55804
 sha256=d5e333bc74c0a534bf96f40ea89b7e700f137d46f1fdbaea13fa552ad6227af8
 
+[http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.tar.bz2]
+md5=51b4a1c0ae2b3bd77417306fd78a3e94
+sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xbiff-X11R7.0-1.0.1.tar.bz2]
 md5=c4eb71a3187586d02365a67fc1445e54
 sha256=c9c899fddcb5053d6cf2a00a933b6e6b0429af547efbe85f89ad3bb35176bbec
 
+[http://xorg.freedesktop.org/releases/individual/data/xbitmaps-1.0.1.tar.bz2]
+md5=b28a9840cde3c38d7c09716372fea257
+sha256=5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xbitmaps-X11R7.0-1.0.1.tar.bz2]
 md5=22c6f4a17220cd6b41d9799905f8e357
 sha256=3d7b78cf588871caa00ef79f5f66657803cf9a07350ac5dcf56fbe5ca2a794a8
@@ -16186,6 +16234,10 @@ sha256=b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
 md5=77f3ba0cbef119e0230d235507a1d916
 sha256=f28e8f6baaaa590ed991314c98f16d114e4668b93c5c6e7fb1bf51f3cc7bf6c0
 
+[http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.1.tar.bz2]
+md5=8579d5f50ba7f0c4a5bf16b9670fea01
+sha256=e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcmsdb-X11R7.0-1.0.1.tar.bz2]
 md5=1c8396ed5c416e3a6658394ff6c415ad
 sha256=6e1cdf207ca998acd4e1cc991bde47fcf9d01d24ba733f9d3afe3c64843ef838
@@ -16198,6 +16250,10 @@ sha256=f62bd7916589515d338055cf977b544d031883659f0ec97cbbd08441256f1059
 md5=dd817a0fabe11b1b463492b37247b013
 sha256=be246df3bb5b5ed6bcc3d527f7b6015b3c3f2035090f52729ec4c796f5da20e9
 
+[http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.1.tar.bz2]
+md5=014bad415e64c49994679cdb71a97e37
+sha256=4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xcursor-themes-X11R7.0-1.0.1.tar.bz2]
 md5=c39afeae55a7d330297b2fec3d113634
 sha256=730029a4f23661094f0d246595041e51ec0b55e7405fcd5affee1ec7f9aba813
@@ -16210,6 +16266,10 @@ sha256=b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4
 md5=7b0c623049d4aab20600d6473f8aab23
 sha256=b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4
 
+[http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.2.tar.bz2]
+md5=6fc90896b8c786cb1a2100b4167f7874
+sha256=e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcursorgen-X11R7.0-1.0.0.tar.bz2]
 md5=4d7b26dbb4442e89ec65c4147b31a5f7
 sha256=8290616302932e72d4224cbe27d872efa5f44b0b8553ded0bbfb3537abe76907
@@ -16262,6 +16322,10 @@ sha256=4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962
 md5=2b08e9ca783e3aa91d7fb84fdd716e93
 sha256=d97f2872f5400f7fb5c0ad9442eced4bea55ab523de27417bd479db0071e3fed
 
+[http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.2.tar.bz2]
+md5=a5ec51ed9f0a55dc3462d90d52ff899c
+sha256=7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdriinfo-X11R7.0-1.0.0.tar.bz2]
 md5=75b8b53e29bb295f7fbae7909e0e9770
 sha256=84753f1c33be507ed9c1cc9d5e78565cc61e60d1403e499d7f25603d9a3b4f6b
@@ -16322,6 +16386,10 @@ sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.2.2.tar.bz2]
+md5=2d6596b2b0cfa527b5ed4df2014684bf
+sha256=953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2]
 md5=b35b1756579ebe296801622bdf063ab1
 sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea
@@ -16330,6 +16398,10 @@ sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea
 md5=7ed47ca8feb1fbbe305f3a6732181550
 sha256=b2bcdb4ef8cb9645e476afcedeadbb9d1688f8e8f7bd010f6718a15f1673556b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.1.1.tar.bz2]
+md5=2aa75313ea5652a8cf93581c65ee6493
+sha256=219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2]
 md5=9ee5109ef33e281ce0784ad077f26cee
 sha256=62d1dfdc2f902d016999861ec3fd58b4630341e8f4df45e65c7bee730b51fd8e
@@ -16434,6 +16506,14 @@ sha256=ed5c17b702a43192710b7476f3a8540d04bc800554fd05e348be4f510f651dfa
 md5=ca01cca63fa57600c1cf6b307bb9aa8c
 sha256=cacc590ac4e57f3374e18b9898c6fa8992f31db6e1cf985391fe42c33a29fe15
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.3.1.tar.bz2]
+md5=ff25ea697cfa1570cc28f4b9cf9c761f
+sha256=1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.3.2.tar.bz2]
+md5=e48b99e55093525ebb7811a014391a0b
+sha256=6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2]
 md5=9e3ba60836f4c1d2e4cebc63a28321b4
 sha256=9b69192a4368bafeaf94432ec50025dd3f60340290ef2500f6032159870ed489
@@ -16550,6 +16630,10 @@ sha256=6456ddecc0e1b962b5f14b98b81d2e936cb48dcdacdd871dfa0e24c0d252498c
 md5=56765c5ee99f67802bca8a1134ad7fc1
 sha256=57460dfa0429c58d598f192aa65661300dd104953073d977ad4f4b15a596eda8
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-0.15.0.tar.bz2]
+md5=939f1c831c5cd3a6f027e982592dfc5b
+sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-tek4957-X11R7.0-1.0.0.5.tar.bz2]
 md5=df633403c91a48c6a316c6a5f48e53e2
 sha256=1cc4a964e2b407d2b9ebbac0bf38787e572d9bd88759fc0b229f588ac90ed139
@@ -16574,6 +16658,10 @@ sha256=f06dea24204c6f3f42c29d1a89f51da801082094e393a716d592d638fa9ddb66
 md5=f253663de03e0fbb377ce085947412b1
 sha256=973a51a442d0c97eb3f76af3b148194de8a4187e74f4a68033b0480c6408db42
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.1.1.tar.bz2]
+md5=862c230f5f6e0c545f232b4c0fa9537a
+sha256=dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2]
 md5=c7ae53dee1f3e95fa5ce9659b34d8446
 sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e
@@ -16582,6 +16670,10 @@ sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e
 md5=3683affae738de5ef130b6720bdfd6dd
 sha256=4612a45a90fb1aec8cabd36abeaf04f202ecc45d2074427bfa9f368f95514e43
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.0.tar.bz2]
+md5=4f78650d79656dc803a720049d65682e
+sha256=f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2]
 md5=323911ab16a6147d3cabceff9336a3d2
 sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78
@@ -16590,6 +16682,10 @@ sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78
 md5=a5320411ba92e637ffb233e9cbb80d13
 sha256=1e43d482e570328abcb8a1e03c62f8c3e3fcaf3eb09dc885503a1add158be0a2
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.0.tar.bz2]
+md5=6826c556ebe9a1248cbc7f7edd44f956
+sha256=8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2]
 md5=342937e275dbc92f437417a3186a8222
 sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548
@@ -16598,6 +16694,10 @@ sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548
 md5=a5bed67815b9e650182806da301b488c
 sha256=06c2462dfa65c32e31a972292531bf686c56c3f9cf21baf814ab0eda5cf26653
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.85.0.tar.bz2]
+md5=b415bf3259ad0acdaf62e3dde76e3289
+sha256=9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28
+
 [http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ast-X11R7.1-0.81.0.tar.bz2]
 md5=ac1595de8397efd740038994b1e9ef67
 sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811
@@ -16610,6 +16710,10 @@ sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae
 md5=f6d559f9d20f61567d381916b376590f
 sha256=d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.8.0.tar.bz2]
+md5=3c97c7925ebf4162eeb3463e23adc0e3
+sha256=3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ati-X11R7.0-6.5.7.3.tar.bz2]
 md5=92525195a7a36f5ffbffcb4e6a564e50
 sha256=094da5eae789e50d1ebc4d7823d4c8ac701e3bbe387c0ff63285e2ab32aad1f8
@@ -16618,6 +16722,10 @@ sha256=094da5eae789e50d1ebc4d7823d4c8ac701e3bbe387c0ff63285e2ab32aad1f8
 md5=c490366e7a663b4d05acb45713be45ee
 sha256=4f471f90fcedd164c5e550afbe2dd3f7247b38c19e3d44b0b8941bbcdf0f1a10
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.0.tar.bz2]
+md5=0fec6bee65383790485d917247a61629
+sha256=05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2]
 md5=90f23505faceac30d3f46ab94f7293e1
 sha256=2df2e34dc61907fb3c41b4590f51d39f951d2d74422d84f1f7d53ef6f5b25352
@@ -16630,6 +16738,10 @@ sha256=e851ff555f177ebe6b4d8f961e088a1e2f5947ba739e5b891eb5b3ff4cdd652b
 md5=66344e315def275605dafb314ce59851
 sha256=5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.2.1.tar.bz2]
+md5=bc28fdedaee9059180e2534f9dbcd2f6
+sha256=e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2]
 md5=7708693ad9d73cd76d4caef7c644a46f
 sha256=29e6fdd67e8ec51c534f6123f9935a165711255d935fb9cb28cd44f9db278b3e
@@ -16646,6 +16758,10 @@ sha256=6eb51d5d4489083c8a1eeabc1fbd22baeafe6486a7940516d1e2b741564acd06
 md5=adb1e6346efd8dfe5dcccd47d46869cb
 sha256=25ba42dedc297ca2a7257fdb4e050e8d61cdd6710c8adabdb3925908b09f9d02
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.0.tar.bz2]
+md5=3d96297556846bee02a74166ffb5d052
+sha256=5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2]
 md5=462654f9be7e3022f97147e3390db97a
 sha256=f50f6d3d7fd79c5ce40ea6039a2fb82f136b13c18afbc2b7e941d41d6568b698
@@ -16670,6 +16786,14 @@ sha256=c6032ec1753a0f5975b5a7488ca3ca0d46f84bc5dd8fcb42eebd807c7faec765
 md5=c209e54fa8dcd3cd3342e84d261b02db
 sha256=d03eb7e5b47e2f1e1a665700f4e22d15651dc949196b0ec880f0d63cafb6814c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glide-1.0.1.tar.bz2]
+md5=a825152b086564c1011bac9e48413189
+sha256=2b636894ecd8fc3472e05e548f0390ea802f5d9db7906ac302ec8cbd1e5f64b3
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.1.tar.bz2]
+md5=6d7afdac0a26cf201c3f3b417c31c5e1
+sha256=161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2]
 md5=f14c2f1696c05760207adcaac856e5e5
 sha256=d5b4cb7b490edc3be57c40a00299002b60b8060396b3c902b2bf92090fcbd940
@@ -16682,6 +16806,10 @@ sha256=21b70d71593f123c470dae2b4e75bac7478fffa50503c85b02e8f2c1945417d2
 md5=c483efc90b1935025b17e4b9e9c2e4df
 sha256=b52183f5a7d0adee1d21b4b0a0908886b7bbc69dc4498f1e7a3edc4b1988c41c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.1.tar.bz2]
+md5=3b170a6df5114420cd4021a057918a09
+sha256=49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2]
 md5=078eed8c3673488ee618dfc7a3ef101b
 sha256=543d7b8bc0c9e7889c686a647f98641f0a9b052e58321a8a17518d680e6db95a
@@ -16690,6 +16818,10 @@ sha256=543d7b8bc0c9e7889c686a647f98641f0a9b052e58321a8a17518d680e6db95a
 md5=9252e33d14c8869d995bf67e445ffb4e
 sha256=4973e6bd62eb307131e179ba313cfa6e79d15184eef5324bba985e2f781bb3d4
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.2.0.tar.bz2]
+md5=d0e5a805c546b29b1dd3b55a68d16dc4
+sha256=59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2]
 md5=625448b13ebe2a13b7defad1efec05c4
 sha256=b0f2f2dd17bd01018fa91d042214b596f9d2303a81a0b86de102400b00f87d09
@@ -16710,6 +16842,10 @@ sha256=1d9227ba301152738c6b498ec512ddfa67ce7c09e40b883fdbf43cd31e85b523
 md5=fe6cc3eab247c7f0a1d152de0ee0fc80
 sha256=debd142a815e5e2611433f1af97d467e50361ad5b3baa0b54fb4b61b0280ef83
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-impact-0.2.0.tar.bz2]
+md5=07c9557f6529a88845b01924313e5763
+sha256=1528a123b41bf42506eb8e37c3506086395f062cca71f64cbc67929ff1010022
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-imstt-X11R7.0-1.0.0.5.tar.bz2]
 md5=cc949688918b78f830d78a9613e6896b
 sha256=738463dbf1980b9d0f95936a2d951dc51bd776c7949215c2456580948660669e
@@ -16726,6 +16862,14 @@ sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a
 md5=5cd6b3ed57c7e78ab51e9d9266e73fb6
 sha256=5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.0.tar.bz2]
+md5=6081b8fa50c689d51f85c2fbaf93867e
+sha256=fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.9.tar.bz2]
+md5=11066b84b949cd04300ec819c9c51532
+sha256=d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-mga-X11R7.0-1.2.1.3.tar.bz2]
 md5=cb0409782020b5cc7edc273624ffdd17
 sha256=8f4ef9e7a82aa1f4624b2d87da8ff0472e3f5c2ccdc7998f4418c6906cadc915
@@ -16734,6 +16878,10 @@ sha256=8f4ef9e7a82aa1f4624b2d87da8ff0472e3f5c2ccdc7998f4418c6906cadc915
 md5=b42cab6a2742bf90a205a991c281f4e2
 sha256=d7e9fe8b79229cb76a2749eb9658dfa96ea580420de05170e5a7b402062a9592
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.1.tar.bz2]
+md5=a72f57fca4f4dff9a2c82eb1fe7456f4
+sha256=96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2]
 md5=ffe9015678a41e97bdbd2825066bb47b
 sha256=cfaa594be277cd2a1bf9d796bb398e07319e9b34cff306b408145a37925dc97f
@@ -16774,6 +16922,10 @@ sha256=41350b8e67713fd9dcb2662e2a481e19b7de5a9d5e6dd7a346ba6662d908209b
 md5=e4dc415b1e45db0bbdacc203ed33024a
 sha256=97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.12.tar.bz2]
+md5=42f12a36d7afc26c817e8e8f5c8b7274
+sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-nv-X11R7.0-1.0.1.5.tar.bz2]
 md5=9a88547fe550e20edcc5a938d31e22b1
 sha256=0ce5ad1affc488f317fd297893a469ed20f451b8bd8b12bb36450ecc8c56e5d0
@@ -16782,10 +16934,22 @@ sha256=0ce5ad1affc488f317fd297893a469ed20f451b8bd8b12bb36450ecc8c56e5d0
 md5=b5c7144231652242ef8436ec8898138c
 sha256=8fd91ce003998739677556bf13146e9a3560970ea5342bad5c44c11fc49410cb
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-openchrome-0.2.903.tar.bz2]
+md5=c0820787e89958c9114d359b6a3cd464
+sha256=b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.0.tar.bz2]
+md5=007bec0c6b07d9d3aeca4da18e561efb
+sha256=5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.1.3.tar.bz2]
 md5=a8b97feccb32184820d5856fe78d34db
 sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.0.tar.bz2]
+md5=7c03de3804d4c4f6ff59f74050d24b2b
+sha256=b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2]
 md5=f1a25db74a148dea45115e813027b932
 sha256=4ad42c65f60bc7f3f37f636eae5ae5a9049cdd4df5c546f93f201fdf16213f48
@@ -16798,6 +16962,10 @@ sha256=053a60acae48000dfd03b4518fe10c6901240a8858dbfa49e0506557075a3c79
 md5=d95ab6445cab477f39adfbbc81006f67
 sha256=4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.0.tar.bz2]
+md5=d05e7c3cb044437eda8663e174ba913c
+sha256=ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2]
 md5=83b9e8a9b8fc1c49bda2811358e5007c
 sha256=3e11f78c39eb03fe4b9e6a2b68347420297fa38cd36f42235ee4be9c87175103
@@ -16806,6 +16974,10 @@ sha256=3e11f78c39eb03fe4b9e6a2b68347420297fa38cd36f42235ee4be9c87175103
 md5=3083c03884d44468e395d26a8d990c53
 sha256=b9b9abdd80c00782ca2e1313016c3d3904dc10a1de1c94d29cd4efafeb1f52f3
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.1.tar.bz2]
+md5=4a293047e988d4ea1e9e96d3b5793f43
+sha256=9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-s3virge-X11R7.0-1.8.6.5.tar.bz2]
 md5=d0164c37749ab5f565db9813487e1900
 sha256=064293e33256c5baa8932b42f181ec0d2fc7c0ef5b72e655aefa72d58e2b91ff
@@ -16818,6 +16990,10 @@ sha256=075fba99f38b900416858a39c7cd62f0f3f583ee48cb52d546b12e916fa13c32
 md5=6367e921a98f6a7fec9d0a9bc5ff0a47
 sha256=1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.2.1.tar.bz2]
+md5=62b8aba48b54eaefeae87df502bf219c
+sha256=adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2]
 md5=6b638dd500d10dba1822d3ea5061fc65
 sha256=e4ee3af5989cc9b0c8ff59082f64a564420dc22a2eb9fd53e41da24260a65e98
@@ -16826,6 +17002,10 @@ sha256=e4ee3af5989cc9b0c8ff59082f64a564420dc22a2eb9fd53e41da24260a65e98
 md5=7df6bc61424a566325e48e5eb89a21e2
 sha256=efc0b44d7146c0d0f966dd1f0bdf6098e086fec7a33f5b480f99fa17e2bc7cc4
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.6.0.tar.bz2]
+md5=a8419a8ed17b02b2a6dd4d30d5e94b00
+sha256=cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2]
 md5=957de4e2a3c687dbb2e9e18582397804
 sha256=6723b5b7e9ea5b3aebcbbaeaca59790e6a9ab6a7d5324c671454e426854aef3f
@@ -16850,6 +17030,10 @@ sha256=c578fec74f7028ee28a46a62ab2b22fdcbd6de8cefa7a185e73c68b1d8a12e8b
 md5=f3ed22290e677381dd6236ef3bbfc7ac
 sha256=6c4c821941c571b39c950acd57ed4a646a6474070a68a0caa09eb7c3b2715e03
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.0.tar.bz2]
+md5=7b1f5465f423a859f306f4f1d6306a1b
+sha256=76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2]
 md5=781d726a0ca54b65521e383ab99043c8
 sha256=6f972b126774d3d051b2f683e82661c07a1b4787b8ce04847eae80b283c5feb3
@@ -16858,6 +17042,10 @@ sha256=6f972b126774d3d051b2f683e82661c07a1b4787b8ce04847eae80b283c5feb3
 md5=11d580e2cc795b902b6f1a326962190b
 sha256=bfdde9894930ffddb93343647a377a1456a830687d3de6fba2010ffe31c7b04d
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunbw2-1.1.0.tar.bz2]
+md5=559c95f044a31cfe7f71453e9b89c35b
+sha256=d71074e941ad8f71ac476651c2ca4142a5c2243e8fecdf216bc0ffbf18338136
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunbw2-X11R7.0-1.0.0.5.tar.bz2]
 md5=0cdda1ab939ea1190c142aa8aabfaf83
 sha256=13ab882849164dd677228523b91081fa7bda6955daae128f0b8754759e2f7278
@@ -16866,6 +17054,10 @@ sha256=13ab882849164dd677228523b91081fa7bda6955daae128f0b8754759e2f7278
 md5=cae0b4709a2cc489182392094fe0bba3
 sha256=aa656c99ff6ba9c1013b6060c92bbcda2c30ceff72ecc49139c65eb935844f43
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.0.tar.bz2]
+md5=9e25784e912cb2f0493b87431fd60773
+sha256=1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2]
 md5=8f3a734d02ae716415f9c6344fa661bd
 sha256=809a8d57a49c07991d350d4bff955656256afa2c99978050d2aa320d071ef52d
@@ -16874,6 +17066,10 @@ sha256=809a8d57a49c07991d350d4bff955656256afa2c99978050d2aa320d071ef52d
 md5=3d95d9bf985bcf13c0d040a5136334a1
 sha256=f9a1ee987c554607c6fed4ae27adbf75c825d628fe522802a717429a85327487
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.0.tar.bz2]
+md5=b9cb8cfb6a4234bebc434f744af53208
+sha256=3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2]
 md5=799a54cef1f4435e00fa94a1d97d056f
 sha256=31831c2f44e7d28c928d816c2c5074cc0ec1f0cc83994bf28e46c7f840ab8866
@@ -16882,6 +17078,10 @@ sha256=31831c2f44e7d28c928d816c2c5074cc0ec1f0cc83994bf28e46c7f840ab8866
 md5=b719d82950a39e33903882c7b878415e
 sha256=9be5402d4f8f32154c01065f7b01a99e61c2deff959715eb8656259c63195adb
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.0.tar.bz2]
+md5=aa6b7836fe6ccc99994bf15ff2b74e86
+sha256=d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2]
 md5=2227f3fb86b02148f347e002662e53c8
 sha256=f6ddac6bc0b0a446ff9401467e4219340151498824d98c9274ed38a959330aea
@@ -16890,6 +17090,10 @@ sha256=f6ddac6bc0b0a446ff9401467e4219340151498824d98c9274ed38a959330aea
 md5=de3773fe837b633cd7841546358a90b0
 sha256=5b5e22e501b0cf03704fe4737abc49c6c2a2f08a1af28067634f4b69c838e621
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.0.tar.bz2]
+md5=816842de26bce8a935f3c9c3cfedbc42
+sha256=59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunffb-X11R7.0-1.0.1.3.tar.bz2]
 md5=bb5182e3b74b3baa6fee245ac8bbf09a
 sha256=318bd61c8da6e938d5c707a0c70ba3ada1c053ff3172a918f821a1a015b7b6ce
@@ -16898,6 +17102,10 @@ sha256=318bd61c8da6e938d5c707a0c70ba3ada1c053ff3172a918f821a1a015b7b6ce
 md5=5bcb5b90c679a046d604d4f98d804d0d
 sha256=38406fc4e7aa1367587517b4a872fe88dd0be9751aa057b84dc62a7238ccffcc
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunleo-1.2.0.tar.bz2]
+md5=14fe008620940a674981912fa02ae133
+sha256=b315be97197020ae352efe48e9bcd13a572c3a03b2a4d598e89157a897746e06
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunleo-X11R7.0-1.0.0.5.tar.bz2]
 md5=deb17a74ba68ee9593ac774206bd3612
 sha256=025e3636fb59dae9285dab63de9181fc8337d1d8438b7ee8f93095d6731deb0f
@@ -16906,6 +17114,10 @@ sha256=025e3636fb59dae9285dab63de9181fc8337d1d8438b7ee8f93095d6731deb0f
 md5=821ddc77ada3cd3efb0a2a7bc70bf825
 sha256=6c7339466d5b3cfc3c6ea3ca4ec4bad2f16666f1c472efc4f3048c1f711c67d4
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.0.tar.bz2]
+md5=779a31151e44d2fd2a5ee1794f836889
+sha256=72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2]
 md5=74d6ba5e55afdfebff84db08b6589e26
 sha256=38eb95f2991fab51c3442022bcef258de508ebfa0c631024edbdf55a1c4f24fd
@@ -16918,6 +17130,10 @@ sha256=275a6082d3d11614dbc737bab505b9dd72bcbfae44af6ccbe115db66bb2ad2f1
 md5=04c49acb5c5dbde14eabd32d06df6e73
 sha256=6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.0.tar.bz2]
+md5=b13132f24683ef759bfb0c1db5096496
+sha256=c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2]
 md5=0201415230bf0454384c3bad099520d2
 sha256=65e95c95bc4fa5fdb766b7edf8f39253cf8496fca66bc4bc06f260ab9e9ce504
@@ -16926,6 +17142,10 @@ sha256=65e95c95bc4fa5fdb766b7edf8f39253cf8496fca66bc4bc06f260ab9e9ce504
 md5=21500d264bccecde3122835bc39c7793
 sha256=018d27561286d39ea4fea5967f2433c6748da51472bd63db0c74bc32f18417e1
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.0.tar.bz2]
+md5=f3bddf0a64932ca9bd72041ccd3b5501
+sha256=a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tga-X11R7.0-1.0.0.5.tar.bz2]
 md5=fa67bf34454888d38e15708395cfed87
 sha256=96b071b4e12dcfd027402621b897c6d73818aada4d66f77a8802cc46b9efe206
@@ -16938,6 +17158,10 @@ sha256=250ed70d94070f6f8b14540b6509e6ea25f38616b0e0c443f232cc4028765db7
 md5=c0e8b2f54942b6902b7dd4f30defe800
 sha256=d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.0.tar.bz2]
+md5=e89799579d0cf3858362bd751469e0bf
+sha256=a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2]
 md5=69f28afc7b585d01bb06b1e2f872f8ea
 sha256=b7958afb0204bb1d3c8a33e7a56b94a6d4f09426dbcd141ef327e28f523d42eb
@@ -16950,6 +17174,10 @@ sha256=69eda434078afe442c228195593108b860f9d297f7bd29c19c57eedeb59304ad
 md5=488aa9c3ec7a95e6589afa4b50bec8b4
 sha256=c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.0.tar.bz2]
+md5=f98fc22142a009dc3a6cdf930c95203f
+sha256=1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2]
 md5=981f46914c1e54742418f0444ea2e092
 sha256=5e67a6893375585be731b0fd822e9c3407a0930f7addbc8cf01fffad57f9d0b6
@@ -16958,6 +17186,10 @@ sha256=5e67a6893375585be731b0fd822e9c3407a0930f7addbc8cf01fffad57f9d0b6
 md5=62d58d822fdd32e67658bb86ab4e4390
 sha256=cd41d3b58a6ce65ebe4313735a2111880b27b910e5c2e09ea91720ad230f9006
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-v4l-0.2.0.tar.bz2]
+md5=2251ae2a0a905764941cd7b098e85ad1
+sha256=cbff9120fbad900cbdc7ac535d04984e7b491d69a8eb0b371e30ae07cb61925d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-v4l-X11R7.0-0.0.1.5.tar.bz2]
 md5=e422c63bc83717ecd0686aef2036802b
 sha256=54094ee8388e4d067e111f64bf765b677536bc11c71d39c05c83ab6ea336e0f8
@@ -16966,10 +17198,18 @@ sha256=54094ee8388e4d067e111f64bf765b677536bc11c71d39c05c83ab6ea336e0f8
 md5=fac76ca4a56380f0765d884e1b20a487
 sha256=97b5ada6716fd6a2821224fd952fc064cbe721c7446547136794587a2e393114
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vermilion-1.0.1.tar.bz2]
+md5=0f7c6be1bbdc5eb43d82b356fe0f5104
+sha256=4feb4cd8d239a1b5a944c82b253d106b7f7da083fc4d87a8aeeb822c2e980d8b
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-1.3.0.tar.bz2]
 md5=4a307852f3b4850e436a41dab2a73676
 sha256=b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.0.0.tar.bz2]
+md5=433cf6f961eb4a2ab6fcb086def0b2b4
+sha256=f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2]
 md5=049ada4df1abb5aa2b6633ba90353e78
 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452
@@ -17006,6 +17246,10 @@ sha256=1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9
 md5=a5e1f2539b82206e411c3647f10c425f
 sha256=91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.5.tar.bz2]
+md5=6d78c82ea7c2bb0fcb587d7bb4e8f60a
+sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
 md5=4df79349e26add4c23f6be8bec347ad4
 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -17018,6 +17262,10 @@ sha256=a260f9456db466fef3036aff01570f3a12fd275e35bf4c8c4c0ea0f63bf91281
 md5=bc878e795688b49a595b355482d27174
 sha256=3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.0.tar.bz2]
+md5=7c681d9b57f5e1f798263fc1a9d99245
+sha256=b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2]
 md5=e00cc814ebdb3f3067e075bc93b26199
 sha256=2241fd7e5ae8de43f109f712f5125afa6ec5156068c941d7b65981ac7ce7548a
@@ -17026,6 +17274,18 @@ sha256=2241fd7e5ae8de43f109f712f5125afa6ec5156068c941d7b65981ac7ce7548a
 md5=0c96fac2d303dd5981de78e704d3a067
 sha256=35409b42f843ac3b352e344253f3075b2d9c8ae2ac5af02962fd67575427e066
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-wsfb-0.2.1.tar.bz2]
+md5=c159af867a9af3abc4da332189213a76
+sha256=39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.0.tar.bz2]
+md5=08529fd015191be9244f598aa0894aa6
+sha256=5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgixp-1.7.99.3.tar.bz2]
+md5=c541152aee693fad743ef7cbf75a7ffc
+sha256=13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8
+
 [http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2]
 md5=a318c1e86123832d7b0c95fc7d47ef35
 sha256=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124
@@ -17306,6 +17566,10 @@ sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0
 md5=e1ef3fef10d1f7fbd936794982a8f0be
 sha256=d333ce08122e6cde1a9d4fc7cb8e58b13e9335b52fd249046e8380f23d9bf429
 
+[http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.2.tar.bz2]
+md5=f13ddedaa63a608d3b025d326f4f5b5d
+sha256=5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xgamma-X11R7.0-1.0.1.tar.bz2]
 md5=07167da3f6b21985e27174ec70f213c0
 sha256=ec744335f06c070d30f7f256262f6326c2cfff35a0ed6178e7be18ad44ad8a86
@@ -17374,6 +17638,10 @@ sha256=15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774
 md5=521574088fbd688edbf91e6bae674265
 sha256=06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524
 
+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.9.tar.bz2]
+md5=224c36057e4416205d4e421af01a2f15
+sha256=b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2]
 md5=6d2df59fa328cbc99c0de98bc2e14597
 sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
@@ -17382,6 +17650,10 @@ sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
 md5=05ae7771d2245bf325ff30b13da92666
 sha256=c15dd54ad64e660d5a3e8c1ea0d14e50ba1127aab2e3211b82e3ee1e6c7045a4
 
+[http://xorg.freedesktop.org/releases/individual/app/xinput-1.3.0.tar.bz2]
+md5=977d657e8d7b59f7d82c98ebef444b28
+sha256=330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45
+
 [http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.3.tar.bz2]
 md5=2fbcae1323c266edf5b6c61751f2e343
 sha256=0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
@@ -17414,6 +17686,10 @@ sha256=94e1909faa9bf754c0e78a6bea8fa6e16c0931c4a2eb1f2252b7f0fa480cb4df
 md5=1f706f92334ee65818512b3b45d7be65
 sha256=37af4603fa399760a055cc994c61b25778febf676af3fcfad84577f484a174e6
 
+[http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.0.2.tar.bz2]
+md5=68f2a143716c23b566f8509d9498f516
+sha256=4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbevd-X11R7.0-1.0.1.tar.bz2]
 md5=7ba0496f079552d1918d73bd09bde9b2
 sha256=9b358d085bb4fcbfcb0a928cacd4825ba918ef21a2a5e4a3ee401f09abc97f90
@@ -17426,6 +17702,10 @@ sha256=86ab048045dcd1de690de0b040235040f496c686730ad557c912e0f40edf5c4a
 md5=6235c39690968d0a9a4c1b1c16c8905a
 sha256=d2e9c3c28e23010441ce40c48bda7adabd338a256cb9b99848be6ed937fc10e7
 
+[http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.1.tar.bz2]
+md5=84396a3dd75337caaae29d8fa5616fb1
+sha256=aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbutils-X11R7.0-1.0.1.tar.bz2]
 md5=798502eca0c6c3e8c02d76fabb910532
 sha256=8178a1c45af6e844ca0adcfe72fbddcbaebf3f305452a83e39768373981be92f
@@ -17438,6 +17718,10 @@ sha256=49f02ed7b0b246a640fb129fcb3d24d7560305bb6f04e69b09739554857f79f5
 md5=a9fe7efbc67a6966c4d4501f0cf88073
 sha256=921a857dcf90a59df7feb26da5aabcf0bbfb749c46e2a46c3bc7a0280b83b0e1
 
+[http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.1.tar.bz2]
+md5=f66d76abb0f75514ca32272e23cca757
+sha256=77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkill-X11R7.0-1.0.1.tar.bz2]
 md5=35f47fd58d75c1ea5f414b21a10bdbf3
 sha256=fe59dfdcd43faf8efa778f9b2390525a606a62dcd7a70774982bc19301f6a3ce
@@ -17450,10 +17734,18 @@ sha256=6b5b3ef58e6646f004a5f1cbc6be8f32b824cfbf78a30bf242e4f07083668770
 md5=0314b2f5173da64957031400638fa5f8
 sha256=1397377bae07e8907f73bc445e967d4d4400769e683c2119598d952c8ad28131
 
+[http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.0.1.tar.bz2]
+md5=69adcda848479acc3b82b3928812d191
+sha256=456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsatoms-X11R7.0-1.0.1.tar.bz2]
 md5=737b4d7893aa886e8e4181c94380a421
 sha256=6a079872319ac7934578cace787f4f89ea87258f6dd8b33e5b4359be1256e9a3
 
+[http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.0.1.tar.bz2]
+md5=44473b880d26bfbe8b3d4d72b183cba7
+sha256=988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsclients-X11R7.0-1.0.1.tar.bz2]
 md5=cc0d64e90eab0b90b38355e841824588
 sha256=05c269e322ed1ef54b8a32883c8676f46330ec70d85b0a158dbefc2b0e91ceb8
@@ -17558,6 +17850,10 @@ sha256=019ba3dbfe2f23e5847cc839a26c630cea20fe8d62df4775a21087176908b9d7
 md5=073c1b4f0029249a05800900abd13077
 sha256=6044df7ff07d38c4ce1020453f259f4caa16272aca7d835204852e416dfa2605
 
+[http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.4.tar.bz2]
+md5=4f2005bdd430a98c262901383459009e
+sha256=fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/doc/xorg-docs-X11R7.0-1.0.1.tar.bz2]
 md5=ac0d76afa46ef5da9e1cf33558f4b303
 sha256=a3adf1c61247254cc81c80a6c020fe6a9fe0abbdc5f66f8631ec87a1a356c4ae
@@ -17594,6 +17890,10 @@ sha256=51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
 md5=9a817e5f7374d45b4dbe64b21bc0fb61
 sha256=9a0687812eaceaccc21d55dead47f1fbecf8300a28604bd2c08aae6ff7874cd0
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.1.tar.bz2]
+md5=d16f5a033f001c9069b4141194614da2
+sha256=2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -17610,6 +17910,10 @@ sha256=211f4d13d8cd726b10553534a4d0f0267b18d39dd30b2f5bc6dfcde9f6d6b8c9
 md5=ae3d4f73c42953b0a5513bb2967ab913
 sha256=be1fbd7646a55eb9a9ad161f9b83034ba88a82c780e29d4a7888db2495947f25
 
+[http://xorg.freedesktop.org/releases/individual/doc/xorg-sgml-doctools-1.2.tar.bz2]
+md5=f930e5be117922f0841614c8d43f1ae8
+sha256=4def78f2e0e002f5693b61b53ab4325fbc150d3614fe53818e8df9b365a4dbea
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/doc/xorg-sgml-doctools-X11R7.0-1.0.1.tar.bz2]
 md5=d08d4fd10ac46d8b4636efe4d8c0de74
 sha256=2a676fdaf45a7a1e40f4df2cbd09d542672c2d0fe1f890a874b8719e0a448ad7
@@ -17646,6 +17950,10 @@ sha256=4fbc61ec9405b0797318dcf54f5c3a3cc83221f27014563113d2f3f78b3982bf
 md5=1d0a68dada5e14ab07d7660abd4d03e3
 sha256=4f54239ec09f4555d15969d44ac84719e739f78071b0f7855ec620a1f0257a3b
 
+[http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.2.tar.bz2]
+md5=6b3a6896081f628bf5a2c9129417c86f
+sha256=c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xpr-X11R7.0-1.0.1.tar.bz2]
 md5=487b5ab96b373acb80808758ce23eb49
 sha256=8c77256313114c80d49ac5db0013c439ddf9888f2d265f66c9ee3da2de46cdf4
@@ -17750,6 +18058,10 @@ sha256=adf3f97fcb0d768e19058e94dd4aaec70ea61afa8077f6c6e99aa70bc8564e14
 md5=2187897f97f0c818b27f8b8d33f31fa8
 sha256=8be898b0514248d430a4c71be3ffdf6da8e296dabae27a186ed662f38c386397
 
+[http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.2.tar.bz2]
+md5=1228f890f86148e4e6ae22aa73118cbb
+sha256=522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrefresh-X11R7.0-1.0.1.tar.bz2]
 md5=5a46d5fb82aeeb4d6aac58c9cc367439
 sha256=9915ee47ff85d83eee825b1a44857b92b4b16558e4bf436671ae7a37f4ab65ad
@@ -17842,6 +18154,10 @@ sha256=db17d017fff06df2e47f9d123bfb4f1d63a063eb3c08ec017292cc206bb293d1
 md5=ba1e928daa7146e44e3c55db323884f4
 sha256=f27e8dc088d9ca3aa9493ae13422a8c02ce07543780f1fe09985a0d8f41136d4
 
+[http://xorg.freedesktop.org/releases/individual/app/xsetmode-1.0.0.tar.bz2]
+md5=d074e79d380b031d2f60e4cd56538c93
+sha256=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xsetmode-X11R7.0-1.0.0.tar.bz2]
 md5=d83d6ef0b73762feab724aab95d9a4a2
 sha256=ff7e076c77c35f746bc01d15d3ff9e203a45a850ef7e26ef11726b0b9f709e4a
@@ -17850,6 +18166,10 @@ sha256=ff7e076c77c35f746bc01d15d3ff9e203a45a850ef7e26ef11726b0b9f709e4a
 md5=195614431e2431508e07a42a3b6d4568
 sha256=103e35a5523e9237ef3a27bb8e08ab4443de5ceedfe5784be48afde6fba6cd06
 
+[http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.0.2.tar.bz2]
+md5=9af7db9f3052aef0b11636720b3101dd
+sha256=4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xsetroot-X11R7.0-1.0.1.tar.bz2]
 md5=e2831b39cd395d6f6f4824b0e25f55ed
 sha256=8327c294491dbd13c06c8d5d6bf971dca215f59facce99d3e4d0c170d7f0fe44
@@ -17942,6 +18262,10 @@ sha256=126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150
 md5=39d79590345bed51da6df838f6490cbf
 sha256=5b52a7241aef8e3372fb15f58f2276e043e19a87269aa6a0330b5823bc3697f6
 
+[http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.2.tar.bz2]
+md5=0a6ef08a2ac08ad5c4dd1522eb3788a3
+sha256=ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwd-X11R7.0-1.0.1.tar.bz2]
 md5=596c443465ab9ab67c59c794261d4571
 sha256=8ec0abf34ec88f3681666c7727749bac1ccf3f935c1c7f78c009a764f7f0fb11
@@ -17950,6 +18274,10 @@ sha256=8ec0abf34ec88f3681666c7727749bac1ccf3f935c1c7f78c009a764f7f0fb11
 md5=721f84332c98c33152460bb22ba9ded6
 sha256=fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a
 
+[http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.4.tar.bz2]
+md5=e2a9bf5ab7f2a0866700a3b49dd8c6bf
+sha256=df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwininfo-X11R7.0-1.0.1.tar.bz2]
 md5=3ec67e4e1b9f5a1fe7e56b56ab931893
 sha256=75bc03d2eafd4c7139d707fb86b023376d5a5ad2e9315dad53b250cb19e8bce1
@@ -17958,6 +18286,10 @@ sha256=75bc03d2eafd4c7139d707fb86b023376d5a5ad2e9315dad53b250cb19e8bce1
 md5=6a80a6512b9286f15a5bc47d3a019bc9
 sha256=55fc617d536e58f088c694e71e1a02d3019c887c9abd2222574f84866b145d5e
 
+[http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.1.tar.bz2]
+md5=6e3c5d0297d88e890b6f5df31f73dd60
+sha256=d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwud-X11R7.0-1.0.1.tar.bz2]
 md5=e08d2ee04abb89a6348f47c84a1ff3ed
 sha256=a10c7950ad632f07426ea9516b3743c562da8403f0da0cc678277031020f1586
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 33349fcde1..9bc0273466 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -116,7 +116,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
 #avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 = "2.17"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index bd47256322..c1dc088ead 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -28,4 +28,4 @@ PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "124"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg  = "1.4.2"
+PREFERRED_VERSION_xserver-xorg  = "1.5.1"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index d6cdc13d5d..548d8239e8 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -36,99 +36,44 @@ PREFERRED_VERSION_task-xorg ?= "X11R7.4"
 
 # app
 PREFERRED_VERSION_appres ?= "1.0.1"
-PREFERRED_VERSION_bdftopcf ?= "1.0.1"
-PREFERRED_VERSION_beforelight ?= "1.0.3"
 PREFERRED_VERSION_bitmap ?= "1.0.3"
-PREFERRED_VERSION_editres ?= "1.0.3"
-PREFERRED_VERSION_fontosfnt ?= "1.0.4"
-PREFERRED_VERSION_fslsfonts ?= "1.0.2"
-PREFERRED_VERSION_fstobdf ?= "1.0.3"
 PREFERRED_VERSION_iceauth ?= "1.0.2"
-PREFERRED_VERSION_ico ?= "1.0.2"
-PREFERRED_VERSION_lbxproxy ?= "1.0.1"
-PREFERRED_VERSION_listres ?= "1.0.1"
 PREFERRED_VERSION_luit ?= "1.0.3"
 PREFERRED_VERSION_mkfontdir-native ?= "1.0.4"
 PREFERRED_VERSION_mkfontdir ?= "1.0.4"
 PREFERRED_VERSION_mkfontscale ?= "1.0.5"
-PREFERRED_VERSION_oclock ?= "1.0.1"
-PREFERRED_VERSION_proxymngr ?= "1.0.1"
-PREFERRED_VERSION_rgb ?= "1.0.3"
-PREFERRED_VERSION_rstart ?= "1.0.2"
-PREFERRED_VERSION_scripts ?= "1.0.1"
-PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_sessreg ?= "1.0.4"
 PREFERRED_VERSION_setxkbmap ?= "1.0.4"
-PREFERRED_VERSION_showfont ?= "1.0.2"
 PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_twm ?= "1.0.4"
-PREFERRED_VERSION_viewres ?= "1.0.1"
 PREFERRED_VERSION_x11perf ?= "1.5"
 PREFERRED_VERSION_xauth ?= "1.0.3"
 PREFERRED_VERSION_xbacklight ?= "1.1"
-PREFERRED_VERSION_xbiff ?= "1.0.1"
-PREFERRED_VERSION_xcalc ?= "1.0.2"
-PREFERRED_VERSION_xclipboard ?= "1.0.1"
-PREFERRED_VERSION_xclock ?= "1.0.3"
-PREFERRED_VERSION_xcompmgr ?= "1.1.4"
 PREFERRED_VERSION_xcmsdb ?= "1.0.1"
-PREFERRED_VERSION_xconsole ?= "1.0.3"
 PREFERRED_VERSION_xcursorgen ?= "1.0.2"
-PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
-PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.8"
 PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
 PREFERRED_VERSION_xdriinfo ?= "1.0.2"
-PREFERRED_VERSION_xedit ?= "1.0.2"
 PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xeyes ?= "1.0.1"
-PREFERRED_VERSION_xxf86dga ?= "1.0.2"
-PREFERRED_VERSION_xfd ?= "1.0.1"
-PREFERRED_VERSION_xfindproxy ?= "1.0.1"
-PREFERRED_VERSION_xfontsel ?= "1.0.2"
-PREFERRED_VERSION_xfs ?= "1.0.8"
-PREFERRED_VERSION_xfsinfo ?= "1.0.2"
-PREFERRED_VERSION_xfwp ?= "1.0.1"
 PREFERRED_VERSION_xgamma ?= "1.0.2"
-PREFERRED_VERSION_xgc ?= "1.0.1"
 PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinit ?= "1.0.9"
 PREFERRED_VERSION_xinput ?= "1.3.0"
 PREFERRED_VERSION_xkbcomp ?= "1.0.5"
 PREFERRED_VERSION_xkbevd ?= "1.0.2"
-PREFERRED_VERSION_xkbprint ?= "1.0.1"
 PREFERRED_VERSION_xkbutils ?= "1.0.1"
 PREFERRED_VERSION_xkill ?= "1.0.1"
-PREFERRED_VERSION_xload ?= "1.0.2"
-PREFERRED_VERSION_xlogo ?= "1.0.1"
 PREFERRED_VERSION_xlsatoms ?= "1.0.1"
 PREFERRED_VERSION_xlsclients ?= "1.0.1"
-PREFERRED_VERSION_xlsfonts ?= "1.0.2"
-PREFERRED_VERSION_xmag ?= "1.0.2"
-PREFERRED_VERSION_xman ?= "1.0.3"
-PREFERRED_VERSION_xmessage ?= "1.0.2"
-PREFERRED_VERSION_xmh ?= "1.0.1"
 PREFERRED_VERSION_xmodmap ?= "1.0.3"
-PREFERRED_VERSION_xmore ?= "1.0.1"
-PREFERRED_VERSION_xphelloworld ?= "1.0.1"
-PREFERRED_VERSION_xplsprinters ?= "1.0.1"
 PREFERRED_VERSION_xpr ?= "1.0.2"
-PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
 PREFERRED_VERSION_xprop ?= "1.0.4"
 PREFERRED_VERSION_xrandr ?= "1.2.3"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xrefresh ?= "1.0.2"
-PREFERRED_VERSION_xrx ?= "1.0.1"
 PREFERRED_VERSION_xset ?= "1.0.4"
 PREFERRED_VERSION_xsetmode ?= "1.0.0"
-PREFERRED_VERSION_xsetpointer ?= "1.0.1"
 PREFERRED_VERSION_xsetroot ?= "1.0.2"
-PREFERRED_VERSION_xsm ?= "1.0.1"
-PREFERRED_VERSION_xstdcmap ?= "1.0.1"
-PREFERRED_VERSION_xtrap ?= "1.0.2"
-PREFERRED_VERSION_xvidtune ?= "1.0.1"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwd ?= "1.0.1"
-PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwd ?= "1.0.2"
+PREFERRED_VERSION_xwininfo ?= "1.0.4"
 PREFERRED_VERSION_xwud ?= "1.0.1"
 
 # data
@@ -142,55 +87,35 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
 # driver
 PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
 PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-evdev ?= "1.99.4"
-PREFERRED_VERSION_xf86-input-fpit ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0"
 PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1"
 PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
 PREFERRED_VERSION_xf86-video-apm ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
 PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
-PREFERRED_VERSION_xf86-video-ati ?= "6.8.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.9.0"
 PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.9.0"
-PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-glint ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.10.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1"
 PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
-PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.2.1"
-PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
+PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.9"
 PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
-PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.9"
-PREFERRED_VERSION_xf86-video-radeonhd ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.12"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0"
 PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
 PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
 PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1"
@@ -202,20 +127,20 @@ PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0"
-PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-trident ?= "1.3.0"
 PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
-PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.16.1"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0"
 PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
 
 # font
@@ -226,34 +151,35 @@ PREFERRED_VERSION_font-util ?= "1.0.1"
 PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
 
 # lib
-PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_diet-x11 ?= "1.1.5"
+PREFERRED_VERSION_libapplewm ?= "1.0.0"
 PREFERRED_VERSION_libdmx ?= "1.0.2"
 PREFERRED_VERSION_libfs ?= "1.0.1"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
 PREFERRED_VERSION_libice ?= "1.0.4"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.0.3"
-PREFERRED_VERSION_libx11 ?= "1.1.4"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libsm ?= "1.1.0"
+PREFERRED_VERSION_libwindowswm ?= "1.0.0"
+PREFERRED_VERSION_libx11 ?= "1.1.5"
 PREFERRED_VERSION_libx11-native ?= "1.1.1"
-PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxau ?= "1.0.4"
 PREFERRED_VERSION_libxaw ?= "1.0.4"
 PREFERRED_VERSION_libxcomposite ?= "0.4.0"
 PREFERRED_VERSION_libxcursor ?= "1.1.9"
-PREFERRED_VERSION_libxdamage ?= "1.0.4"
+PREFERRED_VERSION_libxdamage ?= "1.1.1"
 PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
 PREFERRED_VERSION_libxdmcp ?= "1.0.2"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
 PREFERRED_VERSION_libxext ?= "1.0.4"
 PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.2"
+PREFERRED_VERSION_libxfont ?= "1.3.3"
 PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxft ?= "2.1.13"
 PREFERRED_VERSION_libxi ?= "1.1.3"
 PREFERRED_VERSION_libxinerama ?= "1.0.3"
 PREFERRED_VERSION_libxkbfile ?= "1.0.5"
-PREFERRED_VERSION_libxkbui ?= "1.0.2"
 PREFERRED_VERSION_libxmu ?= "1.0.4"
 PREFERRED_VERSION_libxpm ?= "3.5.7"
-PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrandr ?= "1.2.3"
 PREFERRED_VERSION_libxrender ?= "0.9.4"
 PREFERRED_VERSION_libxres ?= "1.0.3"
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
@@ -263,24 +189,39 @@ PREFERRED_VERSION_libxv ?= "1.0.4"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
 PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
-PREFERRED_VERSION_pixman ?= "0.10.0"
-PREFERRED_VERSION_xtrans ?= "1.2"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
+PREFERRED_VERSION_xtrans ?= "1.2.1"
+PREFERRED_VERSION_mesa ?= "7.2"
 
 # proto
+PREFERRED_VERSION_applewmproto ?= "1.0.3"
+PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_dmxproto ?= "2.2.2"
 PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
+PREFERRED_VERSION_fontsproto ?= "2.0.2"
 PREFERRED_VERSION_glproto ?= "1.4.9"
-PREFERRED_VERSION_inputproto ?= "1.4.3"
+PREFERRED_VERSION_inputproto ?= "1.4.4"
 PREFERRED_VERSION_kbproto ?= "1.0.3"
-PREFERRED_VERSION_printproto ?= "1.0.4"
 PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_recordproto ?= "1.13.2"
 PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_resourceproto ?= "1.0.2"
 PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_videoproto ?= "2.2.2"
+PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_xmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xextproto ?= "7.0.3"
 PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
-PREFERRED_VERSION_xproto-native ?= "7.0.12"
-PREFERRED_VERSION_xproto ?= "7.0.12"
+PREFERRED_VERSION_xf86driproto ?= "2.0.4"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xinemaroproto ?= "1.1.2"
+PREFERRED_VERSION_xproto-native ?= "7.0.13"
+PREFERRED_VERSION_xproto ?= "7.0.13"
 
 # util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
@@ -292,7 +233,7 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
-PREFERRED_VERSION_xserver-xorg ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.5.1"
 
 # Unreleased packages
 SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
diff --git a/packages/xorg-app/xcursorgen-native_1.0.2.bb b/packages/xorg-app/xcursorgen-native_1.0.2.bb
new file mode 100644
index 0000000000..0cbf9fc716
--- /dev/null
+++ b/packages/xorg-app/xcursorgen-native_1.0.2.bb
@@ -0,0 +1,7 @@
+inherit native
+require xcursorgen_${PV}.bb
+
+DEPENDS = "libx11-native libpng-native"
+
+S="${WORKDIR}/xcursorgen-${PV}"
+XORG_PN="xcursorgen"
diff --git a/packages/xorg-app/xwd_1.0.2.bb b/packages/xorg-app/xwd_1.0.2.bb
new file mode 100644
index 0000000000..7b712390c6
--- /dev/null
+++ b/packages/xorg-app/xwd_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu virtual/libx11"
+
diff --git a/packages/xorg-app/xwininfo_1.0.4.bb b/packages/xorg-app/xwininfo_1.0.4.bb
new file mode 100644
index 0000000000..069dd30aa8
--- /dev/null
+++ b/packages/xorg-app/xwininfo_1.0.4.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu libxext virtual/libx11"
+
diff --git a/packages/xorg-data/xcursor-themes_1.0.1.bb b/packages/xorg-data/xcursor-themes_1.0.1.bb
index 8cf822e56f..1107d08da9 100644
--- a/packages/xorg-data/xcursor-themes_1.0.1.bb
+++ b/packages/xorg-data/xcursor-themes_1.0.1.bb
@@ -1,5 +1,7 @@
 require xorg-data-common.inc
 PE = "1"
 
-DEPENDS += " libxcursor"
+DEPENDS += " libxcursor xcursorgen-native"
+
+FILES_${PN} += "${datadir}/icons"
 
diff --git a/packages/xorg-driver/xf86-input-evdev_2.0.4.bb b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
new file mode 100644
index 0000000000..792909621a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-joystick_1.3.2.bb b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb
new file mode 100644
index 0000000000..a53297fd8a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
new file mode 100644
index 0000000000..e6325675f8
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
index bed0160138..f5c0186565 100644
--- a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
+++ b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
@@ -8,8 +8,8 @@ PR = "r6"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \
            file://use-hal-for-device.diff;patch=1 \
-	   file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \
-	   file://dynamic-xy.patch;patch=1 \
+           file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \
+           file://dynamic-xy.patch;patch=1 \
            file://10-x11-input-tslib.fdi"
 
 do_configure_prepend() {
diff --git a/packages/xorg-driver/xf86-video-geode_2.10.1.bb b/packages/xorg-driver/xf86-video-geode_2.10.1.bb
new file mode 100644
index 0000000000..380ce2ea0b
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-geode_2.10.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+PE = "1"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
diff --git a/packages/xorg-driver/xf86-video-glint_1.2.1.bb b/packages/xorg-driver/xf86-video-glint_1.2.1.bb
new file mode 100644
index 0000000000..eac23c74d9
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-glint_1.2.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Glint display driver"
+
+DEPENDS += " xf86dgaproto drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-i128_1.3.1.bb b/packages/xorg-driver/xf86-video-i128_1.3.1.bb
new file mode 100644
index 0000000000..78d5eda810
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i128_1.3.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-impact_0.2.0.bb b/packages/xorg-driver/xf86-video-impact_0.2.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-impact_0.2.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-intel_2.4.2.bb b/packages/xorg-driver/xf86-video-intel_2.4.2.bb
new file mode 100644
index 0000000000..eed1fcb600
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-intel_2.4.2.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-mach64_6.8.0.bb b/packages/xorg-driver/xf86-video-mach64_6.8.0.bb
new file mode 100644
index 0000000000..eed1fcb600
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-mach64_6.8.0.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-mga_1.4.9.bb b/packages/xorg-driver/xf86-video-mga_1.4.9.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-mga_1.4.9.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-nv_2.1.12.bb b/packages/xorg-driver/xf86-video-nv_2.1.12.bb
new file mode 100644
index 0000000000..0d4ee2ed19
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nv_2.1.12.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb b/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb
new file mode 100644
index 0000000000..facae8950a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- openchrome display driver"
+PE = "1"
+
+do_configure_prepend() {
+	rm ${S}/acinclude.m4 || true
+}
+
diff --git a/packages/xorg-driver/xf86-video-r128_6.8.0.bb b/packages/xorg-driver/xf86-video-r128_6.8.0.bb
new file mode 100644
index 0000000000..994ea24d8f
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-r128_6.8.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- r128 display driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb b/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb b/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-tga_1.2.0.bb b/packages/xorg-driver/xf86-video-tga_1.2.0.bb
new file mode 100644
index 0000000000..d3cf65f034
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tga_1.2.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+
+PE = "1"
+
+DESCRIPTION = "DEC 21030 X11 driver"
+
+DEPENDS += " xf86dgaproto"
+
diff --git a/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb b/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb
new file mode 100644
index 0000000000..c3054b9051
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+PE = "1"
+
diff --git a/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch b/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch
new file mode 100644
index 0000000000..a886e6c150
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch
@@ -0,0 +1,13 @@
+Index: xf86-video-vesa-2.0.0/configure.ac
+===================================================================
+--- xf86-video-vesa-2.0.0.orig/configure.ac	2008-11-06 15:13:02.000000000 +0000
++++ xf86-video-vesa-2.0.0/configure.ac	2008-11-06 15:13:16.000000000 +0000
+@@ -69,7 +69,7 @@
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+ CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
++INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
+ AC_SUBST([CFLAGS])
+ AC_SUBST([INCLUDES])
+ 
diff --git a/packages/xorg-driver/xf86-video-vesa_2.0.0.bb b/packages/xorg-driver/xf86-video-vesa_2.0.0.bb
new file mode 100644
index 0000000000..bd2f7cf7c1
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vesa_2.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+PE = "1"
+
+SRC_URI += "file://fix-includepath.patch;patch=1 \
+            file://fix-configure-includes.patch;patch=1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vmware_10.16.5.bb b/packages/xorg-driver/xf86-video-vmware_10.16.5.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vmware_10.16.5.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb b/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb
new file mode 100644
index 0000000000..ea1c005e8c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- wsfb display driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb b/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index a75e409c8c..0f24dd5e30 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -25,10 +25,10 @@ do_stage() {
 # Of course this will blow up when cross compiling.
 
 do_configure_prepend() {
-	incdir=${STAGING_INCDIR}/xorg
-	for f in dri.h sarea.h dristruct.h exa.h damage.h; do
+	incdir=${layout_includedir}/xorg
+	for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do
 		path="$incdir/$f"
-		if [ -f "$path" ]; then
+		if [ -f "${STAGING_DIR_HOST}/$path" ]; then
 			p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
 			eval "export ac_cv_file_$p=yes"
 		fi
diff --git a/packages/xorg-lib/diet-x11_1.1.5.bb b/packages/xorg-lib/diet-x11_1.1.5.bb
new file mode 100644
index 0000000000..19a9efecbf
--- /dev/null
+++ b/packages/xorg-lib/diet-x11_1.1.5.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/xorg-lib/libsm_1.1.0.bb b/packages/xorg-lib/libsm_1.1.0.bb
new file mode 100644
index 0000000000..7a3089894d
--- /dev/null
+++ b/packages/xorg-lib/libsm_1.1.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans e2fsprogs-libs"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libSM"
diff --git a/packages/xorg-lib/libx11/keysymdef_include.patch b/packages/xorg-lib/libx11/keysymdef_include.patch
new file mode 100644
index 0000000000..07487b6b2e
--- /dev/null
+++ b/packages/xorg-lib/libx11/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac	2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac	2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++	AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++	KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++	dir=`pkg-config --variable=includedir xproto`
++	KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+-        AC_MSG_RESULT([$KEYSYMDEF])
++	AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ 	AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+ 
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/packages/xorg-lib/libx11_1.1.5.bb b/packages/xorg-lib/libx11_1.1.5.bb
new file mode 100644
index 0000000000..a22b7a0158
--- /dev/null
+++ b/packages/xorg-lib/libx11_1.1.5.bb
@@ -0,0 +1,31 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://keysymdef_include.patch;patch=1"
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; 
+		mv makekeys.c.orig makekeys.c || true
+		touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/packages/xorg-lib/libxcursor-native_1.1.9.bb b/packages/xorg-lib/libxcursor-native_1.1.9.bb
new file mode 100644
index 0000000000..403030e93d
--- /dev/null
+++ b/packages/xorg-lib/libxcursor-native_1.1.9.bb
@@ -0,0 +1,6 @@
+require libxcursor_${PV}.bb
+
+DEPENDS = "libx11-native fixesproto-native libxfixes-native"
+PE = "1"
+
+inherit native
diff --git a/packages/xorg-lib/libxfixes-native_4.0.3.bb b/packages/xorg-lib/libxfixes-native_4.0.3.bb
new file mode 100644
index 0000000000..5ef6ded80a
--- /dev/null
+++ b/packages/xorg-lib/libxfixes-native_4.0.3.bb
@@ -0,0 +1,6 @@
+require libxfixes_${PV}.bb
+
+DEPENDS = "libx11-native"
+PE = "1"
+
+inherit native
diff --git a/packages/xorg-lib/libxft_2.1.13.bb b/packages/xorg-lib/libxft_2.1.13.bb
new file mode 100644
index 0000000000..84d0cc2cbe
--- /dev/null
+++ b/packages/xorg-lib/libxft_2.1.13.bb
@@ -0,0 +1,20 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PROVIDES = "xft"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXft"
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libxft2', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}"
diff --git a/packages/xorg-lib/libxrandr_1.2.3.bb b/packages/xorg-lib/libxrandr_1.2.3.bb
new file mode 100644
index 0000000000..f6d7623bca
--- /dev/null
+++ b/packages/xorg-lib/libxrandr_1.2.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Resize and Rotate extension library"
+LICENSE = "BSD-X"
+DEPENDS += "randrproto libxrender libxext"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXrandr"
diff --git a/packages/xorg-lib/libxrender-native_0.9.4.bb b/packages/xorg-lib/libxrender-native_0.9.4.bb
new file mode 100644
index 0000000000..a4f4ba9e36
--- /dev/null
+++ b/packages/xorg-lib/libxrender-native_0.9.4.bb
@@ -0,0 +1,6 @@
+require libxrender_${PV}.bb
+
+DEPENDS = "libx11-native renderproto-native"
+PE = "1"
+
+inherit native
diff --git a/packages/xorg-lib/libxxf86vm_1.0.2.bb b/packages/xorg-lib/libxxf86vm_1.0.2.bb
new file mode 100644
index 0000000000..2d1af9c9aa
--- /dev/null
+++ b/packages/xorg-lib/libxxf86vm_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXxf86vm"
diff --git a/packages/xorg-proto/fixesproto-native_4.0.bb b/packages/xorg-proto/fixesproto-native_4.0.bb
new file mode 100644
index 0000000000..927e004437
--- /dev/null
+++ b/packages/xorg-proto/fixesproto-native_4.0.bb
@@ -0,0 +1,7 @@
+require fixesproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "fixesproto"
+
+inherit native
diff --git a/packages/xorg-proto/renderproto-native_0.9.3.bb b/packages/xorg-proto/renderproto-native_0.9.3.bb
new file mode 100644
index 0000000000..8d83c99774
--- /dev/null
+++ b/packages/xorg-proto/renderproto-native_0.9.3.bb
@@ -0,0 +1,7 @@
+require renderproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "renderproto"
+
+inherit native
diff --git a/packages/xorg-proto/xproto-native_7.0.13.bb b/packages/xorg-proto/xproto-native_7.0.13.bb
new file mode 100644
index 0000000000..5dde8a7d4a
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_7.0.13.bb
@@ -0,0 +1,3 @@
+require xproto_${PV}.bb
+
+inherit native
diff --git a/packages/xorg-proto/xproto_7.0.13.bb b/packages/xorg-proto/xproto_7.0.13.bb
new file mode 100644
index 0000000000..b403ff5615
--- /dev/null
+++ b/packages/xorg-proto/xproto_7.0.13.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+
+PR = "r0"
+PE = "1"
+
+XORG_PN = "xproto"
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 190de2c49a..d391ffe60b 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -16,8 +16,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa libxcalibrate"
 RECOMMENDS_${PN} = "hal"
 
 XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
-	file://xorg.conf"
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
@@ -26,9 +25,11 @@ inherit autotools pkgconfig
 EXTRA_OECONF += " --enable-xcalibrate \
                   ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
+EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
+
 PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb"
+RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf"
 
 PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils"
 
@@ -43,14 +44,10 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 		    ${libdir}/xorg/modules/*/*/.debug \
 		    "
 
-CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
-
 do_stage() {
 	autotools_stage_all
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/X11
-	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
 	ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
 }
diff --git a/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
new file mode 100644
index 0000000000..e0f633bc24
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am	2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am	2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+ 
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+ 
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
index 1778960638..1778960638 100644
--- a/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf
+++ b/packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
diff --git a/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
index 983bb0823a..983bb0823a 100644
--- a/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf
+++ b/packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
diff --git a/packages/xorg-xserver/xserver-xorg-conf/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/xorg.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-conf/xorg.conf
diff --git a/packages/xorg-xserver/xserver-xorg-conf_0.1.bb b/packages/xorg-xserver/xserver-xorg-conf_0.1.bb
new file mode 100644
index 0000000000..1ff83ea27b
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Machine specific xorg.conf files"
+
+SRC_URI = "file://xorg.conf"
+
+do_install() {
+	install -d ${D}/${sysconfdir}/X11
+	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+}
+
+CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
+
diff --git a/packages/xorg-xserver/xserver-xorg/xorg.conf b/packages/xorg-xserver/xserver-xorg/xorg.conf
deleted file mode 100644
index 4b327022f6..0000000000
--- a/packages/xorg-xserver/xserver-xorg/xorg.conf
+++ /dev/null
@@ -1,135 +0,0 @@
-
-# xorg configuration
-
-Section "ServerLayout"
-	Identifier     "Default Layout"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Mouse0" "CorePointer"
-	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
-
-# RgbPath is the location of the RGB database.  Note, this is the name of the 
-# file minus the extension (like ".txt" or ".db").  There is normally
-# no need to change the default.
-# Multiple FontPath entries are allowed (they are concatenated together)
-# By default, Red Hat 6.0 and later now use a font server independent of
-# the X server to render fonts.
-#       FontPath     "unix/:7100"
-	FontPath     "/usr/lib/X11/fonts/misc"
-EndSection
-
-Section "Module"
-	Load  "dbe"
-	Load  "extmod"
-	Load  "fbdevhw"
-#	Load  "glx"
-	Load  "record"
-	Load  "freetype"
-	Load  "type1"
-# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
-#	Load  "z4l"
-EndSection
-
-Section "InputDevice"
-
-# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
-#	Option	"Xleds"		"1 2 3"
-# To disable the XKEYBOARD extension, uncomment XkbDisable.
-#	Option	"XkbDisable"
-# To customise the XKB settings to suit your keyboard, modify the
-# lines below (which are the defaults).  For example, for a non-U.S.
-# keyboard, you will probably want to use:
-#	Option	"XkbModel"	"pc102"
-# If you have a US Microsoft Natural keyboard, you can use:
-#	Option	"XkbModel"	"microsoft"
-#
-# Then to change the language, change the Layout setting.
-# For example, a german layout can be obtained with:
-#	Option	"XkbLayout"	"de"
-# or:
-#	Option	"XkbLayout"	"de"
-#	Option	"XkbVariant"	"nodeadkeys"
-#
-# If you'd like to switch the positions of your capslock and
-# control keys, use:
-#	Option	"XkbOptions"	"ctrl:swapcaps"
-# Or if you just want both to be control, use:
-#	Option	"XkbOptions"	"ctrl:nocaps"
-#
-	Identifier  "Keyboard0"
-	Driver      "keyboard"
-	Option	    "XkbModel" "pc105"
-	Option	    "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Mouse0"
-	Driver      "mouse"
-	Option	    "Protocol" "IMPS/2"
-	Option	    "Device" "/dev/input/mice"
-	Option	    "ZAxisMapping" "4 5"
-	Option	    "Emulate3Buttons" "yes"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor0"
-	VendorName   "Monitor Vendor"
-	ModelName    "NEC FP2141SB"
-#	DisplaySize  400 300
-# Note: setting HorizSync/VertRefresh will override DDC probe
-#	HorizSync    30.0 - 140.0
-#	VertRefresh  25.0 - 160.0
-	Option	     "dpms"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor1"
-	VendorName   "Generic Vendor"
-	ModelName    "Generic Monitor"
-	HorizSync    28-50
-	VertRefresh  43-73
-	Modeline     "800x600-60"  40.0000  800  840  976 1056   600  601  605  628
-	Modeline     "800x600-72"  50.0000  800  856  976 1040   600  637  643  666
-	Modeline     "640x480-60"  25.1749  640  656  744  800   480  490  492  525 -HSync -VSync
-	Modeline     "640x480-72"  31.5000  640  664  704  832   480  489  492  520 -HSync -VSync
-	Option	     "dpms"
-EndSection
-
-
-Section "Device"
-        Identifier  "FBDev"
-        Driver      "fbdev"
-	#Option     "shadowfb" "off"
-EndSection
-
-Section "Screen"
-    Identifier	"Screen0"
-    Device	"FBDev"
-    Monitor	"Monitor0"
-    DefaultDepth 16
-
-    SubSection "Display"
-        Depth		8
-        Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth		16
-        Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth		24
-	FbBpp		32
-        Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-EndSection
-
-Section "DRI"
-	Group        0
-	Mode         0666
-EndSection
-
diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
index 218e6dc026..61f73b3454 100644
--- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -2,9 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r3"
-
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
+PR = "r4"
 
 export LDFLAGS += " -ldl "
 
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index d28fec16e1..9d6dca4489 100644
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -2,13 +2,11 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
 export LDFLAGS += " -ldl "
 
 #DESCRIPTION = ""
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 562266ff39..852e847265 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index 3f53002a34..ba64d72d35 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
@@ -11,6 +11,4 @@ SRC_URI += "file://drmfix.patch;patch=1 \
 
 MESA_VER = "7.0.2"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
 export LDFLAGS += " -ldl "
diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
new file mode 100644
index 0000000000..92ef22fd63
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -0,0 +1,13 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl"
+PE = "1"
+PR = "r1"
+
+SRC_URI += "file://drmfix.patch;patch=1 \
+            file://sysroot_fix.patch;patch=1"
+
+MESA_VER = "7.2"
+
+export LDFLAGS += " -ldl "
diff --git a/packages/xserver-common/files/gta-xorg-fixes.patch b/packages/xserver-common/files/gta-xorg-fixes.patch
new file mode 100644
index 0000000000..adf6798a99
--- /dev/null
+++ b/packages/xserver-common/files/gta-xorg-fixes.patch
@@ -0,0 +1,29 @@
+Index: xserver-common-1.22/X11/Xserver
+===================================================================
+--- xserver-common-1.22.orig/X11/Xserver	2008-11-12 09:16:50.000000000 +0000
++++ xserver-common-1.22/X11/Xserver	2008-11-12 09:18:53.000000000 +0000
+@@ -109,7 +109,11 @@
+ 	"Nokia RX-44")
+ 		ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
+ 	"GTA01" )
+-		ARGS="$ARGS -dpi 285 -screen 480x640" ;;
++		ARGS="$ARGS -dpi 285"
++		if [ "$XSERVER" != "Xorg" ] ; then
++			ARGS="$ARGS -screen 480x640"
++		fi
++		;;
+ 	"Motorola Ezx Platform")
+ 		ARGS="$ARGS -dpi 170 -screen 240x320" ;;
+ 	"ARM-IntegratorCP" | "ARM-Versatile PB")
+@@ -118,7 +122,10 @@
+ 		modprobe mbxfb
+ 	        ARGS="$ARGS -fb /dev/fb1" ;;
+ 	"GTA02")
+- 		ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE}" 
++ 		ARGS="$ARGS -dpi 285"
++		if [ "$XSERVER" != "Xorg" ] ; then
++			ARGS="$ARGS -screen ${SCREEN_SIZE}"
++		fi
+ 		;;
+ 	"Boundary Devices Neon board")
+ 		ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib"
diff --git a/packages/xserver-common/files/xorg-fixes.patch b/packages/xserver-common/files/xorg-fixes.patch
new file mode 100644
index 0000000000..b2fd544fb5
--- /dev/null
+++ b/packages/xserver-common/files/xorg-fixes.patch
@@ -0,0 +1,25 @@
+Index: xserver-common-1.22/X11/Xserver
+===================================================================
+--- xserver-common-1.22.orig/X11/Xserver	2008-11-12 09:14:55.000000000 +0000
++++ xserver-common-1.22/X11/Xserver	2008-11-12 09:16:22.000000000 +0000
+@@ -48,6 +48,7 @@
+ 
+ ARGS="-br -pn $INPUT_EXTRA_ARGS"
+ 
++if [ "$XSERVER" != "Xorg" ] ; then
+ # use ucb 1x00 touchscreen if present
+ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+   ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+@@ -58,10 +59,11 @@
+ if [ -e "$TSLIB_TSDEVICE" ] ; then
+   ARGS="$ARGS -mouse tslib"
+ else
+-  if  [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then
++  if  [ -e /dev/input/mice ] ; then
+     ARGS="$ARGS -mouse mouse"
+   fi
+ fi
++fi
+ 
+ # start off server in conventional location.
+ case `module_id` in
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
index 6dcbc6862d..05b15ae564 100644
--- a/packages/xserver-common/xserver-common_1.22.bb
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r7"
+PR = "r8"
 
 PACKAGE_ARCH = "all"
 
@@ -11,6 +11,8 @@ inherit gpe
 
 SRC_URI_append = " file://setDPI.sh "
 SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \
+                            file://xorg-fixes.patch;patch=1 \
+			    file://gta-xorg-fixes.patch;patch=1 \
                             file://default.xmodmap "
 
 do_install_append() {
author	Graeme Gregory <dp@xora.org.uk>	2008-11-12 16:20:40 +0000
committer	Graeme Gregory <dp@xora.org.uk>	2008-11-12 16:20:40 +0000
commit	c2d4ecfceeeca4174ddd8d2d495e20df323fd112 (patch)
tree	016219928ef9556472f6720d315938fbaaf0debb
parent	8476a8f3212064b5ebb979d9f6b96043af5db2e5 (diff)
parent	a1ca202a5c8f8a7502639297b55ccffe30493022 (diff)