| 1 |
commit: 374ac288fa934e0151c8824d0a719553cace9718 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 4 21:21:11 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 4 21:21:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=374ac288 |
| 7 |
|
| 8 |
media-libs/mesa: version bump to 18.1.9, syncs with tree |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 12 |
|
| 13 |
media-libs/mesa/Manifest | 2 +- |
| 14 |
.../{mesa-17.3.9.ebuild => mesa-18.1.9.ebuild} | 79 +++++++--------------- |
| 15 |
2 files changed, 24 insertions(+), 57 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest |
| 18 |
index e35e427..267d401 100644 |
| 19 |
--- a/media-libs/mesa/Manifest |
| 20 |
+++ b/media-libs/mesa/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
-DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f |
| 23 |
DIST mesa-18.1.6.tar.xz 11142884 BLAKE2B fdd156fe7debf5223285dfa238070a2bd7d8ec684dec168afab78b9d2d38d53c10d939aaa64f34c2910e542dce3869adfca6383fca6a854c6dd03287a044b0e3 SHA512 2966210800215f5ced2720691063a8519b51ebeab9fb1e99bde4b1bd7ccc719d6395a1c29f25c88efe62d1592cf14ceafc163aca349490b1f8cee81070d46fcc |
| 24 |
+DIST mesa-18.1.9.tar.xz 11146188 BLAKE2B 753f0fa3780502d56927f9b0e6124b4728cb5aa3600de78585487fb8e178c6987a72b79fb56e6c310757d157f9f85f12b73a6889bd361b51b62fb1dc1c20eecd SHA512 22db2950d25a3d9393e7c622c783bd177c21695569c8a95683bf77e92318e1db85672a134d4bea30c1f49a24e52bc3a2c1a0ac15deafb3a8fcbfb6de6a18adc2 |
| 25 |
|
| 26 |
diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-18.1.9.ebuild |
| 27 |
similarity index 86% |
| 28 |
rename from media-libs/mesa/mesa-17.3.9.ebuild |
| 29 |
rename to media-libs/mesa/mesa-18.1.9.ebuild |
| 30 |
index 20af8b6..1de081b 100644 |
| 31 |
--- a/media-libs/mesa/mesa-17.3.9.ebuild |
| 32 |
+++ b/media-libs/mesa/mesa-18.1.9.ebuild |
| 33 |
@@ -3,7 +3,7 @@ |
| 34 |
|
| 35 |
EAPI=6 |
| 36 |
|
| 37 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git" |
| 38 |
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" |
| 39 |
|
| 40 |
if [[ ${PV} = 9999 ]]; then |
| 41 |
GIT_ECLASS="git-r3" |
| 42 |
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then |
| 43 |
SRC_URI="" |
| 44 |
else |
| 45 |
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" |
| 46 |
- KEYWORDS="amd64 arm arm64 ia64 ~mips ppc ~sh sparc x86" |
| 47 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
| 48 |
fi |
| 49 |
|
| 50 |
LICENSE="MIT" |
| 51 |
@@ -46,7 +46,7 @@ IUSE="${IUSE_VIDEO_CARDS} |
| 52 |
REQUIRED_USE=" |
| 53 |
d3d9? ( dri3 gallium ) |
| 54 |
llvm? ( gallium ) |
| 55 |
- opencl? ( gallium llvm ) |
| 56 |
+ opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) ) |
| 57 |
openmax? ( gallium ) |
| 58 |
gles1? ( egl ) |
| 59 |
gles2? ( egl ) |
| 60 |
@@ -75,13 +75,9 @@ REQUIRED_USE=" |
| 61 |
video_cards_vmware? ( gallium ) |
| 62 |
" |
| 63 |
|
| 64 |
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89" |
| 65 |
-# keep blocks in rdepend for binpkg |
| 66 |
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91" |
| 67 |
RDEPEND=" |
| 68 |
- !<x11-base/xorg-server-1.7 |
| 69 |
- !<=x11-proto/xf86driproto-2.0.3 |
| 70 |
- classic? ( app-eselect/eselect-mesa ) |
| 71 |
- gallium? ( app-eselect/eselect-mesa ) |
| 72 |
+ !app-eselect/eselect-mesa |
| 73 |
>=app-eselect/eselect-opengl-1.3.0 |
| 74 |
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] |
| 75 |
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] |
| 76 |
@@ -90,7 +86,7 @@ RDEPEND=" |
| 77 |
>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] |
| 78 |
>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] |
| 79 |
>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] |
| 80 |
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] |
| 81 |
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] |
| 82 |
x11-libs/libXfixes:=[${MULTILIB_USEDEP}] |
| 83 |
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
| 84 |
llvm? ( |
| 85 |
@@ -119,7 +115,7 @@ RDEPEND=" |
| 86 |
) |
| 87 |
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
| 88 |
wayland? ( |
| 89 |
- >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] |
| 90 |
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] |
| 91 |
>=dev-libs/wayland-protocols-1.8 |
| 92 |
) |
| 93 |
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
| 94 |
@@ -147,14 +143,16 @@ RDEPEND="${RDEPEND} |
| 95 |
# 1. List all the working slots (with min versions) in ||, newest first. |
| 96 |
# 2. Update the := to specify *max* version, e.g. < 7. |
| 97 |
# 3. Specify LLVM_MAX_SLOT, e.g. 6. |
| 98 |
-LLVM_MAX_SLOT="5" |
| 99 |
+LLVM_MAX_SLOT="6" |
| 100 |
LLVM_DEPSTR=" |
| 101 |
|| ( |
| 102 |
+ sys-devel/llvm:7[${MULTILIB_USEDEP}] |
| 103 |
+ sys-devel/llvm:6[${MULTILIB_USEDEP}] |
| 104 |
sys-devel/llvm:5[${MULTILIB_USEDEP}] |
| 105 |
sys-devel/llvm:4[${MULTILIB_USEDEP}] |
| 106 |
>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] |
| 107 |
) |
| 108 |
- <sys-devel/llvm-6:=[${MULTILIB_USEDEP}] |
| 109 |
+ sys-devel/llvm:=[${MULTILIB_USEDEP}] |
| 110 |
" |
| 111 |
LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
| 112 |
CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} |
| 113 |
@@ -276,11 +274,11 @@ src_prepare() { |
| 114 |
eapply "${FILESDIR}"/${PN}-17-execinfo.patch |
| 115 |
eapply "${FILESDIR}"/${PN}-17-musl-string_h.patch |
| 116 |
eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch |
| 117 |
- eapply "${FILESDIR}"/${PN}-17-musl-pthread.patch |
| 118 |
- |
| 119 |
- eautoreconf |
| 120 |
- |
| 121 |
+ eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch |
| 122 |
+ eapply "${FILESDIR}"/${PN}-18-intel-missing-time_t.patch |
| 123 |
+ eapply "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch |
| 124 |
eapply_user |
| 125 |
+ eautoreconf |
| 126 |
} |
| 127 |
|
| 128 |
multilib_src_configure() { |
| 129 |
@@ -399,6 +397,7 @@ multilib_src_configure() { |
| 130 |
$(use_enable unwind libunwind) \ |
| 131 |
--enable-valgrind=$(usex valgrind auto no) \ |
| 132 |
--enable-llvm-shared-libs \ |
| 133 |
+ --disable-opencl-icd \ |
| 134 |
--with-dri-drivers=${DRI_DRIVERS} \ |
| 135 |
--with-gallium-drivers=${GALLIUM_DRIVERS} \ |
| 136 |
--with-vulkan-drivers=${VULKAN_DRIVERS} \ |
| 137 |
@@ -409,37 +408,14 @@ multilib_src_configure() { |
| 138 |
multilib_src_install() { |
| 139 |
emake install DESTDIR="${D}" |
| 140 |
|
| 141 |
- if use classic || use gallium; then |
| 142 |
- ebegin "Moving DRI/Gallium drivers for dynamic switching" |
| 143 |
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) |
| 144 |
- keepdir /usr/$(get_libdir)/dri |
| 145 |
- dodir /usr/$(get_libdir)/mesa |
| 146 |
- for x in ${gallium_drivers[@]}; do |
| 147 |
- if [ -f "$(get_libdir)/gallium/${x}" ]; then |
| 148 |
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ |
| 149 |
- || die "Failed to move ${x}" |
| 150 |
- fi |
| 151 |
- done |
| 152 |
- if use classic; then |
| 153 |
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install |
| 154 |
- fi |
| 155 |
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do |
| 156 |
- if [ -f ${x} -o -L ${x} ]; then |
| 157 |
- mv -f "${x}" "${x/dri/mesa}" \ |
| 158 |
- || die "Failed to move ${x}" |
| 159 |
- fi |
| 160 |
- done |
| 161 |
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" |
| 162 |
- ln -s ../mesa/*.so . || die "Creating symlink failed" |
| 163 |
- # remove symlinks to drivers known to eselect |
| 164 |
- for x in ${gallium_drivers[@]}; do |
| 165 |
- if [ -f ${x} -o -L ${x} ]; then |
| 166 |
- rm "${x}" || die "Failed to remove ${x}" |
| 167 |
- fi |
| 168 |
- done |
| 169 |
- popd |
| 170 |
- eend $? |
| 171 |
+ if use wayland; then |
| 172 |
+ # These files are now provided by >=dev-libs/wayland-1.15.0 |
| 173 |
+ rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die |
| 174 |
+ rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die |
| 175 |
+ rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die |
| 176 |
+ rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die |
| 177 |
fi |
| 178 |
+ |
| 179 |
if use opencl; then |
| 180 |
ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" |
| 181 |
local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" |
| 182 |
@@ -469,10 +445,6 @@ multilib_src_install_all() { |
| 183 |
if use !bindist; then |
| 184 |
dodoc docs/patents.txt |
| 185 |
fi |
| 186 |
- |
| 187 |
- # Install config file for eselect mesa |
| 188 |
- insinto /usr/share/mesa |
| 189 |
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf |
| 190 |
} |
| 191 |
|
| 192 |
multilib_src_test() { |
| 193 |
@@ -491,11 +463,6 @@ pkg_postinst() { |
| 194 |
echo |
| 195 |
eselect opengl set --use-old ${OPENGL_DIR} |
| 196 |
|
| 197 |
- # Select classic/gallium drivers |
| 198 |
- if use classic || use gallium; then |
| 199 |
- eselect mesa set --auto |
| 200 |
- fi |
| 201 |
- |
| 202 |
# Switch to mesa opencl |
| 203 |
if use opencl; then |
| 204 |
eselect opencl set --use-old ${PN} |
Archives