diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mesa/Manifest | 54 | ||||
| -rw-r--r-- | media-libs/mesa/files/6.5-fix-radeon-PCIE.patch | 45 | ||||
| -rw-r--r-- | media-libs/mesa/files/64bit-fix-have-dix-config.patch | 18 | ||||
| -rw-r--r-- | media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch | 17 | ||||
| -rw-r--r-- | media-libs/mesa/files/change-default-dri-driver-dir.patch | 11 | ||||
| -rw-r--r-- | media-libs/mesa/files/digest-mesa-6.4.2-r2 | 3 | ||||
| -rw-r--r-- | media-libs/mesa/files/digest-mesa-6.5-r4 | 3 | ||||
| -rw-r--r-- | media-libs/mesa/files/digest-mesa-6.5.1-r2 | 3 | ||||
| -rw-r--r-- | media-libs/mesa/files/makedepend-location.patch | 12 | ||||
| -rw-r--r-- | media-libs/mesa/files/radeon-texture-problem.patch | 11 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.4.2-r2.ebuild | 349 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.5-r4.ebuild | 347 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.5.1-r2.ebuild | 330 |
13 files changed, 4 insertions, 1199 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index a41bb6480dbd..1e6c803c937a 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -6,10 +6,6 @@ AUX 6.4-multilib-fix.patch 535 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 S MD5 d6254b7a775480084efcd30d9fb4cbad files/6.4-multilib-fix.patch 535 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 files/6.4-multilib-fix.patch 535 SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f files/6.4-multilib-fix.patch 535 -AUX 6.5-fix-radeon-PCIE.patch 1730 RMD160 163c5d72a388174b614e81076a7334ecde5459a8 SHA1 80c7b96cf02661786409f2370ca321d5a3aa4a80 SHA256 4c2b927a61a4ca5d12571016d8b0962f29f22d535100abc260a30eedd3be3736 -MD5 200c1f868cea4e53c5dd16c30459d070 files/6.5-fix-radeon-PCIE.patch 1730 -RMD160 163c5d72a388174b614e81076a7334ecde5459a8 files/6.5-fix-radeon-PCIE.patch 1730 -SHA256 4c2b927a61a4ca5d12571016d8b0962f29f22d535100abc260a30eedd3be3736 files/6.5-fix-radeon-PCIE.patch 1730 AUX 6.5-re-order-context-destruction.patch 2295 RMD160 5c2648f9d4fca2f3abf53ad9d29101fd931493be SHA1 0f3825910ba3d246cf59efe560f9fecab82e86d4 SHA256 dda980be89d14df3659c0d409c56e4ccd6a03afdca2e8edc502845943423a600 MD5 621322964afb60d36444f1dfe86719b2 files/6.5-re-order-context-destruction.patch 2295 RMD160 5c2648f9d4fca2f3abf53ad9d29101fd931493be files/6.5-re-order-context-destruction.patch 2295 @@ -34,22 +30,10 @@ AUX 6.5.1-xcb-dont-unlock-twice.patch 655 RMD160 afc8427c541bbb271457e4983df2de0 MD5 78ded8afd40dce99354591b6234cadf3 files/6.5.1-xcb-dont-unlock-twice.patch 655 RMD160 afc8427c541bbb271457e4983df2de023fa7ceda files/6.5.1-xcb-dont-unlock-twice.patch 655 SHA256 d972afe88f70c5a1a14f66fdccca2f67d6d0f0d9e83c010e66dc577d4b3f15bd files/6.5.1-xcb-dont-unlock-twice.patch 655 -AUX 64bit-fix-have-dix-config.patch 645 RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 SHA1 9ad64261cbbbe6c3e897701dad2f4f0e2f67d4c7 SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab -MD5 0009bfb15983cd6258cde8ca9ec7134c files/64bit-fix-have-dix-config.patch 645 -RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 files/64bit-fix-have-dix-config.patch 645 -SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab files/64bit-fix-have-dix-config.patch 645 -AUX 64bit-fix-indirect-vertex-array.patch 748 RMD160 b413df73cc43b83931cd25d5e207d3c49078dd55 SHA1 34f65998c23a45f07f4c5a71ab773038ffaeaa40 SHA256 2e070e5e4aa4b1a1f12ccce290496c5eca92d76819805fe8d529a4f7fd71c82c -MD5 c955d3e7a9971b7a32359a45383569f8 files/64bit-fix-indirect-vertex-array.patch 748 -RMD160 b413df73cc43b83931cd25d5e207d3c49078dd55 files/64bit-fix-indirect-vertex-array.patch 748 -SHA256 2e070e5e4aa4b1a1f12ccce290496c5eca92d76819805fe8d529a4f7fd71c82c files/64bit-fix-indirect-vertex-array.patch 748 AUX change-default-dri-driver-dir-X7.1.patch 399 RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 SHA1 c44dd4a468d9f4b2ed202bc914bc25d5db206a80 SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d MD5 81ac0734b6194da3d9ca40d564303670 files/change-default-dri-driver-dir-X7.1.patch 399 RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 files/change-default-dri-driver-dir-X7.1.patch 399 SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d files/change-default-dri-driver-dir-X7.1.patch 399 -AUX change-default-dri-driver-dir.patch 412 RMD160 84b1a7e60661603735f377759917c1064346ee3e SHA1 45af3e1c2dc2e25242f6be0bc9149dad294d63da SHA256 50868940210dc613b67b87a900158719e96bb38451cbcfbd12edab4b170065d7 -MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412 -RMD160 84b1a7e60661603735f377759917c1064346ee3e files/change-default-dri-driver-dir.patch 412 -SHA256 50868940210dc613b67b87a900158719e96bb38451cbcfbd12edab4b170065d7 files/change-default-dri-driver-dir.patch 412 AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91 MD5 eae9808321f1e10f5cc6520c33914b3e files/lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 files/lib/libGL.la 755 @@ -58,38 +42,17 @@ AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 files/lib/libGLU.la 752 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/lib/libGLU.la 752 -AUX makedepend-location.patch 375 RMD160 30e1c4a45cdd2077edd80043911bf05275493195 SHA1 0e13e7a5668366b891433ab31f0c7489e4c9ba12 SHA256 3541f6528b402328886e3169169fc400db11ed91d39ddd2b5d3b1f6be77d7ff5 -MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375 -RMD160 30e1c4a45cdd2077edd80043911bf05275493195 files/makedepend-location.patch 375 -SHA256 3541f6528b402328886e3169169fc400db11ed91d39ddd2b5d3b1f6be77d7ff5 files/makedepend-location.patch 375 -AUX radeon-texture-problem.patch 363 RMD160 d7241f061f4f0abbab57920cfaa480ad819bf9cb SHA1 2b8a1d5e6423db4a72fbd92e66e4426346f5e14e SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea -MD5 5bd06d12cc0c1f11b9671eb7ec57f5f0 files/radeon-texture-problem.patch 363 -RMD160 d7241f061f4f0abbab57920cfaa480ad819bf9cb files/radeon-texture-problem.patch 363 -SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea files/radeon-texture-problem.patch 363 -DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd -EBUILD mesa-6.4.2-r2.ebuild 9490 RMD160 c03fd23481b7c6509be8797f8f255a4df26b1ac3 SHA1 10b5c03c5479700f851496c49b62a27b9a0ae5b9 SHA256 3cee6cfb5a2a0df1abda0b46d62d8166fa69564bcd8e5ec971b446ea594c3efa -MD5 701fcb9185b2c1e8fe46f765c0e15863 mesa-6.4.2-r2.ebuild 9490 -RMD160 c03fd23481b7c6509be8797f8f255a4df26b1ac3 mesa-6.4.2-r2.ebuild 9490 -SHA256 3cee6cfb5a2a0df1abda0b46d62d8166fa69564bcd8e5ec971b446ea594c3efa mesa-6.4.2-r2.ebuild 9490 EBUILD mesa-6.5-r3.ebuild 9167 RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c SHA1 3290c59465fb57ac64e9f16276365e9d6811d564 SHA256 153bdcbb30c822e817e8b6722918117f238cade73a3e69a66d4dbd3ce8a013f4 MD5 322719f46e0956b212398bb467c1aea5 mesa-6.5-r3.ebuild 9167 RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c mesa-6.5-r3.ebuild 9167 SHA256 153bdcbb30c822e817e8b6722918117f238cade73a3e69a66d4dbd3ce8a013f4 mesa-6.5-r3.ebuild 9167 -EBUILD mesa-6.5-r4.ebuild 9221 RMD160 3a87cb4d87fc96d7d9837e5624650df95b19c04f SHA1 b0986048b27811c9b99f1c3d41c8dccb7aa9b180 SHA256 a7775d247aca136abc5ce84a9fd2a7dbe517494c65b399ab16bad15dd0994e97 -MD5 fb9dc886261103aeaa89cb876a2f7bd6 mesa-6.5-r4.ebuild 9221 -RMD160 3a87cb4d87fc96d7d9837e5624650df95b19c04f mesa-6.5-r4.ebuild 9221 -SHA256 a7775d247aca136abc5ce84a9fd2a7dbe517494c65b399ab16bad15dd0994e97 mesa-6.5-r4.ebuild 9221 EBUILD mesa-6.5.1-r1.ebuild 8442 RMD160 aa1d9611d6e4583713bfe2f201c430b2e4c72c2d SHA1 89e450d59ee56a7fdcd86deb09b7baae3c0ea6af SHA256 b94e8f06c49b673164568f5257cccdcd3e2fe33df03a24334554f158c991a54e MD5 f35b1420f67885482835bd471ece1f9c mesa-6.5.1-r1.ebuild 8442 RMD160 aa1d9611d6e4583713bfe2f201c430b2e4c72c2d mesa-6.5.1-r1.ebuild 8442 SHA256 b94e8f06c49b673164568f5257cccdcd3e2fe33df03a24334554f158c991a54e mesa-6.5.1-r1.ebuild 8442 -EBUILD mesa-6.5.1-r2.ebuild 8979 RMD160 8f4abf9c4b64d2bb9deb1b4b8f5bde05ff5d94fe SHA1 691dc2dd9422a94b8368273bffbccf7d57da4b26 SHA256 20693be3ecc219304fc9c83311e7d454fe851cadad7638c403a2989442511dc6 -MD5 170a7fc9abbfbc49ea96da8547bebc53 mesa-6.5.1-r2.ebuild 8979 -RMD160 8f4abf9c4b64d2bb9deb1b4b8f5bde05ff5d94fe mesa-6.5.1-r2.ebuild 8979 -SHA256 20693be3ecc219304fc9c83311e7d454fe851cadad7638c403a2989442511dc6 mesa-6.5.1-r2.ebuild 8979 EBUILD mesa-6.5.1-r4.ebuild 9325 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63 SHA1 f8bc45a2802786978bb3407f9b8dea64d7c620a4 SHA256 8f492fd251ae5948a6a4627f2146288d337c853bdeb63161192d48aebc31140b MD5 402ba128e34a3566d6d058ad2eda0939 mesa-6.5.1-r4.ebuild 9325 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63 mesa-6.5.1-r4.ebuild 9325 @@ -98,29 +61,20 @@ EBUILD mesa-6.5.2.ebuild 8752 RMD160 94533a21ce9becfb866cc0890b0edb0a28a45c49 SH MD5 ed5b0eb13a88ebea5be3e700cdf48019 mesa-6.5.2.ebuild 8752 RMD160 94533a21ce9becfb866cc0890b0edb0a28a45c49 mesa-6.5.2.ebuild 8752 SHA256 ea5a85bf21e8eecf2bdca78f483a2c73d93c03657bb4c32d37d6fec21bdd76d8 mesa-6.5.2.ebuild 8752 -MISC ChangeLog 24385 RMD160 c40a84fd8edd54c97926a68b8d1140a9fb80aded SHA1 b8fcbc50891f981f36e52df74a0e0ad6aee5e116 SHA256 7c791b6c1af681a1a5727bedb7aead22a1b9dacc2e1f87af5482477aefe250be -MD5 16ecbad0a9f9ba4a7c430ad23dd018cf ChangeLog 24385 -RMD160 c40a84fd8edd54c97926a68b8d1140a9fb80aded ChangeLog 24385 -SHA256 7c791b6c1af681a1a5727bedb7aead22a1b9dacc2e1f87af5482477aefe250be ChangeLog 24385 +MISC ChangeLog 24763 RMD160 bd9ca3144270230325cb81be2981b837720e7c25 SHA1 05709dfb8c429b6e48de01b9f05b777f43c67a50 SHA256 0a45203fd51706708eb4409f3c0501ae99c1c0b0f54e95d551cfe160a392df13 +MD5 a30d0b9aeebe6565297724e218e2dd9c ChangeLog 24763 +RMD160 bd9ca3144270230325cb81be2981b837720e7c25 ChangeLog 24763 +SHA256 0a45203fd51706708eb4409f3c0501ae99c1c0b0f54e95d551cfe160a392df13 ChangeLog 24763 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 -MD5 573c1cb18905c1d9339a9a84bd9779d8 files/digest-mesa-6.4.2-r2 247 -RMD160 2d14f708463f76c30291f3950a6448c1227fbaf4 files/digest-mesa-6.4.2-r2 247 -SHA256 56d5e28e1cfc9d340973fea80d08d005cc90209656904d10c7b16141b2809e91 files/digest-mesa-6.4.2-r2 247 MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r3 241 RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r3 241 SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r3 241 -MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r4 241 -RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r4 241 -SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r4 241 MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r1 247 RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r1 247 SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r1 247 -MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r2 247 -RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r2 247 -SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r2 247 MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r4 247 RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r4 247 SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r4 247 diff --git a/media-libs/mesa/files/6.5-fix-radeon-PCIE.patch b/media-libs/mesa/files/6.5-fix-radeon-PCIE.patch deleted file mode 100644 index fda09577d0ae..000000000000 --- a/media-libs/mesa/files/6.5-fix-radeon-PCIE.patch +++ /dev/null @@ -1,45 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=136315 ---- src/mesa/drivers/dri/radeon/radeon_screen.c -+++ src/mesa/drivers/dri/radeon/radeon_screen.c -@@ -343,7 +343,6 @@ - return NULL; - } - -- if (sPriv->drmMinor >= 6) { - gp.param = RADEON_PARAM_GART_BASE; - gp.value = &screen->gart_base; - -@@ -371,7 +370,6 @@ - screen->drmSupportsFragShader = (sPriv->drmMinor >= 18); - screen->drmSupportsPointSprites = (sPriv->drmMinor >= 13); - screen->drmSupportsCubeMapsR100 = (sPriv->drmMinor >= 15); -- } - } - - screen->mmio.handle = dri_priv->registerHandle; -@@ -425,9 +423,7 @@ - return NULL; - } - -- screen->gart_texture_offset = dri_priv->gartTexOffset + ( screen->IsPCI -- ? INREG( RADEON_AIC_LO_ADDR ) -- : ( ( INREG( RADEON_MC_AGP_LOCATION ) & 0x0ffffU ) << 16 ) ); -+ screen->gart_texture_offset = dri_priv->gartTexOffset + screen->gart_base; - } - - screen->chip_flags = 0; -@@ -976,12 +972,12 @@ - static const char *driver_name = "Radeon"; - static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 }; - static const __DRIversion dri_expected = { 4, 0, 0 }; -- static const __DRIversion drm_expected = { 1, 3, 0 }; -+ static const __DRIversion drm_expected = { 1, 6, 0 }; - #elif RADEON_COMMON && defined(RADEON_COMMON_FOR_R200) - static const char *driver_name = "R200"; - static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 }; - static const __DRIversion dri_expected = { 4, 0, 0 }; -- static const __DRIversion drm_expected = { 1, 5, 0 }; -+ static const __DRIversion drm_expected = { 1, 6, 0 }; - #elif RADEON_COMMON && defined(RADEON_COMMON_FOR_R300) - static const char *driver_name = "R300"; - static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 }; diff --git a/media-libs/mesa/files/64bit-fix-have-dix-config.patch b/media-libs/mesa/files/64bit-fix-have-dix-config.patch deleted file mode 100644 index 29e6f4016847..000000000000 --- a/media-libs/mesa/files/64bit-fix-have-dix-config.patch +++ /dev/null @@ -1,18 +0,0 @@ -=================================================================== -RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v -rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present. -retrieving revision 1.70 -retrieving revision 1.71 -diff -u -r1.70 -r1.71 ---- Mesa/src/mesa/main/glheader.h 2006/02/11 02:59:38 1.70 -+++ Mesa/src/mesa/main/glheader.h 2006/02/15 21:03:34 1.71 -@@ -46,6 +46,9 @@ - #ifndef GLHEADER_H - #define GLHEADER_H - -+#ifdef HAVE_DIX_CONFIG_H -+#include "dix-config.h" -+#endif - - #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER) - #include "xf86_ansic.h" diff --git a/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch b/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch deleted file mode 100644 index 4e744e91287d..000000000000 --- a/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch +++ /dev/null @@ -1,17 +0,0 @@ -=================================================================== -RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v -rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present. -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -r1.6 -r1.7 ---- Mesa/src/glx/x11/indirect_vertex_array.c 2005/08/19 18:53:26 1.6 -+++ Mesa/src/glx/x11/indirect_vertex_array.c 2006/02/14 15:04:45 1.7 -@@ -530,7 +530,7 @@ - emit_DrawArrays_header_old( __GLXcontext * gc, - struct array_state_vector * arrays, - size_t * elements_per_request, -- size_t * total_requests, -+ unsigned int * total_requests, - GLenum mode, GLsizei count ) - { - size_t command_size; diff --git a/media-libs/mesa/files/change-default-dri-driver-dir.patch b/media-libs/mesa/files/change-default-dri-driver-dir.patch deleted file mode 100644 index 36151d62b0ed..000000000000 --- a/media-libs/mesa/files/change-default-dri-driver-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c 2005-07-27 17:29:51.000000000 -0700 -+++ Mesa-6.3.1.1/src/glx/x11/dri_glx.c 2005-08-14 11:09:54.000000000 -0700 -@@ -58,7 +58,7 @@ - - #ifndef DEFAULT_DRIVER_DIR - /* this is normally defined in the Imakefile */ --#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri" -+#define DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - #endif - - static __DRIdriver *Drivers = NULL; diff --git a/media-libs/mesa/files/digest-mesa-6.4.2-r2 b/media-libs/mesa/files/digest-mesa-6.4.2-r2 deleted file mode 100644 index 13d7ad4d3f73..000000000000 --- a/media-libs/mesa/files/digest-mesa-6.4.2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009 -RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009 -SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009 diff --git a/media-libs/mesa/files/digest-mesa-6.5-r4 b/media-libs/mesa/files/digest-mesa-6.5-r4 deleted file mode 100644 index 79639c7ca0fc..000000000000 --- a/media-libs/mesa/files/digest-mesa-6.5-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363 -RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363 -SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363 diff --git a/media-libs/mesa/files/digest-mesa-6.5.1-r2 b/media-libs/mesa/files/digest-mesa-6.5.1-r2 deleted file mode 100644 index 45b5cf135d2d..000000000000 --- a/media-libs/mesa/files/digest-mesa-6.5.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257 -RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257 -SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257 diff --git a/media-libs/mesa/files/makedepend-location.patch b/media-libs/mesa/files/makedepend-location.patch deleted file mode 100644 index 7e49deec5632..000000000000 --- a/media-libs/mesa/files/makedepend-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN Mesa-6.3.1.1.orig/configs/linux-dri Mesa-6.3.1.1/configs/linux-dri ---- Mesa-6.3.1.1.orig/configs/linux-dri 2005-07-23 23:29:14.000000000 -0700 -+++ Mesa-6.3.1.1/configs/linux-dri 2005-08-10 14:56:16.000000000 -0700 -@@ -9,7 +9,7 @@ - CC = gcc - CXX = g++ - --MKDEP = /usr/X11R6/bin/makedepend -+MKDEP = /usr/bin/makedepend - #MKDEP = gcc -M - #MKDEP_OPTIONS = -MF depend - diff --git a/media-libs/mesa/files/radeon-texture-problem.patch b/media-libs/mesa/files/radeon-texture-problem.patch deleted file mode 100644 index c39d7e974cd2..000000000000 --- a/media-libs/mesa/files/radeon-texture-problem.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r1.11 -r1.12 ---- src/mesa/drivers/dri/r200/r200_texmem.c 2005/02/10 22:36:06 1.11 -+++ src/mesa/drivers/dri/r200/r200_texmem.c 2005/08/25 03:38:07 1.12 -@@ -427,7 +427,7 @@ - fprintf(stderr, "DRM_RADEON_TEXTURE: again!\n"); - usleep(1); - } -- } while ( ret && errno == EAGAIN ); -+ } while ( ret == -EAGAIN ); - - UNLOCK_HARDWARE( rmesa ); diff --git a/media-libs/mesa/mesa-6.4.2-r2.ebuild b/media-libs/mesa/mesa-6.4.2-r2.ebuild deleted file mode 100644 index 2b5b1473ecb7..000000000000 --- a/media-libs/mesa/mesa-6.4.2-r2.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.18 2006/10/11 02:26:49 dberkholz Exp $ - -inherit eutils toolchain-funcs multilib flag-o-matic portability - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV}" -MY_SRC_P="${MY_PN}Lib-${PV}" -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2" -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE_VIDEO_CARDS=" - video_cards_i810 - video_cards_mach64 - video_cards_mga - video_cards_none - video_cards_r128 - video_cards_radeon - video_cards_s3virge - video_cards_savage - video_cards_sis - video_cards_sunffb - video_cards_tdfx - video_cards_trident - video_cards_via" -IUSE="${IUSE_VIDEO_CARDS} - debug - doc - hardened - motif" - -RESTRICT="stricter" -RDEPEND="dev-libs/expat - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libXi - x11-libs/libXmu - >=x11-libs/libdrm-1.0.5 - x11-libs/libICE - app-admin/eselect-opengl - motif? ( virtual/motif ) - doc? ( app-doc/opengl-manpages ) - !<=x11-base/xorg-x11-6.9" -DEPEND="${RDEPEND} - x11-misc/makedepend - x11-proto/inputproto - x11-proto/xextproto - !hppa? ( x11-proto/xf86driproto ) - x11-proto/xf86vidmodeproto - >=x11-proto/glproto-1.4-r1 - motif? ( x11-proto/printproto )" - -S="${WORKDIR}/${MY_P}" - -# Think about: ggi, svga, fbcon, no-X configs - -if use debug; then - if ! has splitdebug ${FEATURES}; then - RESTRICT="${RESTRICT} nostrip" - fi -fi - -pkg_setup() { - if use debug; then - strip-flags - append-flags -g - fi - - if [[ ${KERNEL} == "FreeBSD" ]]; then - CONFIG="freebsd" - elif use x86; then - CONFIG="linux-dri-x86" - elif use amd64; then - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/makedepend-location.patch - epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch - epatch ${FILESDIR}/change-default-dri-driver-dir.patch - epatch ${FILESDIR}/6.4-multilib-fix.patch - epatch ${FILESDIR}/64bit-fix-have-dix-config.patch - epatch ${FILESDIR}/64bit-fix-indirect-vertex-array.patch - - # Problem triggered by croquet 0.3 - bug #125004 - epatch ${FILESDIR}/radeon-texture-problem.patch - - # Don't compile debug code with USE=-debug - bug #125004 - if ! use debug; then - einfo "Removing DO_DEBUG defs in dri drivers..." - find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ; - fi - - - # Fix dprintf issues with sys-libs/glibc-2.4, see bug #125806. - einfo "sed for dprintf to __mesa_dprintf..." - sed -i -e "s:dprintf:__mesa_dprintf:g" $(grep dprintf src/glu/sgi/* -rl) \ - || die "sed for dprintf to __mesa_dprintf failed. :(" - - # Set default dri drivers directory - echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/xorg/modules/dri\"'" >> ${HOSTCONF} - - # Configurable DRI drivers - if use video_cards_i810; then - add_drivers i810 i830 i915 - fi - if use video_cards_mach64; then - add_drivers mach64 - fi - if use video_cards_mga; then - add_drivers mga - fi - if use video_cards_r128; then - add_drivers r128 - fi - if use video_cards_radeon; then - add_drivers radeon r200 r300 - fi - if use video_cards_s3virge; then - add_drivers s3v - fi - if use video_cards_savage; then - add_drivers savage - fi - if use video_cards_sis; then - add_drivers sis - fi - if use video_cards_sunffb; then - add_drivers ffb - fi - if use video_cards_tdfx; then - add_drivers tdfx - fi - if use video_cards_trident; then - add_drivers trident - fi - if use video_cards_via; then - add_drivers unichrome - fi - - # Defaults based on X.Org 6.9, with some changes - if [[ ! -n "${VIDEO_CARDS}" ]]; then - if use alpha; then - add_drivers mga tdfx r128 r200 r300 radeon - elif use amd64; then - add_drivers i915 mga r128 r200 r300 radeon tdfx - elif use arm; then - add_drivers mga r128 r200 r300 radeon - elif use hppa; then - # no accelerated 3D on hppa - true - elif use ia64; then - add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome - elif use mips; then - # no accelerated 3D on mips - true - elif use ppc; then - add_drivers mach64 mga r128 r200 r300 radeon tdfx - elif use ppc64; then - add_drivers mga r128 r200 r300 radeon - elif use sparc; then - add_drivers ffb mach64 - elif use x86; then - add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \ - sis tdfx trident unichrome - fi - fi - - # Set drivers to everything on which we ran add_drivers() - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF} - - if use sparc; then - einfo "Sparc assembly code is not working; deactivating" - echo "ASM_FLAGS =" >> ${HOSTCONF} - echo "ASM_SOURCES =" >> ${HOSTCONF} - fi - - if use hardened; then - einfo "Deactivating assembly code for hardened build" - echo "ASM_FLAGS =" >> ${HOSTCONF} - echo "ASM_SOURCES =" >> ${HOSTCONF} - echo "ASM_API =" >> ${HOSTCONF} - fi - - # Kill this; we don't want /usr/X11R6/lib ever to be searched in this - # build. - echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} - - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} - echo "CC = $(tc-getCC)" >> ${HOSTCONF} - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} - # bug #110840 - Build with PIC, since it hasn't been shown to slow it down - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF} - - # Removed glut, since we have separate freeglut/glut ebuilds - # Remove EGL, since Brian Paul says it's not ready for a release - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF} - - # Get rid of glut includes - rm -f ${S}/include/GL/glut*h - - # r200 breaks without this, since it's the only EGL-enabled driver so far - echo "USING_EGL = 0" >> ${HOSTCONF} - - # Don't build EGL demos. EGL isn't ready for release, plus they produce a - # circular dependency with glut. - echo "PROGRAM_DIRS =" >> ${HOSTCONF} - - # Documented in configs/default - if use motif; then - # Add -lXm - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF} - # Add GLwMDrawA.c - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF} - fi -} - -src_compile() { - emake -j1 ${CONFIG} || die "Build failed" -} - -src_install() { - dodir /usr - make \ - DESTDIR=${D}/usr \ - INCLUDE_DIR=${D}/usr/include \ - LIB_DIR=${D}/usr/$(get_libdir) \ - install || die "Installation failed" - - ## - # Install the actual drivers --- 'make install' doesn't install them - # anywhere. - dodir /usr/$(get_libdir)/xorg/modules/dri - exeinto /usr/$(get_libdir)/xorg/modules/dri - ebegin "Installing drivers to ${EXEDESTTREE}" - DRI_SO=$(find ${S}/lib* -name '*_dri.so') - doexe ${DRI_SO} - eend - - if ! use motif; then - rm ${D}/usr/include/GL/GLwMDrawA.h - fi - - # Don't install private headers - rm ${D}/usr/include/GL/GLw*P.h - - fix_opengl_symlinks - dynamic_libgl_install - - # Install libtool archives - insinto /usr/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins ${FILESDIR}/lib/libGLU.la - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \ - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # On *BSD libcs dlopen() and similar functions are present directly in - # libc.so and does not require linking to libdl. portability eclass takes - # care of finding the needed library (if needed) witht the dlopen_lib - # function. - sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ - ${D}/usr/$(get_libdir)/libGLU.la \ - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # Create the two-number versioned libs (.so.#.#), since only .so.# and - # .so.#.#.# were made - dosym libGLU.so.1.3.060401 /usr/$(get_libdir)/libGLU.so.1.3 - dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0 - - # libGLU doesn't get the plain .so symlink either - dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so - - # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to - # as the default libGL.so.1 -} - -pkg_postinst() { - switch_opengl_implem -} - -fix_opengl_symlinks() { - # Remove invalid symlinks - local LINK - for LINK in $(find ${D}/usr/$(get_libdir) \ - -name libGL\.* -type l); do - rm -f ${LINK} - done - # Create required symlinks - if [[ ${CHOST} == *-freebsd* ]]; then - # FreeBSD doesn't use major.minor versioning, so the library is only - # libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create - # libGL.so symlink and leave libGL.so.1 being the real thing - dosym libGL.so.1 /usr/$(get_libdir)/libGL.so - else - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} - local x="" - for x in ${D}/usr/$(get_libdir)/libGL.so* \ - ${D}/usr/$(get_libdir)/libGL.la \ - ${D}/usr/$(get_libdir)/libGL.a; do - if [ -f ${x} -o -L ${x} ]; then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib - fi - done - # glext.h added for #54984 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include - fi - done - eend 0 -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -add_drivers() { - DRI_DRIVERS="${DRI_DRIVERS} $@" -} diff --git a/media-libs/mesa/mesa-6.5-r4.ebuild b/media-libs/mesa/mesa-6.5-r4.ebuild deleted file mode 100644 index 578a86548c7a..000000000000 --- a/media-libs/mesa/mesa-6.5-r4.ebuild +++ /dev/null @@ -1,347 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r4.ebuild,v 1.3 2006/10/11 02:26:49 dberkholz Exp $ - -inherit eutils toolchain-funcs multilib flag-o-matic portability - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV}" -MY_SRC_P="${MY_PN}Lib-${PV}" -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2" -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE_VIDEO_CARDS=" - video_cards_i810 - video_cards_mach64 - video_cards_mga - video_cards_none - video_cards_r128 - video_cards_radeon - video_cards_s3virge - video_cards_savage - video_cards_sis - video_cards_sunffb - video_cards_tdfx - video_cards_trident - video_cards_via" -IUSE="${IUSE_VIDEO_CARDS} - debug - doc - hardened - motif - nptl" - -RESTRICT="stricter" -RDEPEND="dev-libs/expat - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libXi - x11-libs/libXmu - >=x11-libs/libdrm-2.0.1 - x11-libs/libICE - app-admin/eselect-opengl - motif? ( virtual/motif ) - doc? ( app-doc/opengl-manpages ) - !<=x11-base/xorg-x11-6.9" -DEPEND="${RDEPEND} - x11-misc/makedepend - x11-proto/inputproto - x11-proto/xextproto - !hppa? ( x11-proto/xf86driproto ) - x11-proto/xf86vidmodeproto - >=x11-proto/glproto-1.4.4 - motif? ( x11-proto/printproto )" - -S="${WORKDIR}/${MY_P}" - -# Think about: ggi, svga, fbcon, no-X configs - -if use debug; then - if ! has splitdebug ${FEATURES}; then - RESTRICT="${RESTRICT} nostrip" - fi -fi - -pkg_setup() { - if use debug; then - strip-flags - append-flags -g - fi - - append-flags -fno-strict-aliasing - - if [[ ${KERNEL} == "FreeBSD" ]]; then - CONFIG="freebsd" - elif use x86; then - CONFIG="linux-dri-x86" - elif use amd64; then - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch - epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch - epatch ${FILESDIR}/6.4-multilib-fix.patch - epatch ${FILESDIR}/6.5-re-order-context-destruction.patch - epatch ${FILESDIR}/6.5-fix-radeon-PCIE.patch - - # Don't compile debug code with USE=-debug - bug #125004 - if ! use debug; then - einfo "Removing DO_DEBUG defs in dri drivers..." - find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ; - fi - - # Set default dri drivers directory - echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> ${HOSTCONF} - - # Do we want thread-local storage (TLS)? - if use nptl; then - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF} - fi - - # Configurable DRI drivers - if use video_cards_i810; then - add_drivers i810 i915 - fi - if use video_cards_mach64; then - add_drivers mach64 - fi - if use video_cards_mga; then - add_drivers mga - fi - if use video_cards_r128; then - add_drivers r128 - fi - if use video_cards_radeon; then - add_drivers radeon r200 r300 - fi - if use video_cards_s3virge; then - add_drivers s3v - fi - if use video_cards_savage; then - add_drivers savage - fi - if use video_cards_sis; then - add_drivers sis - fi - if use video_cards_sunffb; then - add_drivers ffb - fi - if use video_cards_tdfx; then - add_drivers tdfx - fi - if use video_cards_trident; then - add_drivers trident - fi - if use video_cards_via; then - add_drivers unichrome - fi - - # Defaults based on X.Org 6.9, with some changes - if [[ ! -n "${VIDEO_CARDS}" ]]; then - if use alpha; then - add_drivers mga tdfx r128 r200 r300 radeon - elif use amd64; then - add_drivers i915 mga r128 r200 r300 radeon tdfx - elif use arm; then - add_drivers mga r128 r200 r300 radeon - elif use hppa; then - # no accelerated 3D on hppa - true - elif use ia64; then - add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome - elif use mips; then - # no accelerated 3D on mips - true - elif use ppc; then - add_drivers mach64 mga r128 r200 r300 radeon tdfx - elif use ppc64; then - add_drivers mga r128 r200 r300 radeon - elif use sparc; then - add_drivers ffb mach64 - elif use x86; then - add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \ - sis tdfx trident unichrome - fi - fi - - # Set drivers to everything on which we ran add_drivers() - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF} - - if use hardened; then - einfo "Deactivating assembly code for hardened build" - echo "ASM_FLAGS =" >> ${HOSTCONF} - echo "ASM_SOURCES =" >> ${HOSTCONF} - echo "ASM_API =" >> ${HOSTCONF} - fi - - if use sparc; then - einfo "Sparc assembly code is not working; deactivating" - echo "ASM_FLAGS =" >> ${HOSTCONF} - echo "ASM_SOURCES =" >> ${HOSTCONF} - fi - - # Kill this; we don't want /usr/X11R6/lib ever to be searched in this - # build. - echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} - - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} - echo "CC = $(tc-getCC)" >> ${HOSTCONF} - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} - # bug #110840 - Build with PIC, since it hasn't been shown to slow it down - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF} - - # Removed glut, since we have separate freeglut/glut ebuilds - # Remove EGL, since Brian Paul says it's not ready for a release - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF} - - # Get rid of glut includes - rm -f ${S}/include/GL/glut*h - - # r200 breaks without this, since it's the only EGL-enabled driver so far - echo "USING_EGL = 0" >> ${HOSTCONF} - - # Don't build EGL demos. EGL isn't ready for release, plus they produce a - # circular dependency with glut. - echo "PROGRAM_DIRS =" >> ${HOSTCONF} - - # Documented in configs/default - if use motif; then - # Add -lXm - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF} - # Add GLwMDrawA.c - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF} - fi -} - -src_compile() { - emake -j1 ${CONFIG} || die "Build failed" -} - -src_install() { - dodir /usr - make \ - DESTDIR=${D}/usr \ - INCLUDE_DIR=${D}/usr/include \ - LIB_DIR=${D}/usr/$(get_libdir) \ - install || die "Installation failed" - - ## - # Install the actual drivers --- 'make install' doesn't install them - # anywhere. - dodir /usr/$(get_libdir)/dri - exeinto /usr/$(get_libdir)/dri - ebegin "Installing drivers to ${EXEDESTTREE}" - DRI_SO=$(find ${S}/lib* -name '*_dri.so') - doexe ${DRI_SO} - eend - - if ! use motif; then - rm ${D}/usr/include/GL/GLwMDrawA.h - fi - - # Don't install private headers - rm ${D}/usr/include/GL/GLw*P.h - - fix_opengl_symlinks - dynamic_libgl_install - - # Install libtool archives - insinto /usr/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins ${FILESDIR}/lib/libGLU.la - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \ - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # On *BSD libcs dlopen() and similar functions are present directly in - # libc.so and does not require linking to libdl. portability eclass takes - # care of finding the needed library (if needed) witht the dlopen_lib - # function. - sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ - ${D}/usr/$(get_libdir)/libGLU.la \ - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # Create the two-number versioned libs (.so.#.#), since only .so.# and - # .so.#.#.# were made - dosym libGLU.so.1.3.060500 /usr/$(get_libdir)/libGLU.so.1.3 - dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0 - - # libGLU doesn't get the plain .so symlink either - dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so - - # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to - # as the default libGL.so.1 -} - -pkg_postinst() { - switch_opengl_implem -} - -fix_opengl_symlinks() { - # Remove invalid symlinks - local LINK - for LINK in $(find ${D}/usr/$(get_libdir) \ - -name libGL\.* -type l); do - rm -f ${LINK} - done - # Create required symlinks - if [[ ${CHOST} == *-freebsd* ]]; then - # FreeBSD doesn't use major.minor versioning, so the library is only - # libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create - # libGL.so symlink and leave libGL.so.1 being the real thing - dosym libGL.so.1 /usr/$(get_libdir)/libGL.so - else - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} - local x="" - for x in ${D}/usr/$(get_libdir)/libGL.so* \ - ${D}/usr/$(get_libdir)/libGL.la \ - ${D}/usr/$(get_libdir)/libGL.a; do - if [ -f ${x} -o -L ${x} ]; then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib - fi - done - # glext.h added for #54984 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include - fi - done - eend 0 -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -add_drivers() { - DRI_DRIVERS="${DRI_DRIVERS} $@" -} diff --git a/media-libs/mesa/mesa-6.5.1-r2.ebuild b/media-libs/mesa/mesa-6.5.1-r2.ebuild deleted file mode 100644 index 4bfa1342c12e..000000000000 --- a/media-libs/mesa/mesa-6.5.1-r2.ebuild +++ /dev/null @@ -1,330 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r2.ebuild,v 1.3 2006/10/27 06:30:40 josejx Exp $ - -inherit eutils toolchain-funcs multilib flag-o-matic portability - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV}" -MY_SRC_P="${MY_PN}Lib-${PV}" -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2" -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE_VIDEO_CARDS=" - video_cards_i810 - video_cards_mach64 - video_cards_mga - video_cards_none - video_cards_r128 - video_cards_radeon - video_cards_s3virge - video_cards_savage - video_cards_sis - video_cards_sunffb - video_cards_tdfx - video_cards_trident - video_cards_via" -IUSE="${IUSE_VIDEO_CARDS} - debug - doc - hardened - motif - nptl - xcb" - -RESTRICT="stricter" -RDEPEND="dev-libs/expat - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libXi - x11-libs/libXmu - >=x11-libs/libdrm-2.0.2 - x11-libs/libICE - app-admin/eselect-opengl - motif? ( virtual/motif ) - doc? ( app-doc/opengl-manpages ) - !<=x11-base/xorg-x11-6.9 - xcb? ( x11-libs/libxcb )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - x11-misc/makedepend - x11-proto/inputproto - x11-proto/xextproto - !hppa? ( x11-proto/xf86driproto ) - x11-proto/xf86vidmodeproto - >=x11-proto/glproto-1.4.8 - motif? ( x11-proto/printproto )" - -S="${WORKDIR}/${MY_P}" - -# Think about: ggi, svga, fbcon, no-X configs - -if use debug; then - if ! has splitdebug ${FEATURES}; then - RESTRICT="${RESTRICT} nostrip" - fi -fi - -pkg_setup() { - if use debug; then - strip-flags - append-flags -g - fi - - append-flags -fno-strict-aliasing - - if use x86-fbsd; then - CONFIG="freebsd-dri-x86" - elif use amd64-fbsd; then - CONFIG="freebsd-dri-amd64" - elif use kernel_FreeBSD; then - CONFIG="freebsd-dri" - elif use x86; then - CONFIG="linux-dri-x86" - elif use amd64; then - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - # Fixes for bug #146892 - epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch - cd ${S} - # FreeBSD 6.* doesn't have posix_memalign(). - [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri} - - # Fixes for fd.o bug #8521 - epatch "${FILESDIR}"/${PV}-xcb-dont-unlock-twice.patch - - # Use XCB API as of 1.0RC2 - epatch "${FILESDIR}"/${PV}-use-new-xcb-naming.patch - - # Don't compile debug code with USE=-debug - bug #125004 - if ! use debug; then - einfo "Removing DO_DEBUG defs in dri drivers..." - find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ; - fi - - # Set up libdir - echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF} - - # Set default dri drivers directory - echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF} - - # Do we want thread-local storage (TLS)? - if use nptl; then - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF} - fi - - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF} - if use xcb; then - echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF} - echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF} - echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF} - fi - - # Configurable DRI drivers - if use video_cards_i810; then - add_drivers i810 i915 i965 - fi - if use video_cards_mach64; then - add_drivers mach64 - fi - if use video_cards_mga; then - add_drivers mga - fi - if use video_cards_r128; then - add_drivers r128 - fi - if use video_cards_radeon; then - add_drivers radeon r200 r300 - fi - if use video_cards_s3virge; then - add_drivers s3v - fi - if use video_cards_savage; then - add_drivers savage - fi - if use video_cards_sis; then - add_drivers sis - fi - if use video_cards_sunffb; then - add_drivers ffb - fi - if use video_cards_tdfx; then - add_drivers tdfx - fi - if use video_cards_trident; then - add_drivers trident - fi - if use video_cards_via; then - add_drivers unichrome - fi - - # Set drivers to everything on which we ran add_drivers() - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF} - - if use hardened; then - einfo "Deactivating assembly code for hardened build" - echo "ASM_FLAGS =" >> ${HOSTCONF} - echo "ASM_SOURCES =" >> ${HOSTCONF} - echo "ASM_API =" >> ${HOSTCONF} - fi - - if use sparc; then - einfo "Sparc assembly code is not working; deactivating" - echo "ASM_FLAGS =" >> ${HOSTCONF} - echo "ASM_SOURCES =" >> ${HOSTCONF} - fi - - # Replace hardcoded /usr/X11R6 with this - echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF} - - echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF} - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} - echo "CC = $(tc-getCC)" >> ${HOSTCONF} - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} - # bug #110840 - Build with PIC, since it hasn't been shown to slow it down - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF} - - # Removed glut, since we have separate freeglut/glut ebuilds - # Remove EGL, since Brian Paul says it's not ready for a release - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF} - - # Get rid of glut includes - rm -f ${S}/include/GL/glut*h - - # r200 breaks without this, since it's the only EGL-enabled driver so far - echo "USING_EGL = 0" >> ${HOSTCONF} - - # Don't build EGL demos. EGL isn't ready for release, plus they produce a - # circular dependency with glut. - echo "PROGRAM_DIRS =" >> ${HOSTCONF} - - # Documented in configs/default - if use motif; then - # Add -lXm - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF} - # Add GLwMDrawA.c - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF} - fi -} - -src_compile() { - emake -j1 ${CONFIG} || die "Build failed" -} - -src_install() { - dodir /usr - make \ - INSTALL_DIR="${D}/usr" \ - DRI_DRIVER_INSTALL_DIR="${D}/usr/\$(LIB_DIR)/dri" \ - INCLUDE_DIR="${D}/usr/include" \ - install || die "Installation failed" - - if ! use motif; then - rm ${D}/usr/include/GL/GLwMDrawA.h - fi - - # Don't install private headers - rm ${D}/usr/include/GL/GLw*P.h - - fix_opengl_symlinks - dynamic_libgl_install - - # Install libtool archives - insinto /usr/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins ${FILESDIR}/lib/libGLU.la - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \ - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # On *BSD libcs dlopen() and similar functions are present directly in - # libc.so and does not require linking to libdl. portability eclass takes - # care of finding the needed library (if needed) witht the dlopen_lib - # function. - sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ - ${D}/usr/$(get_libdir)/libGLU.la \ - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # Create the two-number versioned libs (.so.#.#), since only .so.# and - # .so.#.#.# were made - dosym libGLU.so.1.3.060501 /usr/$(get_libdir)/libGLU.so.1.3 - dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0 - - # libGLU doesn't get the plain .so symlink either - dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so - - # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to - # as the default libGL.so.1 -} - -pkg_postinst() { - switch_opengl_implem -} - -fix_opengl_symlinks() { - # Remove invalid symlinks - local LINK - for LINK in $(find ${D}/usr/$(get_libdir) \ - -name libGL\.* -type l); do - rm -f ${LINK} - done - # Create required symlinks - if [[ ${CHOST} == *-freebsd* ]]; then - # FreeBSD doesn't use major.minor versioning, so the library is only - # libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create - # libGL.so symlink and leave libGL.so.1 being the real thing - dosym libGL.so.1 /usr/$(get_libdir)/libGL.so - else - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} - local x="" - for x in ${D}/usr/$(get_libdir)/libGL.so* \ - ${D}/usr/$(get_libdir)/libGL.la \ - ${D}/usr/$(get_libdir)/libGL.a; do - if [ -f ${x} -o -L ${x} ]; then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib - fi - done - # glext.h added for #54984 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include - fi - done - eend 0 -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -add_drivers() { - DRI_DRIVERS="${DRI_DRIVERS} $@" -} |