[patch] mesa-9999-icd.patch

mesa-icd.patch (text/plain), 3.68 KB, created by Jan Ziak (atomsymbol) on 2016-08-20 12:43:22 UTC

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6173879..8e3af2d 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -9,6 +9,6 @@ AUX mesa-10.5.1-fstat-include.patch 1008 SHA256 4d44da3882ae9ae7c5d255189e5ca865
 AUX mesa-12.0-sysmacros.patch 929 SHA256 093077ce3278efb890cb8be4d6641b25428ad6fd8a44cddd9f26e816e2038284 SHA512 4ab5156cd9cbb29b77d00e3eb8ed03e38151bebce3d3de8bd74dc46f767a3ab3e513ffcf564b9f67b5d18cf4583ba7875a67a94910f74249caa60fe8a2616773 WHIRLPOOL 1d358d4c83fb408d332da3ef5855107cf58489fb988e861d8494dcf10130862ec3db744d17f4531f9a9edd5603424d6fd5358761e14531c57fca73bd363be9c4
 DIST mesa-12.0.1.tar.xz 8571144 SHA256 bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389 SHA512 11898336478d1f5bd3946d695b9599647c0b9084ad8890b4fa89daa922a217e5ca6d8b72f5801e362c3dd7723382f2daaa655b54f65a6d088ad8cfdb85f10023 WHIRLPOOL 9923990fc35142b8c877cbbfdfa7d362ae94c8c637360f28e348943dc6f380bdf5aee944c04da6337994f0f15790c8d1a55bea1f0b00afa780305e5862c78601
 EBUILD mesa-12.0.1.ebuild 13296 SHA256 6db572b55e09c9ce3085b755c7cb06700e027d29f7781286d4494475136706fc SHA512 9a32064bb7b10f83c37c50468dbadcec4516b16ba187822eb267cbe7a2ff3ee13f8a2cc048c6b3ea1874436b7a9a3e1c738cf3df0524f15eab3a89092021b937 WHIRLPOOL 834a8c4cc0e3285a9f8d05c23f6d2d8d0609cd0c9cee7dfa547d4e8d28e55e680e320633ccd68d44e794c52a4a3d93c8ebbbf183953c26ffacc3b5168bdaf801
-EBUILD mesa-9999.ebuild 12736 SHA256 8e323fda9cc2d69dfe8b96b18979a4eebc21bba22d9544bb15720d282a51e57e SHA512 0d548d401775fa1b82b065621baf0ea9c40ba4f75a640325702ff5b0ee3bbe5117591e1d34d40ca6ee6f6fa953495b7666f9dd0150c66462741b199876b40a17 WHIRLPOOL eba91aca83e5a8dc430b01b915a1d25672ee583a0dc456a1c8cf320f3dd6c223f9d5414f18a4e5c52a7aa2b8bd1a1200690549fe68beba49779555558f90dd41
+EBUILD mesa-9999.ebuild 12872 SHA256 a2d556140e9fb3ad874d3594eccc476d3a2133a1a0ef43906c00c66b5876aa54 SHA512 7946622df43f53815849ff6f5b026de265829b4c2ee31685a8d5d33d5474d5b9bd43e3b126591c2905fe01cdd3eabe8b0e4b7b8ff8ba2219c233e07afb163d47 WHIRLPOOL 82d793562aaed28992e60026df66c4a3de371f56994fde06d56bb67ec0d6d0a868eb0d2e5eb2291d5533d8abd3350a9560bbe20ecbc470978e81481f0bc25b36
 MISC mesa-12.0.1.ebuild.mainstream 12696 SHA256 fa4863b2f051827037ae540da718d481e8f081b64cd2e9a567fd8964c700c25f SHA512 ae74b171768237f224e711a9d45ce87254f9bf0c3e75d76608f7c97bcc320aaa5cebf6b24e401dcbe86f75cd843607bf96e7967809a42f5c39e8cf3f49ef507e WHIRLPOOL c8f1d2255059b6a514345ed42498ee47ee52e6a8f086e936f15d95522270eed5b312cb9d93ddea92f4b42e1bb999d3ffbea5ce58b1d0fc333b5e59b9a5c53ea2
 MISC mesa-9999.ebuild.mainstream 12636 SHA256 57bd165f0054f9bc36516325367bdefbc4d8b83f2a0b09e9a2fc9a8328894907 SHA512 f9345092c21ba7bd1e3faba2860f114e2d0cbcf473bc8da0199745bf42b0b44f953f61a64f28d6b4f759e7ff8cd82f7934d2c58e4c8032536e0fff89482fa70d WHIRLPOOL a54234f512df96cd643e93465b246ab9a9d2482098fb6ba5b64f9dfe22eeeb0bf4cd69276c1450f497d175c9fd6bba2c7b3897da70767d00b81a6ea65c186603
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f21aee1..071bb91 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -352,6 +352,9 @@ multilib_src_install() {
 			"${ED}"${cl_dir}/include
 		fi
 		eend $?
+		mkdir -p "${ED}/etc/OpenCL/vendors"
+		echo "/usr/lib32/OpenCL/vendors/mesa/libOpenCL.so" > "${ED}/etc/OpenCL/vendors/mesa32.icd"
+		echo "/usr/lib64/OpenCL/vendors/mesa/libOpenCL.so" > "${ED}/etc/OpenCL/vendors/mesa64.icd"
 	fi
 
 	if use openmax; then
@@ -395,11 +398,6 @@ pkg_postinst() {
 		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"