Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/
Date: Fri, 30 Jun 2017 20:45:06
Message-Id: 1498855467.0f1b8fba1f3fe4f3aa30b83d89f221bb5930f8da.lluixhi@gentoo
1 commit: 0f1b8fba1f3fe4f3aa30b83d89f221bb5930f8da
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Fri Jun 30 20:44:27 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Fri Jun 30 20:44:27 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0f1b8fba
7
8 media-libs/mesa: version bump to 17.1.4
9
10 media-libs/mesa/Manifest | 4 +-
11 media-libs/mesa/mesa-17.0.6.ebuild | 2 +-
12 .../{mesa-17.0.6.ebuild => mesa-17.1.4.ebuild} | 43 +++++++++-------------
13 3 files changed, 21 insertions(+), 28 deletions(-)
14
15 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
16 index 398b0d6..6d9d0b5 100644
17 --- a/media-libs/mesa/Manifest
18 +++ b/media-libs/mesa/Manifest
19 @@ -11,12 +11,14 @@ DIST mesa-17.1.0.tar.xz 9849580 SHA256 cf234a6ed4764673886b6661553b54675776ef089
20 DIST mesa-17.1.1.tar.xz 9854480 SHA256 aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef SHA512 4679b8c1a957e515e9f7a6658f2264d4c458379a37fa8f64c9ef03e817857a683fc527a8172d3ae68ca5ebc84a1a78264e18807704c5130c95efdf0431502bc7 WHIRLPOOL e34aef05bc9f6256a717de1d47f445fedbe5981836724b31e6d0ee801a26b23da9c70acdbfc86d2b676f494ba2c47bf24d8ed0c5c8fb3774fba28443d47578d4
21 DIST mesa-17.1.2.tar.xz 9837516 SHA256 0937804f43746339b1f9540d8f9c8b4a1bb3d3eec0e4020eac283b8799798239 SHA512 9df5e1a0336948a6ba338a9a8499b286543bc079f61f1cf85f6ecf98e05fab9a237777cde0d1e3f2153df9b07515cb8c1a08531d43f053783991ecdd32380d3b WHIRLPOOL 81ce678cb95eb86c41fb00f01ad5f4ed207a20e8290d789f347377553da4ff7ebde56bdb41df03a94a30f6fc141c52833bf6da6c5a79ff85654c7806945b4bd5
22 DIST mesa-17.1.3.tar.xz 9861256 SHA256 5f1ee9a8aea2880f887884df2dea0c16dd1b13eb42fd2e52265db0dc1b380e8c SHA512 b487d4f3d7717f379e7aaf66958bbef886fbae219e6e0333123c4623dc7db84109aca8cf07be08c0b79a74bdb198c704073fd549c6e85aa952ed3c97da1a8a94 WHIRLPOOL f9e2634e8a4c9765739ca4db005901d4df077f954e9008c05ee26dfc10e008166e5128096db071e0e26f4bdf244ecb9f8767b8862b018a68d677a3579c789114
23 +DIST mesa-17.1.4.tar.xz 9899196 SHA256 06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad SHA512 cb8369f0edd3e17b4eee8da159b9dc487f8144d69fe4b95901e9aa6a924759866f26f91fc2ead7036707eecea41582185e7ce73d54f97bf310f198b72ee0a8e4 WHIRLPOOL 5c313d7b938c58a7e2f59b619161316629ee996025dc5810742c881716cfcee441a8b3641d644fa0bc4aeec6c44c4b1ce99f515a59159a3391cf4948c2bab45a
24 EBUILD mesa-13.0.5.ebuild 13658 SHA256 c2d8750e43354a05926dd17e7bba27a9c348ea49d723ed3a0045f5b8dd34f639 SHA512 30af415e1448909b0420080edf24b8006cc55d8b0b70d0d9b6f2c5f5d40b710c5ebb463f1203204de5e7e71bcb68564d490bd61be8c52362e0219d62074eb279 WHIRLPOOL de6f514c8d879c41b7f63429d45790f133b1c60412262f0b38bffc5cae69f8621bbbbc988fc851f5c764a7867a5a22885391f80ab342ff4e84cf5b2bf0798a2c
25 EBUILD mesa-13.0.6.ebuild 13584 SHA256 3bfff928951edec571894f54fada7bb718e95e94f82806764731d09522b5304d SHA512 1fb15e100deeb50f5de436e2ffe3e131ebe3badb820aa1ddef8cfa691426b42bd3fbe66fd55cd848f9c5f6de9b5dd396f6879813730fb0a234a96a818a71b1cc WHIRLPOOL 6a7d6a0c01a847bfdb8bdeb3fa7ff558e4f3ac77b6f3f4334037ab3098f7763fe26de34378a49a57cbbefdec6ab22952cb0c948517b0885d882e0b92626af585
26 -EBUILD mesa-17.0.6.ebuild 13604 SHA256 f574ac8e1d54fd8dc88c667ace3dc0f9b9088f84165d1a52bf28ca96ae696794 SHA512 2602a5a5b5eda4c214919b899ebc211f253d6d1f291fd3915a084d3ff660ae014b53852c37ef24cf230558472a4a8ee4bfe70a5a51516cad8a9ad00a3f899e75 WHIRLPOOL a853b5470ed73708aa73d814c43a47c65787bf2087f01264566d992c1572cc58a1704bac10a1dbeaddb9a02653ddfb634a11df55b5e2adb5033ce9dda618dde7
27 +EBUILD mesa-17.0.6.ebuild 13603 SHA256 b4e554e727d9e35f77a83d5cb7ae8f19542e3e7ea367d3377496bc73f3e6da47 SHA512 f0415ed538799bc0a74ff94563629b7b86372eba0aae17448e38c190be8211dcd48bad902b876ff54b7c9d65df4d83fd4a22cb197be9ab4d960202ee09d0beb7 WHIRLPOOL c32a1c4d6a7fd06c9782ef980874ee6830b8477733b8c0f656e5a84a7ccd1f99cef19fdc1af913fdf5db62bc76bba75333afc20e96338b57f23a6b5534f152a6
28 EBUILD mesa-17.0.7.ebuild 13611 SHA256 06e11aa4c7e3a6bec9294c7028c907c5480dce3ee4c95052491712dbdb91a808 SHA512 0fcfdc77728a7ab3d629bee9f399a59c1d63c593a6987d71f2766c2f3aba813ee6e36795f2d518e3309a14147a093b1616ab2fe0dfcdf43a2fcc498d62fbc0a2 WHIRLPOOL 92aca377f74604808a5ea904dde89bc48f26e3607a8bd3acef00e2eac50f6a011f177a224fbcb542f94cbeebc00e4757aec4abe0e501f19f9263c90b26494deb
29 EBUILD mesa-17.1.0.ebuild 13521 SHA256 99a67ea7c2b5dce88b2a0f9459d113b1bb447058e944151b48773f6c300f33f2 SHA512 1f5041783a775d0d777cbb5775529b5143115d93a78febc9dc6cef61cea089a407ace42e9940139ff34bb95d19991aa2570ef95b2d80fa8f53da6d192ef8ebf1 WHIRLPOOL 513d4cf652a819595416f48440e066a103f5c548fe71fcbc9d29bbbd71ef4efb8dfc60cae96917b5100e540b9062bc3ae1ca44266e7bb98cf3611e541944fbaf
30 EBUILD mesa-17.1.1.ebuild 13521 SHA256 99a67ea7c2b5dce88b2a0f9459d113b1bb447058e944151b48773f6c300f33f2 SHA512 1f5041783a775d0d777cbb5775529b5143115d93a78febc9dc6cef61cea089a407ace42e9940139ff34bb95d19991aa2570ef95b2d80fa8f53da6d192ef8ebf1 WHIRLPOOL 513d4cf652a819595416f48440e066a103f5c548fe71fcbc9d29bbbd71ef4efb8dfc60cae96917b5100e540b9062bc3ae1ca44266e7bb98cf3611e541944fbaf
31 EBUILD mesa-17.1.2.ebuild 13563 SHA256 7fe23c5eb390594f5918c8778c150b32e6cec8ab0c495ede694a37e0629f7c3c SHA512 ae0bbf00dc5d8bc4c75069590a12e693be69b0d570882f314564b4341da271f1c56cf84a3ede35f660a01d3f921070d4dbcb599cb348e81f17558b574c8473b2 WHIRLPOOL f922c043146e9a9e179d29c22e0bc1a8419cc20a529b0eeebaa0d6f276616a11bb4cda212134a2483e51b5b3086fa6780e40025f92f8d8baed8c5b7442d5cdaa
32 EBUILD mesa-17.1.3.ebuild 13510 SHA256 fb31bfe5fa3f48e577f148df82d4aaf65357684e1f6798b8ec99557dea096504 SHA512 ed870976b76a02d697b72f193dbeea49edf1d7e503250b2955dae7e26db2c19be5c3b81a8f99010e3650cd3ee680a4f3983c883ec336d0a2ab3fbdf029543676 WHIRLPOOL 38585d8528ae5c544fdfd8569025db782a51515756f9fa5983269d5b62c7f54cd3febcaf943786335c69bdefa1842ee3f39282a5ba52b52e2171e892d3f0f91d
33 +EBUILD mesa-17.1.4.ebuild 13510 SHA256 fb31bfe5fa3f48e577f148df82d4aaf65357684e1f6798b8ec99557dea096504 SHA512 ed870976b76a02d697b72f193dbeea49edf1d7e503250b2955dae7e26db2c19be5c3b81a8f99010e3650cd3ee680a4f3983c883ec336d0a2ab3fbdf029543676 WHIRLPOOL 38585d8528ae5c544fdfd8569025db782a51515756f9fa5983269d5b62c7f54cd3febcaf943786335c69bdefa1842ee3f39282a5ba52b52e2171e892d3f0f91d
34 MISC metadata.xml 2536 SHA256 d19b63eae85e1a25553e11db8b6e38b31f55810412d7e48680bd78fda4fe4808 SHA512 1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666 WHIRLPOOL 561a884f9ea3bc15d070e52e53cf3ea461a94ee33f0b06778595c83ab9e35311367dbe37a681201d19cb0c9610fe7eebfb295e1cf116c2b040d286ee579676ac
35
36 diff --git a/media-libs/mesa/mesa-17.0.6.ebuild b/media-libs/mesa/mesa-17.0.6.ebuild
37 index 3ae7fb1..fa0ea48 100644
38 --- a/media-libs/mesa/mesa-17.0.6.ebuild
39 +++ b/media-libs/mesa/mesa-17.0.6.ebuild
40 @@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
41 SRC_URI=""
42 else
43 SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
44 - KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
45 + KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
46 fi
47
48 LICENSE="MIT"
49
50 diff --git a/media-libs/mesa/mesa-17.0.6.ebuild b/media-libs/mesa/mesa-17.1.4.ebuild
51 similarity index 92%
52 copy from media-libs/mesa/mesa-17.0.6.ebuild
53 copy to media-libs/mesa/mesa-17.1.4.ebuild
54 index 3ae7fb1..4c8cef4 100644
55 --- a/media-libs/mesa/mesa-17.0.6.ebuild
56 +++ b/media-libs/mesa/mesa-17.1.4.ebuild
57 @@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
58 SRC_URI=""
59 else
60 SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
61 - KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
62 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
63 fi
64
65 LICENSE="MIT"
66 @@ -40,9 +40,9 @@ for card in ${VIDEO_CARDS}; do
67 done
68
69 IUSE="${IUSE_VIDEO_CARDS}
70 - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
71 - +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau
72 - vulkan wayland xvmc xa"
73 + bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
74 + +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
75 + vdpau vulkan wayland xvmc xa"
76
77 REQUIRED_USE="
78 d3d9? ( dri3 gallium )
79 @@ -70,11 +70,12 @@ REQUIRED_USE="
80 video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
81 video_cards_r600? ( gallium )
82 video_cards_radeonsi? ( gallium llvm )
83 + video_cards_vc4? ( gallium )
84 video_cards_vivante? ( gallium gbm )
85 video_cards_vmware? ( gallium )
86 "
87
88 -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.74"
89 +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
90 # keep correct libdrm and dri2proto dep
91 # keep blocks in rdepend for binpkg
92 RDEPEND="
93 @@ -85,6 +86,7 @@ RDEPEND="
94 gallium? ( app-eselect/eselect-mesa )
95 >=app-eselect/eselect-opengl-1.3.0
96 >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
97 + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
98 >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
99 >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
100 >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
101 @@ -92,13 +94,11 @@ RDEPEND="
102 >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
103 >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
104 x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
105 + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
106 llvm? (
107 video_cards_radeonsi? (
108 virtual/libelf:0=[${MULTILIB_USEDEP}]
109 - vulkan? (
110 - || (
111 - sys-devel/llvm:4[${MULTILIB_USEDEP}]
112 - >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) )
113 + vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
114 )
115 video_cards_r600? (
116 virtual/libelf:0=[${MULTILIB_USEDEP}]
117 @@ -106,11 +106,7 @@ RDEPEND="
118 video_cards_radeon? (
119 virtual/libelf:0=[${MULTILIB_USEDEP}]
120 )
121 - || (
122 - sys-devel/llvm:4[${MULTILIB_USEDEP}]
123 - >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
124 - )
125 - <sys-devel/llvm-5:=[${MULTILIB_USEDEP}]
126 + >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
127 )
128 opencl? (
129 app-eselect/eselect-opencl
130 @@ -153,15 +149,9 @@ DEPEND="${RDEPEND}
131 ) )
132 )
133 opencl? (
134 - || (
135 - sys-devel/llvm:4[${MULTILIB_USEDEP}]
136 - >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
137 - )
138 - || (
139 - sys-devel/clang:4[${MULTILIB_USEDEP}]
140 - >=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}]
141 - )
142 - >=sys-devel/gcc-4.6
143 + >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
144 + >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
145 + >=sys-devel/gcc-4.6
146 )
147 sys-devel/gettext
148 virtual/pkgconfig
149 @@ -204,7 +194,7 @@ pkg_setup() {
150 fi
151
152 if use llvm || use opencl; then
153 - LLVM_MAX_SLOT=4 llvm_pkg_setup
154 + llvm_pkg_setup
155 fi
156 python-any-r1_pkg_setup
157 }
158 @@ -246,13 +236,13 @@ multilib_src_configure() {
159 fi
160
161 if use egl; then
162 - myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
163 + myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
164 fi
165
166 if use gallium; then
167 myconf+="
168 $(use_enable d3d9 nine)
169 - $(use_enable llvm gallium-llvm)
170 + $(use_enable llvm)
171 $(use_enable openmax omx)
172 $(use_enable vaapi va)
173 $(use_enable vdpau)
174 @@ -329,6 +319,7 @@ multilib_src_configure() {
175 $(use_enable gles1) \
176 $(use_enable gles2) \
177 $(use_enable nptl glx-tls) \
178 + $(use_enable unwind libunwind) \
179 --enable-valgrind=$(usex valgrind auto no) \
180 --enable-llvm-shared-libs \
181 --with-dri-drivers=${DRI_DRIVERS} \