From: Ian Stakenvicius Date: Tue, 25 Nov 2014 20:11:10 +0000 (+0000) Subject: Added sysfs use flag to allow libudev to be optional on linux, backported to 10.2... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e64fe087f8fa69636cdcfd9860e117cd72e55059;p=gentoo.git Added sysfs use flag to allow libudev to be optional on linux, backported to 10.2.8 for stabilization Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2B6559ED --- diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index b6220fe77586..2ce2b3ff9c1b 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.581 2014/11/22 04:51:57 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.582 2014/11/25 20:11:01 axs Exp $ + + 25 Nov 2014; Ian Stakenvicius (_AxS_) + +files/mesa-10.2-sysfs-instead-of-libudev.patch, mesa-10.2.8.ebuild, + mesa-10.3.0.ebuild, mesa-10.3.1.ebuild, mesa-10.3.4.ebuild, metadata.xml: + Added sysfs use flag to allow libudev to be optional on linux, backported to + 10.2.8 for stabilization *mesa-10.3.4 (22 Nov 2014) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 2c4d9576c804..e7e431afedbd 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -8,6 +8,7 @@ AUX eselect-mesa.conf.8.1 1622 SHA256 a7a4306084885dc624304a8893ca4f5645f7f1fe31 AUX eselect-mesa.conf.9.2 1676 SHA256 bcf5f77140b4695f147d4cd3c2db4b954fb57eccfd4475c7f7c4866edda8436e SHA512 d0061359638c0d9729ba1035fd7740c84d59f538adc11af2ee671b5ddbc83c420159efbefcc39ea680f06d20507f1e1d76b528712a07baeca901a413ba7b55df WHIRLPOOL 0fc650223a1910305bb2c4b7b946ac8b83b5b1ba0b79b586a96303a369b30c9c03dc658a6e8e9a29c5c4605f3865e245be0a0e6a27c40ac37402e8a2616b3ace 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.2.7-llvm-unique_ptr.patch 918 SHA256 b83829a032be9ea6b9d6ada1f09c3b45a6148ea36f83675435b96794856f861d SHA512 544c0cb363573f17855377c7107ecc1dcd4f74bbb37a206213503cdddb761140a407db6dfa84f0a2044df6cf2abbbea8ab1e7c2fa140b7da2501438ce0e0c362 WHIRLPOOL 37207e549ade55bb1cbfa6948fcb3ba37c6d55d1742fbd9fea30c2d46fef1ba4e95eb7bd3adf1cdba680fe13cbe45e4fcb5f7c954188209b43fb65ebd9d8fc72 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 @@ -49,32 +50,22 @@ EBUILD mesa-10.2.2.ebuild 14756 SHA256 0d1c6a44b74bdbfadc4c35de4392518fe4b48480d EBUILD mesa-10.2.4.ebuild 14756 SHA256 52825b37767f730171dc9c4898520016c175a74126860d89f36906a35bb928a7 SHA512 afaf88594a8264d54583f22ed804dd98534a9867f49d919d1545d2ef1d6b3a66d18a6c18fc4052ea66abf04f1de21b95cbf01e402f3a1abed2cf332a0d57d05f WHIRLPOOL d7732fd59f12fad68a770f2975545eaa5a9853560ab9666de0ca4d080991ee60c79afbe8a494f73ac78fe23db721cfcd227718cd21c094c8e24f6aba0d8ed52f EBUILD mesa-10.2.6.ebuild 14755 SHA256 41cc3d27cd61ae089b25d27a4fef379896508ed9760e033e338f49a9b05c575e SHA512 c131a22e02245a7d18daef37058757f75d20f68c4080d04b6259890e565ae9ef0be507afd77a781700edf2ca3fe957da2cb8392d8446ab00692be6cebb3bdc0e WHIRLPOOL c552323fc7340fa62349671c511d702a48edb5e37589ad89e5bc56f2be958d3175e74c4fc5f663f83a3672fca5e028c36992d34d3098f669d7f1b7a65d62e427 EBUILD mesa-10.2.7.ebuild 14914 SHA256 a3ffe7dfc70d2768628ffb557f295adbff409280d9a229f7b47a4a17be069550 SHA512 eb18bafd749175c3ac53bb7f1323518b64e5df1738497d2a9f5a3d571e8cebc302290518ac79dbc87b15db308a0dbb32f3c3ac72f74bb57359afb138b507c1b6 WHIRLPOOL b504867ab9a3ab0bdf82f664ae782189769fb360eee38ec34875d63954ea9e3faf444cc388a797d420fabd9babc89e485298d1818ea98e8e7460531a3e0d7871 -EBUILD mesa-10.2.8.ebuild 14810 SHA256 576bea1950ce5ee020a0dc9a17ab7557c6304d4225684108595ea9751a3b2913 SHA512 ff87428b11cfa34bab397f933da904da00002c79ff2a6286a292cb811607cac6b62145af2155376f269f1ec9c87e0bf940c7a0d64345f210bbcad0064eaf2884 WHIRLPOOL 9badfad16b21c4fef213f498500aa2e41ab3209a0ea8544154ad1b6b4cbd2615e051e6dadd2be9c7e1008ccaf944be122eda84c1588862ea3f7ff6426cdc6e46 -EBUILD mesa-10.3.0.ebuild 14885 SHA256 a465e6bedd999ce1d340ae93152687554796ca9f6deb958f6323620cff636e7d SHA512 f6c2cb4cb35ef9a48101e8be49a4240075887fc8f9f61c21895156588e2ab12704334c09480801b17e74fa97c8c4b0d9cbf51be9c17889faad60ed3d6191fcfb WHIRLPOOL 2919b88baf49845bfcafa3acf81ff4d5af0cf9fd45d44afe132eb7ec6ad0614aebec1c30fd52ed5aee031b1247723c227e0c7ccc1985cf38b96549afe1955afd -EBUILD mesa-10.3.1.ebuild 14887 SHA256 97e2eae29316391c136f164278f0e0fc04c052ab2ad67ef72984c3a7a775b4a2 SHA512 9bf9fe43159dfbd68a7ceb34a88d8226b911169819e9880c9bd11bff740a1fdfa08164a05b8513ef1cd2430a6909ce14262a4dd619f1c17f007cdfbb02c34838 WHIRLPOOL 5ed99eaace351e3ebe6a7fe877271a796508783610610e98347fe5f219d7ec8eb0e0f2aedf7b4b70a58e155155a92ad54bbf026300b553ce1ffdf3eb5a3dc93a -EBUILD mesa-10.3.4.ebuild 14887 SHA256 977b8502d6ebdbf1ea9f4ad97b0c3b8145f2a22f21725253586e144f16df2d10 SHA512 1dd7e773751b7641d1072968307afbc110acf2a3cdc121cfbcbe7b734defa4aa1d7ed1a693f4c77e223d958d4dc1bf3f646508bf6104329b83b18e968167e6b8 WHIRLPOOL 1503775a631abb94be040031f8ede279f1c3c90e730a46ae824fe6e5b7476f13c352c39396a5b726a18843b7a7224f6432cb270a3e5641f815d402bafab0696a +EBUILD mesa-10.2.8.ebuild 14930 SHA256 592b776e3db9cc225a0df0d6cea7bc52ec6afe7c40387729087b55288225a64f SHA512 4cadd0f76458aa7bd8ed673760ce943684f6d345acddb158b317171d0921a615aa0ec5d5406c69fbd4ca11869acc953dd5fd7d03fb4d1b6aea1dd035a19f4c9c WHIRLPOOL 38b14a556c3b49f32e31bec6b889094fbe2786dd32b8683a02f7ce90ab5366e38216c55cc6101f3c9d0282e8732bfee32842f745a77186601547f944c5b9b64d +EBUILD mesa-10.3.0.ebuild 14891 SHA256 445577182f5043c7c6d93f8e1c63f2e43baa1bcf5ae86e9ab6aff5fb3ed617fa SHA512 b836dc7456d496e51f72ea590240848a7dd8af38964c9573d4acbe1b6550755b2c81fd2a1623737272d0257b2fc0d7aa022009525aba5ff9c5789c1b171b281d WHIRLPOOL e5064d1b5183bed3ea7f6d0caabb9bd9d18534a3ff1f43c3075d0c0e4ca5ece74669384bafbeaed09e8c9b18b0ecbac02ab34c80fb694d738a218af6a5a1d900 +EBUILD mesa-10.3.1.ebuild 14891 SHA256 d04b35641b25f90755c52c3df4cf39be3589e27551fa2c541ce3a0d08398c646 SHA512 00858280a9dd9c18ab60c53e2a8c46ceb9481b5c99cd8896951013c109998d65cf5427b444f4a61074b45d1006b4120a86b9446389a6afc205de2d2115d3e109 WHIRLPOOL 31ee91da3ddbb4f28a8f89cd5bb036fd3cb4ee574a51f0cf07aa9d886641d1a157da942763c5203d12d41af9ca090485d600e604ba4ebf2b5bca0465faa4b4c5 +EBUILD mesa-10.3.4.ebuild 14891 SHA256 39cf87b09c4f4beab0ed24b2319d38ea0f6a81fcbd0a321ff8f075e983355031 SHA512 d8177e579312df32bcacbf370ad628009290ac0f8eabd63447a5601286bc177249214e1c24f8bbe6c83320761efafb9237f269ee6e12f640c441dc73d9e1462a WHIRLPOOL 53f724b46384695b78510f3dd696b89cf801eb0ec7d878cdfedabebfe4f42b0bd5413959ef96c003e4451321bec60c62a46ac40d0c350fbad49bb8cad46511a4 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 93614 SHA256 6f14adaec3d8b37bfd2fd1bfca8f2558df92dc827ec37f0f12192bb183953ee8 SHA512 2730e935e0dd6c843cc1328c16285063f8b1b74f9cc16edc974f8aca3cfb6ef754e966f17fef31a0bd335991c4bd6da1aba7bb492acd0bc16e3fdcc17431f9b0 WHIRLPOOL c3deb37b03e1a89a774d51134c602571b47b6944e0a0cc040da425e8eb18d21c30e385e638241640bb350b8b30b2c1553a31ad0c0ce74e862bf870376e56c198 -MISC metadata.xml 2288 SHA256 ae8d2bd2670f9d5409d42b364f56e30a676419ae934fe5c7f7abe8608f95e2ac SHA512 79eeb3773c6f3632f896f31d2266b59e958310a436610fc7676e10465fcbcf205d2dfbe3b31554c92af6a28bf4a59a571ff7104084cb1cb44e33e4cbdc5eed99 WHIRLPOOL a12aa115cc8fa5330070bb4a62ec57d886cfde8d33d23deac5c63b8fb6db40c6dd71c9bab60b2aca2d30e0a2085aac4a0c25b1248dd2289b745c828c78b5b19d +MISC ChangeLog 93920 SHA256 289e1ce1e55dc8d417be1f58b1021c876d1498b6bcf8d6647944670f5b6e78d0 SHA512 a8dfb2b0ea54ae94dceb01da581c47d256990733dbfab9b5e3fddd197a3c3714831dbc3423ebaa7e2922bd85a7169d5eba595b8e3375bf0092682783eb967dd4 WHIRLPOOL a8d7b5bea255249b674968d4e7e146ed1da38b3e95cbfebb02277b9950bdd969dfc69cbf9bad87365416ef46d160da05e281d727fdf2eb14bd6fb0ca0dd280e7 +MISC metadata.xml 2372 SHA256 1f8d6c9e0e1ac16c0e629f280f9a83413c773d7c4a46924eaef2fd7d711a5631 SHA512 cd4417885380a244ef83d5cbb73d520fc85cc11aa25d2f995cb560990d2bf974ddc51eb495494e50eff6f10479af49c0da77fd1d8a554bea1a3388e90cb824fa WHIRLPOOL 7a64d8de85bcfa1e41ce68c2fb06066ffb84aa23a1a59ddeeba0aafc9b4f217fe95bb102a0c7fe21b54a5153f1a508372b6fe431ecb45abfa40b3a693e3548e3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUcBaCAAoJEA/daC2XTKcqMMoP/0zOUEbQdGmh1p4RRuba7h8b -Rqu+icg+F4tMUUkCz4851RZ3ckmEYkFMQJLIQMkTQtgEFPJNdStbpETnZGOYhZVj -3qjzcq6ADHyGhv3zKMXXGzjQulu2BRdzb9V6sZvI7jjJ2AzyQsVU/4o9qgpO84q1 -tpM1gED5nRG3f2uaPzLVw+8TwjszvL46gjfpZnRwdrw9UxZzdIasMCBbKvkEto3u -fbm1SFkkOBSa6LpWqWH2dy/QNTkADWskcOXnCoRPZGBtUEiuOiOuDtCeCNDRCB+X -X9qFYpzVhSxNBWyykTd8c8D9ugSQF69860xFrekc4eV5vbEitmsP/kVNNokCW2xT -K6JkLXEderfHtl6K4asErTcT7UheCTMZ+MvOtb6XsszNxsOokWO2JKU7Zr34Zk9B -mVEwc9r8NG4jUw76LuHJ1tRMJhcjU20FHFuEkE4vwkajDB9z4v7acwQG+xiij05X -9uy7jlHCv5qcfOZZwJ5A2IQCTNX/OkBYfWiyTv0oddbrST+VqCOAy8FuTJCAUBZj -1ckacc4/x7SCySQ0IH2IVHiK7lgNV5yzzZlfMjEwpS3ohkADl3w/XNhz450x1oMQ -6TsZc+e3/tVY7cc6ELah1ZefYt1uFfQRMXf0ORUVNrRSWqvTTuHcUzQoUIGSVcqB -o+r3RMQJVymjAXv7QJEe -=duV3 +iF4EAREIAAYFAlR04l0ACgkQ2ugaI38ACPBwzQD8CXwtyvflgbrtvLH2gY2y27rT +35Q+mObupuOypU1hqXcBAKkUxwC0LFCuMl9PjjT+hXMhHA221s9jPtMQTh42eSel +=yGAt -----END PGP SIGNATURE----- diff --git a/media-libs/mesa/files/mesa-10.2-sysfs-instead-of-libudev.patch b/media-libs/mesa/files/mesa-10.2-sysfs-instead-of-libudev.patch new file mode 100644 index 000000000000..6eed6acbe792 --- /dev/null +++ b/media-libs/mesa/files/mesa-10.2-sysfs-instead-of-libudev.patch @@ -0,0 +1,378 @@ +From 85b6f36ca5238dd3fec7c5fcacb8b7074ce53c8e Mon Sep 17 00:00:00 2001 +From: Gary Wong +Date: Wed, 21 May 2014 21:07:42 -0600 +Subject: loader: add optional /sys filesystem method for PCI identification. + +Introduce a simple PCI identification method of looking up the answer +the /sys filesystem (available on Linux). Attempted after libudev, but +before DRM. + +Disabled by default (available only when the --enable-sysfs configure +option is specified). + +Signed-off-by: Gary Wong +Acked-by: Emil Velikov + +Backported to mesa-10.2.8 by Ian Stakenvicius + +--- a/configure.ac ++++ b/configure.ac +@@ -870,14 +870,21 @@ fi + + case "$host_os" in + linux*) +- need_libudev=yes ;; ++ need_pci_id=yes ;; + *) +- need_libudev=no ;; ++ need_pci_id=no ;; + esac + + PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED], + have_libudev=yes, have_libudev=no) + ++AC_ARG_ENABLE([sysfs], ++ [AS_HELP_STRING([--enable-sysfs], ++ [enable /sys PCI identification @<:@default=disabled@:>@])], ++ [have_sysfs="$enableval"], ++ [have_sysfs=no] ++) ++ + if test "x$enable_dri" = xyes; then + if test "$enable_static" = yes; then + AC_MSG_ERROR([Cannot use static libraries for DRI drivers]) +@@ -973,8 +980,15 @@ xyesno) + ;; + esac + ++have_pci_id=no + if test "$have_libudev" = yes; then + DEFINES="$DEFINES -DHAVE_LIBUDEV" ++ have_pci_id=yes ++fi ++ ++if test "$have_sysfs" = yes; then ++ DEFINES="$DEFINES -DHAVE_SYSFS" ++ have_pci_id=yes + fi + + # This is outside the case (above) so that it is invoked even for non-GLX +@@ -1076,8 +1090,8 @@ if test "x$enable_dri" = xyes; then + DEFINES="$DEFINES -DHAVE_DRI3" + fi + +- if test "x$have_libudev" != xyes; then +- AC_MSG_ERROR([libudev-dev required for building DRI]) ++ if test "x$have_pci_id" != xyes; then ++ AC_MSG_ERROR([libudev-dev or sysfs required for building DRI]) + fi + + case "$host_cpu" in +@@ -1252,8 +1266,8 @@ if test "x$enable_gbm" = xauto; then + esac + fi + if test "x$enable_gbm" = xyes; then +- if test "x$need_libudev$have_libudev" = xyesno; then +- AC_MSG_ERROR([gbm requires udev >= $LIBUDEV_REQUIRED]) ++ if test "x$need_pci_id$have_pci_id" = xyesno; then ++ AC_MSG_ERROR([gbm requires udev >= $LIBUDEV_REQUIRED or sysfs]) + fi + + if test "x$enable_dri" = xyes; then +@@ -1271,7 +1285,7 @@ if test "x$enable_gbm" = xyes; then + fi + fi + AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes) +-if test "x$need_libudev" = xyes; then ++if test "x$need_pci_id$have_libudev" = xyesyes; then + GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" + else + GBM_PC_REQ_PRIV="" +@@ -1560,9 +1574,9 @@ for plat in $egl_platforms; do + ;; + esac + +- case "$plat$need_libudev$have_libudev" in ++ case "$plat$need_pci_id$have_pci_id" in + waylandyesno|drmyesno) +- AC_MSG_ERROR([cannot build $plat platform without udev >= $LIBUDEV_REQUIRED]) ;; ++ AC_MSG_ERROR([cannot build $plat platform without udev >= $LIBUDEV_REQUIRED or sysfs]) ;; + esac + done + +@@ -1843,8 +1857,8 @@ gallium_require_llvm() { + + gallium_require_drm_loader() { + if test "x$enable_gallium_loader" = xyes; then +- if test "x$need_libudev$have_libudev" = xyesno; then +- AC_MSG_ERROR([Gallium drm loader requires libudev >= $LIBUDEV_REQUIRED]) ++ if test "x$need_pci_id$have_pci_id" = xyesno; then ++ AC_MSG_ERROR([Gallium drm loader requires libudev >= $LIBUDEV_REQUIRED or sysfs]) + fi + if test "x$have_libdrm" != xyes; then + AC_MSG_ERROR([Gallium drm loader requires libdrm >= $LIBDRM_REQUIRED]) +--- a/src/loader/loader.c 2014-09-19 13:03:22.000000000 -0400 ++++ b/src/loader/loader.c 2014-11-25 12:46:51.412249717 -0500 +@@ -71,6 +71,10 @@ + #include + #include + #endif ++#ifdef HAVE_SYSFS ++#include ++#include ++#endif + #include "loader.h" + + #ifndef __NOT_HAVE_DRM_H +@@ -113,8 +117,8 @@ + udev_handle = dlopen("libudev.so.0", RTLD_LOCAL | RTLD_LAZY); + + if (!udev_handle) { +- log_(_LOADER_FATAL, "Couldn't dlopen libudev.so.1 or libudev.so.0, " +- "driver detection may be broken.\n"); ++ log_(_LOADER_WARNING, "Couldn't dlopen libudev.so.1 or " ++ "libudev.so.0, driver detection may be broken.\n"); + } + } + } +@@ -122,16 +126,19 @@ + return udev_handle; + } + ++static int dlsym_failed = 0; ++ + static void * +-asserted_dlsym(void *dlopen_handle, const char *name) ++checked_dlsym(void *dlopen_handle, const char *name) + { + void *result = dlsym(dlopen_handle, name); +- assert(result); ++ if (!result) ++ dlsym_failed = 1; + return result; + } + + #define UDEV_SYMBOL(ret, name, args) \ +- ret (*name) args = asserted_dlsym(udev_dlopen_handle(), #name); ++ ret (*name) args = checked_dlsym(udev_dlopen_handle(), #name); + + + static inline struct udev_device * +@@ -142,6 +149,9 @@ + UDEV_SYMBOL(struct udev_device *, udev_device_new_from_devnum, + (struct udev *udev, char type, dev_t devnum)); + ++ if (dlsym_failed) ++ return NULL; ++ + if (fstat(fd, &buf) < 0) { + log_(_LOADER_WARNING, "MESA-LOADER: failed to stat fd %d\n", fd); + return NULL; +@@ -157,8 +167,8 @@ + return device; + } + +-int +-loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) ++static int ++libudev_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) + { + struct udev *udev = NULL; + struct udev_device *device = NULL, *parent; +@@ -174,6 +184,9 @@ + + *chip_id = -1; + ++ if (dlsym_failed) ++ return 0; ++ + udev = udev_new(); + device = udev_device_new_from_fd(udev, fd); + if (!device) +@@ -201,16 +214,76 @@ + + return (*chip_id >= 0); + } ++#endif ++ ++#if defined(HAVE_SYSFS) ++static int ++dev_node_from_fd(int fd, unsigned int *maj, unsigned int *min) ++{ ++ struct stat buf; ++ ++ if (fstat(fd, &buf) < 0) { ++ log_(_LOADER_WARNING, "MESA-LOADER: failed to stat fd %d\n", fd); ++ return -1; ++ } ++ ++ if (!S_ISCHR(buf.st_mode)) { ++ log_(_LOADER_WARNING, "MESA-LOADER: fd %d not a character device\n", fd); ++ return -1; ++ } ++ ++ *maj = major(buf.st_rdev); ++ *min = minor(buf.st_rdev); ++ ++ return 0; ++} ++ ++static int ++sysfs_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) ++{ ++ unsigned int maj, min; ++ FILE *f; ++ char buf[0x40]; + +-#elif !defined(__NOT_HAVE_DRM_H) ++ if (dev_node_from_fd(fd, &maj, &min) < 0) { ++ *chip_id = -1; ++ return 0; ++ } + ++ snprintf(buf, sizeof(buf), "/sys/dev/char/%d:%d/device/vendor", maj, min); ++ if (!(f = fopen(buf, "r"))) { ++ *chip_id = -1; ++ return 0; ++ } ++ if (fscanf(f, "%x", vendor_id) != 1) { ++ *chip_id = -1; ++ fclose(f); ++ return 0; ++ } ++ fclose(f); ++ snprintf(buf, sizeof(buf), "/sys/dev/char/%d:%d/device/device", maj, min); ++ if (!(f = fopen(buf, "r"))) { ++ *chip_id = -1; ++ return 0; ++ } ++ if (fscanf(f, "%x", chip_id) != 1) { ++ *chip_id = -1; ++ fclose(f); ++ return 0; ++ } ++ fclose(f); ++ return 1; ++} ++#endif ++ ++#if !defined(__NOT_HAVE_DRM_H) + /* for i915 */ + #include + /* for radeon */ + #include + +-int +-loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) ++static int ++drm_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) + { + drmVersionPtr version; + +@@ -272,23 +345,33 @@ + + return (*chip_id >= 0); + } ++#endif + +-#else + + int + loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) + { ++#if HAVE_LIBUDEV ++ if (libudev_get_pci_id_for_fd(fd, vendor_id, chip_id)) ++ return 1; ++#endif ++#if HAVE_SYSFS ++ if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id)) ++ return 1; ++#endif ++#if !defined(__NOT_HAVE_DRM_H) ++ if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id)) ++ return 1; ++#endif + return 0; + } + +-#endif +- + +-char * +-loader_get_device_name_for_fd(int fd) ++#ifdef HAVE_LIBUDEV ++static char * ++libudev_get_device_name_for_fd(int fd) + { + char *device_name = NULL; +-#ifdef HAVE_LIBUDEV + struct udev *udev; + struct udev_device *device; + const char *const_device_name; +@@ -312,9 +395,66 @@ + out: + udev_device_unref(device); + udev_unref(udev); ++ return device_name; ++} + #endif ++ ++ ++#if HAVE_SYSFS ++static char * ++sysfs_get_device_name_for_fd(int fd) ++{ ++ char *device_name = NULL; ++ unsigned int maj, min; ++ FILE *f; ++ char buf[0x40]; ++ static const char match[9] = "\0DEVNAME="; ++ int expected = 1; ++ ++ if (dev_node_from_fd(fd, &maj, &min) < 0) ++ return NULL; ++ ++ snprintf(buf, sizeof(buf), "/sys/dev/char/%d:%d/uevent", maj, min); ++ if (!(f = fopen(buf, "r"))) ++ return NULL; ++ ++ while (expected < sizeof(match)) { ++ int c = getc(f); ++ ++ if (c == EOF) { ++ fclose(f); ++ return NULL; ++ } else if (c == match[expected] ) ++ expected++; ++ else ++ expected = 0; ++ } ++ ++ strcpy(buf, "/dev/"); ++ if (fgets(buf + 5, sizeof(buf) - 5, f)) ++ device_name = strdup(buf); ++ ++ fclose(f); + return device_name; + } ++#endif ++ ++ ++char * ++loader_get_device_name_for_fd(int fd) ++{ ++ char *result = NULL; ++ ++#if HAVE_LIBUDEV ++ if ((result = libudev_get_device_name_for_fd(fd))) ++ return result; ++#endif ++#if HAVE_SYSFS ++ if ((result = sysfs_get_device_name_for_fd(fd))) ++ return result; ++#endif ++ return result; ++} + + char * + loader_get_driver_for_fd(int fd, unsigned driver_types) diff --git a/media-libs/mesa/mesa-10.2.8.ebuild b/media-libs/mesa/mesa-10.2.8.ebuild index efe4411fc64c..8db3ddac08d4 100644 --- a/media-libs/mesa/mesa-10.2.8.ebuild +++ b/media-libs/mesa/mesa-10.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.8.ebuild,v 1.1 2014/09/22 19:15:54 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.8.ebuild,v 1.2 2014/11/25 20:11:01 axs Exp $ EAPI=5 @@ -51,7 +51,7 @@ done IUSE="${IUSE_VIDEO_CARDS} bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux - vdpau wayland xvmc xa kernel_FreeBSD" + sysfs vdpau wayland xvmc xa kernel_FreeBSD kernel_linux" REQUIRED_USE=" llvm? ( gallium ) @@ -94,9 +94,8 @@ RDEPEND=" classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.7 + !sysfs? ( 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}] @@ -208,6 +207,9 @@ src_prepare() { # relax the requirement that r300 must have llvm, bug 380303 epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch + # allow sysfs to serve pci ids instead of libudev + epatch "${FILESDIR}"/${PN}-10.2-sysfs-instead-of-libudev.patch + # fix for hardened pax_kernel, bug 240956 [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch @@ -321,6 +323,7 @@ multilib_src_configure() { $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ + $(use_enable sysfs) \ --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ diff --git a/media-libs/mesa/mesa-10.3.0.ebuild b/media-libs/mesa/mesa-10.3.0.ebuild index 149925c1a082..9e00c8a9c64c 100644 --- a/media-libs/mesa/mesa-10.3.0.ebuild +++ b/media-libs/mesa/mesa-10.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.0.ebuild,v 1.5 2014/10/16 14:59:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.0.ebuild,v 1.6 2014/11/25 20:11:01 axs Exp $ EAPI=5 @@ -51,7 +51,7 @@ done IUSE="${IUSE_VIDEO_CARDS} bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux - vdpau wayland xvmc xa kernel_FreeBSD" + sysfs vdpau wayland xvmc xa kernel_FreeBSD kernel_linux" REQUIRED_USE=" llvm? ( gallium ) @@ -95,9 +95,8 @@ RDEPEND=" classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.7 + !sysfs? ( 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}] @@ -323,6 +322,7 @@ multilib_src_configure() { $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ + $(use_enable sysfs) \ --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ diff --git a/media-libs/mesa/mesa-10.3.1.ebuild b/media-libs/mesa/mesa-10.3.1.ebuild index 16b378d02809..e18b07a4713b 100644 --- a/media-libs/mesa/mesa-10.3.1.ebuild +++ b/media-libs/mesa/mesa-10.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.1.ebuild,v 1.1 2014/10/18 21:48:04 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.1.ebuild,v 1.2 2014/11/25 20:11:01 axs Exp $ EAPI=5 @@ -51,7 +51,7 @@ done IUSE="${IUSE_VIDEO_CARDS} bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux - vdpau wayland xvmc xa kernel_FreeBSD" + sysfs vdpau wayland xvmc xa kernel_FreeBSD kernel_linux" REQUIRED_USE=" llvm? ( gallium ) @@ -95,9 +95,8 @@ RDEPEND=" classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.7 + !sysfs? ( 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}] @@ -323,6 +322,7 @@ multilib_src_configure() { $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ + $(use_enable sysfs) \ --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ diff --git a/media-libs/mesa/mesa-10.3.4.ebuild b/media-libs/mesa/mesa-10.3.4.ebuild index 308e281fefe7..0e7319860175 100644 --- a/media-libs/mesa/mesa-10.3.4.ebuild +++ b/media-libs/mesa/mesa-10.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.4.ebuild,v 1.1 2014/11/22 04:51:57 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.4.ebuild,v 1.2 2014/11/25 20:11:01 axs Exp $ EAPI=5 @@ -51,7 +51,7 @@ done IUSE="${IUSE_VIDEO_CARDS} bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux - vdpau wayland xvmc xa kernel_FreeBSD" + sysfs vdpau wayland xvmc xa kernel_FreeBSD kernel_linux" REQUIRED_USE=" llvm? ( gallium ) @@ -95,9 +95,8 @@ RDEPEND=" classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.7 + !sysfs? ( 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}] @@ -323,6 +322,7 @@ multilib_src_configure() { $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ + $(use_enable sysfs) \ --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index 10e406a2cec9..20b828701d51 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -24,6 +24,7 @@ Build the LLVM based r600 shader compiler. Enable sharing of common code for classic DRI drivers. Enable sharing of common code for the OpenGL API. + Use sysfs for pci-id support on linux instead of libudev Enable the VDPAU acceleration interface for the Gallium3D Video Layer. Enable support for dev-libs/wayland Enable the XA (X Acceleration) API for Gallium3D.