diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mesa/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/mesa/files/mesa-9999-llvm-configure.patch | 18 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 5 |
3 files changed, 23 insertions, 3 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 4ce509f..9f71ef0 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -8,6 +8,7 @@ AUX mesa-8.1-dont-require-llvm-for-r300.patch 861 SHA256 7ca0a7135834448ea7ca279 AUX mesa-9.1-optional-gl-headers.patch 1455 SHA256 779e99d020e6292b05ec70bad4323d6d4ef6d8862c727724550823c9d6297427 SHA512 db121d1db5f146708041a593f4edeedc612b973c4257501afa9a3c6edf96fef703e69c7bc17ee1ba59828d882bedd3da4555dcf20e7ec4d0ac3362f9f3070081 WHIRLPOOL 1b30cd5bbe6bad4d128d572ab0c6b3479e566ecb482073ebb5abfbc2e1298b4ec51ac32b97030e3bf36a80e0acd7dab913de28efd259124432b5c61e0dba2fb6 AUX mesa-9999-dont-require-llvm-for-r300.patch 524 SHA256 7e57cb037a57c8c4ef49be93d6f53bd9f002d918bf91c77158da4a4980fbbd66 SHA512 c5b4b40636a4bab64338a0be730f10ec546ff1da31fdde83c628485a5569cc021042fdb17e2ddbc39b86ab6e72e805ed28af9a98ebed320d23084e2575d6437b WHIRLPOOL 7c896f1be7353c964247fd60f517bb100779a02f08166ca509d4b2924c3cd45aba4cc5d45f0eeb171c4ef5d105e5a93316bd24af1342510ba8bde385ea709854 AUX mesa-9999-gallium-llvm-DisablePrettyStackTrace.patch 988 SHA256 1cb1cc6ae6f2a3e5e15d31228d7ce1df26f829b6e1a1920b6ae3d039adefec92 SHA512 c1a4a52929afab66c65c20355e44d5e1b141498eb5d1c296ff8c93e8bf2580ab676934d8b9f5834563160e6aa11a88152b316cee7e11de7fb562b676df242fab WHIRLPOOL 2ff7eed96663eb8835475ef6dc10a2207cb3d602f18302fd9009e59c1b5edbd4375cac1967f4d347360add369f1ef8af441209dc8e852147f23313a4379b626a +AUX mesa-9999-llvm-configure.patch 607 SHA256 f2b445f0c86ab8726ea71eb9070361b1028967cf2fa705980391d5db1e1eeb51 SHA512 bd507fa4a463eae66856f8cfb8b6c07728229d769551d3ba3f055fa73a59035c0c74cc097ec81c2c6d2d469df5294b0a35d7b271d8f3ff93b9d6870af785779e WHIRLPOOL b4b24be587e6d593a871ddcb349ec388674f8aad5bca9f08f0a5977016dc583c0fd6cc8d03d03fcbe9755c93a5dde6e9f006a29f1d16bc7910aa134634b1ef55 DIST MesaLib-9.1.6.tar.bz2 6134267 SHA256 e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d SHA512 b23d0cc3515b56636f73c4d3247212f8c731c967f5ecf8c247a3bd359038ed374c23eb1bb0da17a9152f8b8d984acd134fa9823d9349285287e58676419b4d40 WHIRLPOOL 4e3c07c893060f77cade242d904c1ec4c1c2982b6b3d9ff188b3d809ad8592408c34bd71276f0e8dfa38bce58a82e146b25064cfa50d3ce6d52a7b69a694690a EBUILD mesa-9.1.6-r100.ebuild 11215 SHA256 1d82be7ea0113b263ade762b21235d87c2732d1afdf7a945d4fe17adec80bd3b SHA512 89f35c0043818e4cb828c066b5759fa59ec528a7397b241a85075da15f66323be6b24ec4473e82f78164bf61788758cc226c6b79133d7de750e94d53bac8e659 WHIRLPOOL e77104786a5321ec122a753d2c68a68d797ed20e88d9b59032cc553fbfd5ef827795f7c276cde88e6e91326bf9afbc259c5c7b92f5bbd4888fe75ae027d5ab59 -EBUILD mesa-9999.ebuild 12491 SHA256 b0cca05e6edd05fa9c8eb9776c86f3f66dab28583eafd54e68fc2a3f3a6ddc4f SHA512 691c4170294a185cebab8979a6f84c555a88517dd8316ab7b3fa9272b9ec79b459fb8a2ce95c6b647a13394e8da5c6869ba8cbb0a5fd58bef832af8510ce1020 WHIRLPOOL b011ce625e0a7f11bb7c446ef302c664af27c42aba6f1f84b03b6b5b4739065b37ab09c4f9defb6145e411c7c2596425a52b4c4b35418f502f2e13c084584d03 +EBUILD mesa-9999.ebuild 12545 SHA256 c2ac5bc19c4dc22f1f8ab884ad4cca16eb0eac06cdda57c5cd750fec924c9e22 SHA512 5f9edef01d7a23cdc4ba67b31790a973923cbedc96d5d7bdb0e15e72dddfd353755e8b9180cb1361201d8785152f8acc9f69eb6865ccaf53665025b148a46243 WHIRLPOOL f5bf103c922d561286d938eeefe8176ab5f7b770b998fd97704ac641bf58d485165f42ed38d9a037c8fe741ec1c423bd7b3624c267923ba05945aba72c233b16 diff --git a/media-libs/mesa/files/mesa-9999-llvm-configure.patch b/media-libs/mesa/files/mesa-9999-llvm-configure.patch new file mode 100644 index 0000000..af8ed7a --- /dev/null +++ b/media-libs/mesa/files/mesa-9999-llvm-configure.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index f75325d..0cabc96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1842,7 +1842,11 @@ dnl in LLVM_LIBS. + + if test "x$MESA_LLVM" != x0; then + +- LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`" ++ if test $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 5; then ++ LLVM_LIBS="`$LLVM_CONFIG --libs --system-libs ${LLVM_COMPONENTS}`" ++ else ++ LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`" ++ fi + + if test "x$with_llvm_shared_libs" = xyes; then + dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, + diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index b6640b8..608838d 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -122,7 +122,7 @@ done DEPEND="${RDEPEND} llvm? ( - >=sys-devel/llvm-2.9 + >=sys-devel/llvm-3.4 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) @@ -173,8 +173,9 @@ src_prepare() { epatch fi - # fix recent change that breaks mesa + # fix recent llvm changes that breaks mesa epatch "${FILESDIR}"/${P}-gallium-llvm-DisablePrettyStackTrace.patch + epatch "${FILESDIR}"/${P}-llvm-configure.patch # fix for hardened pax_kernel, bug 240956 [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch |