From c5f96523d2ffd86602ed32847cb772e26253f0c7 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 3 Feb 2015 21:43:32 +0000 Subject: [PATCH] Version bump to 10.4.3. Fix bugs 536916 and 538086. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x974CA72A --- media-libs/mesa/ChangeLog | 9 +- media-libs/mesa/Manifest | 33 +- .../files/mesa-10.3.7-dont-use-clrsb.patch | 36 ++ media-libs/mesa/mesa-10.3.7.ebuild | 4 +- media-libs/mesa/mesa-10.4.3.ebuild | 503 ++++++++++++++++++ 5 files changed, 568 insertions(+), 17 deletions(-) create mode 100644 media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch create mode 100644 media-libs/mesa/mesa-10.4.3.ebuild diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 4cc3dd14b9d8..1c54ec579051 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.597 2015/01/13 22:49:58 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.598 2015/02/03 21:43:26 mattst88 Exp $ + +*mesa-10.4.3 (03 Feb 2015) + + 03 Feb 2015; Matt Turner + +files/mesa-10.3.7-dont-use-clrsb.patch, +mesa-10.4.3.ebuild, + mesa-10.3.7.ebuild: + Version bump to 10.4.3. Fix bugs 536916 and 538086. 13 Jan 2015; Matt Turner mesa-10.4.2.ebuild: Drop usage of --with-opencl-libdir, bug 536458. diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index d5751e9695b1..a97554cd9456 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -9,6 +9,7 @@ AUX eselect-mesa.conf.9.2 1676 SHA256 bcf5f77140b4695f147d4cd3c2db4b954fb57eccfd AUX glx_ro_text_segm.patch 731 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c SHA512 90d04d1268cc90e1c5596b49b143895eba99d4e7f7d9bb5f699725c1308e3995edac44e3f61536c7ce70ebf5df84a5a22c18fa84fb54fbddb339f908975bb43c WHIRLPOOL 42171ef67930bebdcfdfcb0c9370234791c6125be760b6419abfff44bd65899982167d6da4d6eb4198383438e6376b4b695109af158083b903071c545160d883 AUX mesa-10.2-dont-require-llvm-for-r300.patch 547 SHA256 83cfeae33b1e8c84b37ed59c353000eb775978ae3d9035ba8ce4f63a167756fc SHA512 d1cb5a989aa001c99f353d27ab5b28ac05d60050614bbfd76ca5d312e00efcc2b1a2459d30d697b68119310c69512b4195afce6c0ed7f31fb9cf14689a740e27 WHIRLPOOL c06669942d275a9d9f132ec8f51d3ecf23d33cb89cb607ba3a7861f209f283b39a9568513b07e22f0dfcc99339a307d7b2a6b03f261ed583fd4518d3b4d0b464 AUX mesa-10.2-sysfs-instead-of-libudev.patch 9568 SHA256 e0b7fea7bbf4883dae58c816f1b680f0f1396e83c9717c8b22805c1616214af2 SHA512 6302fdd0c94c1ddca4bd73d05ee6e12664a78978efbd7233d0d4c0d9706c23b716d78e5a31eef87c0606fdf65f49be8f21f8adbeb086660a0053c600bf5ee2d3 WHIRLPOOL 982b2d722f281ce2e5b20f835a53d93d1cad500668fc367e45c10293bfb5e045f8ea5679229edf5f84b3fcc2d07c650159191e3514d444c1d832048522b35041 +AUX mesa-10.3.7-dont-use-clrsb.patch 1140 SHA256 23626c6bf1e502f17f4b9236b512063b41bf52be64f56252f0fc5ce456824d58 SHA512 2d9dd9a56c3bab02e8ec1a1ab4d88c2855746d8243548f197cb43de6e980554447c75e53c07dcd270de7e1c282cf7fdf996e5102a24e47b75e484a18f99092e0 WHIRLPOOL 47b222fb61427bbe2a63ac4b738608e9c3491e6373c33e1d68c79198a111d7668b4cafbac9e58820e8cefae55dffca46ab57dbe91ad819feeb734c32f01020f0 AUX mesa-8.0-dont-require-llvm-for-r300.patch 916 SHA256 560f224a12b47fb86bd2ecbe7dc32c79e2be9a26321a79921f83527656ed553a SHA512 ce637b9210517375ae2c77981e0882d161e2027801356b80ec31d50157e52eecdb2ca3b9dc3787c789b39005fcd4cf73290e0879bd5e25638d33ef2cd5e443b8 WHIRLPOOL a14401c13deb209f0ce2e72c360a33ece1d87bd62be79ca8fcef46db29d75f0f4e60b5ef0527bf0bf6196d99a6d2f11da332537beb8c7627b1d7e810a3cfb2e8 AUX mesa-8.0.4-configure-bsd.patch 482 SHA256 5e217191f37a49b56d0404605b51a88f0a3ee0a271a74fd8d25e7b6685e57017 SHA512 efc924315b461c310e632068ec31520048e9d22fe6c35fa47e2c650e778114c6757ff9e4095094d6fa0bb4f82f45217ed9f5320a58de1a2559776a159b722631 WHIRLPOOL 46353a6eb942037d20e07007f7dbe68350d3131d58d4065db133b5655fe9cc88142b6d3c7797602d764d40f622830bf578c559f8868965b240a4bf911bafa034 AUX mesa-8.1-dont-require-llvm-for-r300.patch 861 SHA256 7ca0a7135834448ea7ca27903a40bf3b0a39325613f8a66a718407aa28504fbf SHA512 a2e7ed3b9b51c3a9a98d83c8fdeb8b777a4877fac25e969b01ff92d6971c10dda9f64e6310c739597ad7ba04106c72925ee5931417f2b8d764f9bd799efd2142 WHIRLPOOL a82863366507835ec0a6562f70389e0d050fd23ea25e7c113ef4a0e1298a1543afa8c1fa51c90ece83f41ac6f3bda6083fd50b8f1292b863cd320186fba8f732 @@ -19,6 +20,7 @@ DIST MesaLib-10.2.8.tar.bz2 7113716 SHA256 1ef9ad3f241788d454f2ff8c9d65b6849dfc3 DIST MesaLib-10.3.5.tar.bz2 7283615 SHA256 eb75d2790f1606d59d50a6acaa637b6c75f2155b3e0eca3d5099165c0d9556ae SHA512 4aebf726e51da7ce55d82da407e50741aa0b0c009de59979b4c7b8643e3d3542e52ae100fdcc25c764518953344bc60ad00a730537850e02a9c6f43ed21d0fee WHIRLPOOL 4d450a8eb793efb7d5162fe1a07e2533df06e0d2f250de6946378eed209e3821e8f110619b503387e1e605bcc880a5da73f51786e2c52328a59e94f25b0c82aa DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03 DIST MesaLib-10.4.2.tar.bz2 7480751 SHA256 08a119937d9f2aa2f66dd5de97baffc2a6e675f549e40e699a31f5485d15327f SHA512 dcf479c28de8d13e6e3348c18b020944c085a476a419110d4da36df93bd1961c2b04989abbc737820f9408bbc007c64a69d2348871c661be80a6a06a8b7a0a04 WHIRLPOOL ef34048c53a032b37808737a7014f384f7df378a1ae2f7333107d2197d3ca73d3c66c41ac3c7812c34073221420a7f3667bf3da4bca68158716b506f3cdac262 +DIST MesaLib-10.4.3.tar.bz2 7504749 SHA256 ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad SHA512 b59ce48fb663d3ea1c5400fd43cc90983d244068bc45fd809cb175ab64e416473a45d81ccb9274661d8a9a2d7753c4f57726bfe294aea801cb266fd76a732901 WHIRLPOOL 7ef298f400c5caa6757c8ec9a2764236896dc4d517564e2d6411423a43381843cf3cc7dedd1eb1dd884d9f1cd7111458c1f188ff959fc530df2cdb459ed10faf DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc DIST MesaLib-7.11.2.tar.bz2 6257280 SHA256 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 SHA512 f9f93aeb5ba3e4f0cdd7041a7bba6cd18dd8f58446b796849f43c6037297011df826017c32e03f03c8527d4afd3b9096e9ae3cbfb3c86b4ad145c66867198c21 WHIRLPOOL 0cf1b328b95e4f09e549c8adb2f6dc67e36c48ef570c1a5fda73efad54b8327cbec896d67bd01838be8bba7274f32704feca3fde8bb68bf1141563d17e8be707 DIST MesaLib-8.0.4.tar.bz2 5737052 SHA256 02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e SHA512 b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57 WHIRLPOOL 5371a13e93e2d43264e2580e1e5e28ed85b6bfbdda9dd89104b1c18e62d35417e20b0ed8f13d8c54f58b83875fac9348d57f14ba08e4a88599e5fc0202502173 @@ -34,30 +36,31 @@ EBUILD mesa-10.1.6.ebuild 14178 SHA256 99135f36e638ba4de4a87244aec595b11f89b604a EBUILD mesa-10.2.8.ebuild 14933 SHA256 507fb93e474e713a98400d48a43b91a08adfd8169736fcd617b8e93921d630b7 SHA512 296b08ab8b59b0114983f76b151c04599e837dd07d58c2547d7f1d773f747eb09b82e4fe5fc39a6136b09270c870e106356466c515575653fa5dc9b21e8df7f7 WHIRLPOOL 25aa9d9bd44e36557295f57d748831d846efafcf1ee9ed873585fe3a8a256016cb87d7664cee9a089f7350a8a5fb5c99b71003ef16eda8aed5ecd4aaacb5bccf EBUILD mesa-10.3.5-r1.ebuild 13777 SHA256 697cefd47365c78fe1e07f1784b3271d7a0d687fb881c91ec959ab1c7058bef3 SHA512 d53946b367c267f73c14eb4760a47568552f2ad3b0d9818e98bf27097b3ab212c7f8baf5bc19f15fb0dc4ce7edc252bdf4eca2ac663d207f4c1958d6f5911e08 WHIRLPOOL c2a18b16913b82a203ad1469228984dffbb0c9157c51892be3420c790619d16d3b68dcd9ef66ffb0051df72a5649d9c13780b5aaad9944906be3ba84be4764ae EBUILD mesa-10.3.5.ebuild 14900 SHA256 8c2fa274efdf687ace1591a9f6feda155c845c022f79368b29a8bd24696c11ba SHA512 73d59b896d8e460d20663f307447425ccb2d4e1a022f1591b06b1f9ee2a3506de4759e37561963ef1ef551f445d00d6035050a4a0fb659d3aa43f6883d79072c WHIRLPOOL f98b7aaa3e84bcec8365b45af3e697c7d43813023b428517fa0437ed27b774c3762d45faaadc488741cb24c18906c39d727bbc060a8f84adcfc79e01322f3299 -EBUILD mesa-10.3.7.ebuild 13774 SHA256 b343918d034e07f1ed84c2e197a847b3a1653e6ca38c4212eecb0f255eb01601 SHA512 d7e5b83d2b14c07f30a99294c1d3036882ecd6a3eb491bb5edf91e4deff065adb4c734017246fd5074d57c3158cd2b71691879618652c92290b2aecc1eb017cb WHIRLPOOL 97a15404d3a08a23a3b92ff807a99695473b994cbbd120859b70a8c9686f264871f1ba50521aef8dfd4598141b1c1e74bc8bb11d18f4c28ca5ed4a1680ec34d6 +EBUILD mesa-10.3.7.ebuild 13831 SHA256 90d234ef035a0cfae72acb78c9cb4c83fcf2e013f24a2d03f209e5ad85327b26 SHA512 9ef905a9ba34e56d6ec10a649691f70cf5175cc3bd753f33c02a09e96f0dae909094a10034c2528bc11e2ffe7e4b3512b9a99984a3ef53419c6f2a160fb94efa WHIRLPOOL 7520cc4ee9af5c5b615b9c1e639e21810f18e7ff0604ce56b873defdf68756ed41664fc5cde9f0a7816524123656768bfa9eac9a3d5bc58c33c794f54dd92949 EBUILD mesa-10.4.2.ebuild 13745 SHA256 af7ebce6788815f22e91c3c84707f4a2a269068a8e204568d9fe92479041c554 SHA512 d6e68e9fe58f2ca7daffcc01ac0a98e0c1488209e224d3ec606b37cd748101034b61b5579a7d4f8767c5c94a53e8b5c2d66b94bb1d56a0185fb1be172451618b WHIRLPOOL d728fc54e2de9cde34b12323d31cb5efded8806b3c80546fa33615e2e549ef352dda1f5bccb4cc4ec2014050c27cae16181d0b7db0312574011a1227f4ab02ac +EBUILD mesa-10.4.3.ebuild 13807 SHA256 3e73db9e5af5c2fce6133705b447322dc6c3f3079ef6a5a03bbc35057a36f660 SHA512 d78b76e744c2e35e339f2f410c27f4a8a1e6c2c3dd475662f4d5ad097167520c9eef75dc840caa3e7516c59f89f3a20345724efde140c99311642db0b5adc41a WHIRLPOOL d5ba9c1cb22c471f58979425f674fa9bd504bd0b31dcb07543597e485db038111e7bc36041c7f7abba8246bcddee37ff6b9700c60d2efa567f6971ae4b054ebf EBUILD mesa-7.10.3.ebuild 9833 SHA256 8d0fcf291314e22dfcc1e4a913320d67390920fae9dcbb1cc664989e8ae80fcd SHA512 71b145c6725f4ccf2ab7f99b45ec366c56fa9d3d0f602525cc95ad47f616563fbb6f8ff499408c6b0352b92b92413e130165fbddc64f4e09a3de3ce854533fc4 WHIRLPOOL 0084102900d7d9d4f2c206cb8f8c4087d0bfe974e60544b8afda1273a759d2a441ec8803f13fd0dc98a3bdef3cde69f11ef42128969e0fef4cc8c1257942765a EBUILD mesa-7.11.2.ebuild 9993 SHA256 7b53334b0ce4ccd58e0a6cf64c1211f985321f0a7bc345a3fc5340738798a4aa SHA512 5f6dd871a7ff804ffc6da7b3f8d936595dfa7b1e9d0fe6ce728c8ebf90c4ad8f38231d7a565fa3fce8eeb855ee1bd53abec1e71a6ff0c9c7b5e38c11511d1445 WHIRLPOOL d1fabc18aa97e308058ca2878bdf591c241047ef3b89e145936c859b3524e96cee6077a96d2622bc1ed4ed698c9d0bc2c3e2dacd5bd8b3794bad35f1df387133 EBUILD mesa-8.0.4-r1.ebuild 10791 SHA256 99d033fcc41f3053bc46793022ba0f7a05b490ee813889022b202568937edff2 SHA512 b8f9b906827f3c66473feb90b3022c671b49783c411a23f61985e3361e9e8545397ba64b0e96cc0314d7f8a004aa31f7a23be57457908b9fb2774ad06e0ff1e3 WHIRLPOOL 12088fffae079e20c38881251f67948fec22d4dab2da46010d24f4b685fb14a783126bdcd1be977eb19a23e41225f897485d7e180a84a2b251b3882d0eb95a64 EBUILD mesa-9.0.3.ebuild 11113 SHA256 ef9c8cab66b5d57787ed19ccef7e945589a652abdc9eda54cadb41f1e8ab7ebc SHA512 e5d4261beaa7f93c7382b2eab572bda5424b02c2eadcfea5e81ca8a0439fbc40f76a7c3887a57b73249e2c6a8599a42f3a536485ec7ec2ec6d06d4d3cae2901a WHIRLPOOL 91734df6565e97391d86ff5122e33820b82ae74ca8a7ff4c83b825a568ea87a79b1378d612b5f83a40abb5f98f4d71a84718e114a5c5a9bca5aaf9c426a7fdd8 EBUILD mesa-9.1.6.ebuild 11043 SHA256 4e614a3bb2be81876d09618ed357ed36bde336b53e57794fa14c888990569b1d SHA512 d109bdc955ecc0e6357691c42be1bbde1cb3c2fb27b2a5b6c5013c5d54e587f5f9d486ed03dba1440346e4c4d3ed9366b7f5327754a497d4b2cc25e0b7660e6a WHIRLPOOL b421eb3bbd229a23ae3853745f17116ed77a5cfbdb0dd0b252a664a20de002655dfea626a42f10933eb14b9538f6562ce5b1deb74af3156b2df4510aeba41211 EBUILD mesa-9.2.5-r1.ebuild 13934 SHA256 f23057faf60d26d7234eb79448efa568700418cbe27abf5dad12ae2e5b6df3fc SHA512 7bc40298c615f01aff79a5fa3f6a285f7e2359ea85c83be98f28cd587eea8026f7e9dbe37cc0176252a07606a682e1be59be91fe8e97c4872ca2bbeb8ef825c0 WHIRLPOOL 01b1f5938ced676b7b0ded85aa14d9ceeb844e3587c5ed527d67f1f40f3b47feaad49137209b21d9388d1209d407ff139d49c814bb5d2d8b41bcd1ab430a7a7d -MISC ChangeLog 95807 SHA256 88581333846041a5b60cc971afd9569c1994b1b66d5d2c990b415861a7c5c064 SHA512 16c70f4d5424085c12623c55c5a77d9f4089fbb8ee0056d2a41a4c7225333fcf3c92f4f16e5c2c7eb499754f0cce3bd49ac31f72b594d53e2015eda710af3ea5 WHIRLPOOL c8968273c8e75fc12eb39dfbed2edaebac33bda7ebcd8504b7afa21fb0a3f3998c55c41d550bb8de759f28947cf2e9046d329ac39e714169f3f2dac0dd448828 +MISC ChangeLog 96025 SHA256 043214a8234fb5c20fa016aac9de3bbbf40962aaaa27db62aa0ed1fdcd856481 SHA512 eba5011f04ca8703d72963fc683d24ee51a25aee4a0249a2d5ca4b9a9541fadbd05cccaff3846fd5b4b72e54585ddcbadaa6e991c55ddfab03b6d30760423e49 WHIRLPOOL 14a8dfd102a12ab10f6b73cf5830e0e3128855514c9baf5ab387ffed364bcabb6786e14587d64b6b1b26233b7016b7c2e86d546d249b9ab04e02f9bb4bbb2d8a MISC metadata.xml 2288 SHA256 ae8d2bd2670f9d5409d42b364f56e30a676419ae934fe5c7f7abe8608f95e2ac SHA512 79eeb3773c6f3632f896f31d2266b59e958310a436610fc7676e10465fcbcf205d2dfbe3b31554c92af6a28bf4a59a571ff7104084cb1cb44e33e4cbdc5eed99 WHIRLPOOL a12aa115cc8fa5330070bb4a62ec57d886cfde8d33d23deac5c63b8fb6db40c6dd71c9bab60b2aca2d30e0a2085aac4a0c25b1248dd2289b745c828c78b5b19d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUtaFZAAoJEA/daC2XTKcquJkP/jzYXLuqeID5lbNhREdUYo40 -m6Ecjz2Ltce4bJJxwlg92Rkpym6V6Ac60IKSQyyTGxxYm56veUwOFiHuCHe0cqaM -Xzx1d+dMR0o12oLFdvnywW0dborZjsmFe29/ULPS2PJydeg4gSC6GLBSjb54y+hs -8qHlRC16SlsyAR9XJPMaHv8UfJt3YC44BA37h4QRXAOrGoLIZixte8NgZLDPJyJL -238hQpm78f6d5lQ/7RbVtf5hHelSxZ29X0seYAtfjTsuLp4bzWc4kF8LHmCjXp4L -+Rvg/8LsefY146m1+a+UJb6LDLBiMKQ4Nje+0AemVnjn0bnY67Lj0DqqEWuesUud -D5bYtrk94+Jj3hfYuMMLhn50d2znKcfSD4N2/XtBnxvwIRjsR/x53c8RH0DNse2s -Z8eLiVpBMQOFfvzcMf5IHBStsUOn7ungxpCK9XYpiFU7lCR75QVZPzTotyqpzvXW -0vtedbD9nrQhb6LLs0XqXtlQMhdNX0uNEnLtpKJNnIZKQh5mZSGyWyVXbGpwMj+B -2OvJBRQzurKq1XUipYM3XA7l+aHgvt51zn80gUDrTStJFI+HV3ICyZWnDqBxiWg7 -ndMvcriCTFiym0Svzh3BWCV4hartbf2wBeghUfMho0O8uEy5TjesowadtGzbOyZu -Ediq/sNHukNhkWgr/IX2 -=F76g +iQIcBAEBCAAGBQJU0UF0AAoJEA/daC2XTKcqjAoP/0CWes6tCLz0CmVDTqJ5joxi +AnSI1+ZdhVYQRRsnM1DweJGUDBv8c7zMoSo9WUDclcgEVyvqeyYcqgyukI/gSg3b +awcPCTOEnMWEJf8e3lFoPKNJUJEiRX5Tbv4wIHilnRdCgUZhUJC12kXRGPknnBeh +gP6tZ8HSkl0x3OUAnSobKsIt0WLmWwJvG0P/7t7rdq3igdKWkpiWmK17RA9+Xe5r +4b5V93UzKpE0TXrYHEw1VYl9WkKQ349IhgCUBska1XriJkCdtIa6XFckKWATkT2y +Q6Reo5jXp9blw4ZTzbnOJ1vyh+zHJMgUOKYPfolWGkeK8ls4BhGj8nNtIX/fCy5e +sqAs4d4vBSPOG4MwkBXXUUExgaCaSsBg/l/kpUit4NMIkXJedW/6BHolSMH2yjzf +Jr2moHXb8wOrCfdcFBusqSM6bqPxY50OEmPnSPIFNyEQW+WPhhQMu61qQrfZLg9e +cGDHEBOp7yK2qx/qpoaq6+uKeVhVnRe3H1QGcI0gcy4RSbEkGgj2S5CwIyhhIKrv ++FxLQvLu54WLPcelbJgUIYabFsOOu5aHGgt5SaDOt/wij6MdjAyYcyjE+2A+hB8U +tI2cHXOcY4JM7iIoMEz8v/dXd1Op76avS1CD67sF1JjgjmdshP4oQ9CrhNXTIOkQ +djzjdR0as9qiGpEaJC2N +=LmZz -----END PGP SIGNATURE----- diff --git a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch b/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch new file mode 100644 index 000000000000..c38757dca42a --- /dev/null +++ b/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch @@ -0,0 +1,36 @@ +From 32e98e8ef06f0bb6ad55f9fb5858be77c03367b0 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Mon, 2 Feb 2015 17:26:49 -0800 +Subject: [PATCH] gallium/util: Don't use __builtin_clrsb in util_last_bit(). + +Unclear circumstances lead to undefined symbols on x86. + +Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536916 +Cc: mesa-stable@lists.freedesktop.org +Reviewed-by: Ilia Mirkin +--- + src/gallium/auxiliary/util/u_math.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h +index 19c7343..ca6d0f1 100644 +--- a/src/gallium/auxiliary/util/u_math.h ++++ b/src/gallium/auxiliary/util/u_math.h +@@ -561,14 +561,10 @@ util_last_bit(unsigned u) + static INLINE unsigned + util_last_bit_signed(int i) + { +-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(__INTEL_COMPILER) +- return 31 - __builtin_clrsb(i); +-#else + if (i >= 0) + return util_last_bit(i); + else + return util_last_bit(~(unsigned)i); +-#endif + } + + /* Destructively loop over all of the bits in a mask as in: +-- +2.0.4 + diff --git a/media-libs/mesa/mesa-10.3.7.ebuild b/media-libs/mesa/mesa-10.3.7.ebuild index 5fc4f0bcf473..4be7f89c7668 100644 --- a/media-libs/mesa/mesa-10.3.7.ebuild +++ b/media-libs/mesa/mesa-10.3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.7.ebuild,v 1.1 2015/01/12 18:30:27 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.7.ebuild,v 1.2 2015/02/03 21:43:26 mattst88 Exp $ EAPI=5 @@ -206,6 +206,8 @@ src_prepare() { epatch fi + epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch + # relax the requirement that r300 must have llvm, bug 380303 epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch diff --git a/media-libs/mesa/mesa-10.4.3.ebuild b/media-libs/mesa/mesa-10.4.3.ebuild new file mode 100644 index 000000000000..4d2d5d8adb46 --- /dev/null +++ b/media-libs/mesa/mesa-10.4.3.ebuild @@ -0,0 +1,503 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.4.3.ebuild,v 1.1 2015/02/03 21:43:26 mattst88 Exp $ + +EAPI=5 + +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" + EXPERIMENTAL="true" +fi + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit base autotools multilib multilib-minimal flag-o-matic \ + python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS} + +OPENGL_DIR="xorg-x11" + +MY_PN="${PN/m/M}" +MY_P="${MY_PN}-${PV/_/-}" +MY_SRC_P="${MY_PN}Lib-${PV/_/-}" + +FOLDER="${PV/_rc*/}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="http://mesa3d.sourceforge.net/" + +#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" +if [[ $PV = 9999* ]]; then + SRC_URI="${SRC_PATCHES}" +else + SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 + ${SRC_PATCHES}" +fi + +# The code is MIT/X11. +# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 +LICENSE="MIT SGI-B-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + +INTEL_CARDS="i915 i965 ilo intel" +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl + opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux + +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD" + +REQUIRED_USE=" + llvm? ( gallium ) + opencl? ( + gallium + llvm + video_cards_r600? ( r600-llvm-compiler ) + video_cards_radeon? ( r600-llvm-compiler ) + video_cards_radeonsi? ( r600-llvm-compiler ) + ) + openmax? ( gallium ) + gles1? ( egl ) + gles2? ( egl ) + r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) ) + vaapi? ( gallium ) + vdpau? ( gallium ) + wayland? ( egl gbm ) + xa? ( gallium ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( || ( classic gallium ) ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_ilo? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_radeon? ( || ( classic gallium ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium llvm ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vmware? ( gallium ) + ${PYTHON_REQUIRED_USE} +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56" +# keep correct libdrm and dri2proto dep +# keep blocks in rdepend for binpkg +RDEPEND=" + !=app-admin/eselect-opengl-1.3.0 + udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) ) + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) + dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] + llvm? ( + video_cards_radeonsi? ( || ( + >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] + ) ) + video_cards_r600? ( || ( + >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] + ) ) + !video_cards_r600? ( + video_cards_radeon? ( || ( + >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] + ) ) + ) + >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] + ) + opencl? ( + app-admin/eselect-opencl + dev-libs/libclc + || ( + >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] + ) + ) + openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] +" +for card in ${INTEL_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + " +done + +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + llvm? ( + r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) + video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) + ) + opencl? ( + >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] + >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] + >=sys-devel/gcc-4.6 + ) + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] + dri3? ( + >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] + >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] + ) + >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] + >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] + >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] + >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +# It is slow without texrels, if someone wants slow +# mesa without texrels +pic use is worth the shot +QA_EXECSTACK="usr/lib*/libGL.so*" +QA_WX_LOAD="usr/lib*/libGL.so*" + +# Think about: ggi, fbcon, no-X configs + +pkg_setup() { + # workaround toc-issue wrt #386545 + use ppc64 && append-flags -mminimal-toc + + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + python-any-r1_pkg_setup +} + +src_unpack() { + default + [[ $PV = 9999* ]] && git-r3_src_unpack +} + +src_prepare() { + # apply patches + if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/patches" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + + epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch + + # fix for hardened pax_kernel, bug 240956 + [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch + + # Solaris needs some recent POSIX stuff in our case + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die + fi + + base_src_prepare + + eautoreconf + multilib_copy_sources +} + +multilib_src_configure() { + local myconf + + if use classic; then + # Configurable DRI drivers + driver_enable swrast + + # Intel code + driver_enable video_cards_i915 i915 + driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + driver_enable video_cards_nouveau nouveau + + # ATI code + driver_enable video_cards_r100 radeon + driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + driver_enable video_cards_radeon radeon r200 + fi + fi + + if use egl; then + myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") " + fi + + if use gallium; then + myconf+=" + $(use_enable llvm gallium-llvm) + $(use_enable openmax omx) + $(use_enable r600-llvm-compiler) + $(use_enable vaapi va) + $(use_enable vdpau) + $(use_enable xa) + $(use_enable xvmc) + " + gallium_enable swrast + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_i915 i915 + gallium_enable video_cards_ilo ilo + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + # opencl stuff + if use opencl; then + myconf+=" + $(use_enable opencl) + --with-clang-libdir="${EPREFIX}/usr/lib" + " + fi + fi + + # x86 hardened pax_kernel needs glx-rts, bug 240956 + if use pax_kernel; then + myconf+=" + $(use_enable x86 glx-rts) + " + fi + + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + myconf+=" --disable-asm" + fi + + # build fails with BSD indent, bug #428112 + use userland_GNU || export INDENT=cat + + econf \ + --enable-dri \ + --enable-glx \ + --enable-shared-glapi \ + $(use_enable !bindist texture-float) \ + $(use_enable debug) \ + $(use_enable dri3) \ + $(use_enable egl) \ + $(use_enable gbm) \ + $(use_enable gles1) \ + $(use_enable gles2) \ + $(use_enable nptl glx-tls) \ + $(use_enable osmesa) \ + $(use_enable !udev sysfs) \ + --enable-llvm-shared-libs \ + --with-dri-drivers=${DRI_DRIVERS} \ + --with-gallium-drivers=${GALLIUM_DRIVERS} \ + PYTHON2="${PYTHON}" \ + ${myconf} +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if use classic || use gallium; then + ebegin "Moving DRI/Gallium drivers for dynamic switching" + local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) + keepdir /usr/$(get_libdir)/dri + dodir /usr/$(get_libdir)/mesa + for x in ${gallium_drivers[@]}; do + if [ -f "$(get_libdir)/gallium/${x}" ]; then + mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ + || die "Failed to move ${x}" + fi + done + if use classic; then + emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install + fi + for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${x/dri/mesa}" \ + || die "Failed to move ${x}" + fi + done + pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" + ln -s ../mesa/*.so . || die "Creating symlink failed" + # remove symlinks to drivers known to eselect + for x in ${gallium_drivers[@]}; do + if [ -f ${x} -o -L ${x} ]; then + rm "${x}" || die "Failed to remove ${x}" + fi + done + popd + eend $? + fi + if use opencl; then + ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" + local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" + dodir ${cl_dir}/{lib,include} + if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then + mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ + "${ED}"${cl_dir} + fi + if [ -f "${ED}/usr/include/CL/opencl.h" ]; then + mv -f "${ED}"/usr/include/CL \ + "${ED}"${cl_dir}/include + fi + eend $? + fi + + if use openmax; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" + doenvd "${T}"/99mesaxdgomx + keepdir /usr/share/mesa/xdg + fi +} + +multilib_src_install_all() { + prune_libtool_files --all + einstalldocs + + if use !bindist; then + dodoc docs/patents.txt + fi + + # Install config file for eselect mesa + insinto /usr/share/mesa + newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf +} + +multilib_src_test() { + if use llvm; then + local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' + pushd src/gallium/drivers/llvmpipe >/dev/null || die + emake ${llvm_tests} + pax-mark m ${llvm_tests} + popd >/dev/null || die + fi + emake check +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + + # Select classic/gallium drivers + if use classic || use gallium; then + eselect mesa set --auto + fi + + # Switch to mesa opencl + if use opencl; then + eselect opencl set --use-old ${PN} + fi + + # run omxregister-bellagio to make the OpenMAX drivers known system-wide + if use openmax; then + ebegin "Registering OpenMAX drivers" + BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ + OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ + omxregister-bellagio + eend $? + fi + + # warn about patent encumbered texture-float + if use !bindist; then + elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" + elog "enabled. Please see patents.txt for an explanation." + fi + + local using_radeon r_flag + for r_flag in ${RADEON_CARDS}; do + if use video_cards_${r_flag}; then + using_radeon=1 + break + fi + done + + if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then + elog "Note that in order to have full S3TC support, it is necessary to install" + elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" + elog "textures in some apps, and some others even require this to run." + fi +} + +pkg_prerm() { + if use openmax; then + rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister + fi +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +# TODO: avoid code duplication for a more elegant implementation +driver_enable() { + case $# in + # for enabling unconditionally + 1) + DRI_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + DRI_DRIVERS+=",${i}" + done + fi + ;; + esac +} + +gallium_enable() { + case $# in + # for enabling unconditionally + 1) + GALLIUM_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + GALLIUM_DRIVERS+=",${i}" + done + fi + ;; + esac +} -- 2.26.2