From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/
Date: Thu, 12 Apr 2018 16:34:43 +0000 (UTC) [thread overview]
Message-ID: <1523550840.9cc8ff34f363b6e6d4d73baacdc5d1a5ec964f1d.lluixhi@gentoo> (raw)
commit: 9cc8ff34f363b6e6d4d73baacdc5d1a5ec964f1d
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Apr 12 16:34:00 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Apr 12 16:34:00 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9cc8ff34
media-libs/mesa: version bump to 17.3.8
sync keywords in 17.1.10
media-libs/mesa/Manifest | 1 +
media-libs/mesa/mesa-17.1.10.ebuild | 2 +-
.../{mesa-17.1.10.ebuild => mesa-17.3.8.ebuild} | 160 +++++++++++++++------
3 files changed, 122 insertions(+), 41 deletions(-)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 141d9f6..eff4e8c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,4 +1,5 @@
DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01
DIST mesa-17.3.7.tar.xz 10654684 BLAKE2B 520b045f7ab4b60ab372960ca933e60229dc38075d28c9e0f144d0a2dc222d6c2830e4739962008319bed27fe9a83bae7c38609d0135c3d5918d35dff6c0381d SHA512 ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e
+DIST mesa-17.3.8.tar.xz 10660896 BLAKE2B 432deefad4b0a42914efc24c558d5c766443f55ff8324317980a4f91a5e560207c3c142d9547868c6cd480ad751c2b11a76da06dea891a044016868b3dcdaaa2 SHA512 4a63b760d5c64425e2d4dddf6ab8167c1845020f173bd56ec1d2e483e3bf2afb9ca483fcf329d37cc0bce82ab5134ee43ea82a2e3a4ee9463de16a9f75bc6e16
DIST mesa-18.0.0.tar.xz 11056544 BLAKE2B 467c100bcbc0a60e3868e718331192255fd16394c21b08c128a054e066740cd071e0b272aba011873fe239821f53442e9a07ae860d94b425275bd68c3db3b7fc SHA512 1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396
diff --git a/media-libs/mesa/mesa-17.1.10.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild
index 716ac98..6f2392a 100644
--- a/media-libs/mesa/mesa-17.1.10.ebuild
+++ b/media-libs/mesa/mesa-17.1.10.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
SRC_URI=""
else
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="amd64 arm ia64 ~mips ppc ~sh sparc x86"
+ KEYWORDS="arm"
fi
LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-17.1.10.ebuild b/media-libs/mesa/mesa-17.3.8.ebuild
similarity index 78%
copy from media-libs/mesa/mesa-17.1.10.ebuild
copy to media-libs/mesa/mesa-17.3.8.ebuild
index 716ac98..8afd5d3 100644
--- a/media-libs/mesa/mesa-17.1.10.ebuild
+++ b/media-libs/mesa/mesa-17.3.8.ebuild
@@ -19,22 +19,21 @@ OPENGL_DIR="xorg-x11"
MY_P="${P/_/-}"
DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
if [[ $PV == 9999 ]]; then
SRC_URI=""
else
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="amd64 arm ia64 ~mips ppc ~sh sparc x86"
+ KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
fi
LICENSE="MIT"
SLOT="0"
RESTRICT="!bindist? ( bindist )"
-INTEL_CARDS="i915 i965 intel"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
@@ -54,14 +53,14 @@ REQUIRED_USE="
vaapi? ( gallium )
vdpau? ( gallium )
vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
- video_cards_radeonsi? ( llvm ) )
+ video_cards_radeonsi? ( llvm ) )
wayland? ( egl gbm )
xa? ( gallium )
video_cards_freedreno? ( gallium )
video_cards_intel? ( classic )
video_cards_i915? ( || ( classic gallium ) )
video_cards_i965? ( classic )
- video_cards_imx? ( gallium )
+ video_cards_imx? ( gallium video_cards_vivante )
video_cards_nouveau? ( || ( classic gallium ) )
video_cards_radeon? ( || ( classic gallium )
gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
@@ -71,11 +70,12 @@ REQUIRED_USE="
video_cards_r600? ( gallium )
video_cards_radeonsi? ( gallium llvm )
video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
video_cards_vivante? ( gallium gbm )
video_cards_vmware? ( gallium )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
RDEPEND="
@@ -98,7 +98,6 @@ RDEPEND="
llvm? (
video_cards_radeonsi? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
- vulkan? ( >=sys-devel/llvm-3.9.0:0=[${MULTILIB_USEDEP}] )
)
video_cards_r600? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
@@ -106,7 +105,6 @@ RDEPEND="
video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
)
- >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
)
opencl? (
app-eselect/eselect-opencl
@@ -122,16 +120,18 @@ RDEPEND="
video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
)
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
for card in ${RADEON_CARDS}; do
RDEPEND="${RDEPEND}
video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
@@ -141,20 +141,84 @@ RDEPEND="${RDEPEND}
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
"
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="5"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:5[${MULTILIB_USEDEP}]
+ sys-devel/llvm:4[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+ )
+ <sys-devel/llvm-6:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
llvm? (
- video_cards_radeonsi? ( || (
- sys-devel/llvm:0[llvm_targets_AMDGPU]
- sys-devel/llvm:0[video_cards_radeon]
- ) )
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
opencl? (
- >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.6.0:0=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
+ >=sys-devel/gcc-4.6
)
sys-devel/gettext
virtual/pkgconfig
@@ -168,6 +232,9 @@ DEPEND="${RDEPEND}
>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+ vulkan? (
+ $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+ )
"
[[ ${PV} == 9999 ]] && DEPEND+="
sys-devel/bison
@@ -189,22 +256,38 @@ x86? (
)
)"
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm[${flags}]"
+}
+
pkg_setup() {
# warning message for bug 459306
- if use llvm && has_version "sys-devel/llvm:0[!debug=]"; then
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
ewarn "detected! This can cause problems. For details, see bug 459306."
fi
- if use llvm || use opencl; then
+ if use llvm; then
llvm_pkg_setup
fi
python-any-r1_pkg_setup
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-11-execinfo.patch
- eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
+ eapply "${FILESDIR}"/${PN}-17-musl_endian.patch
+ eapply "${FILESDIR}"/${PN}-17-execinfo.patch
+ eapply "${FILESDIR}"/${PN}-17-musl-string_h.patch
+ eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch
+ eapply "${FILESDIR}"/${PN}-17-musl-pthread.patch
eautoreconf
@@ -239,14 +322,14 @@ multilib_src_configure() {
fi
if use egl; then
- myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+ myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
fi
if use gallium; then
myconf+="
$(use_enable d3d9 nine)
$(use_enable llvm)
- $(use_enable openmax omx)
+ $(use_enable openmax omx-bellagio)
$(use_enable vaapi va)
$(use_enable vdpau)
$(use_enable xa)
@@ -282,6 +365,8 @@ multilib_src_configure() {
--with-clang-libdir="${EPREFIX}/usr/lib"
"
fi
+
+ gallium_enable video_cards_virgl virgl
fi
if use vulkan; then
@@ -439,13 +524,8 @@ pkg_postinst() {
# warn about patent encumbered texture-float
if use !bindist; then
elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
+ elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+ elog "explanation."
fi
}
next reply other threads:[~2018-04-12 16:34 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-12 16:34 Aric Belsito [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-10 19:52 [gentoo-commits] proj/musl:master commit in: media-libs/mesa/ Jory Pratt
2022-02-09 1:14 Jory Pratt
2022-01-05 22:38 Jory Pratt
2021-12-19 14:11 Jory Pratt
2021-11-25 14:49 Jory Pratt
2021-08-16 18:27 Jory Pratt
2021-07-06 13:17 Jory Pratt
2021-04-01 13:03 Jory Pratt
2021-03-10 3:14 Jory Pratt
2021-02-01 19:54 Jory Pratt
2020-12-07 13:39 Jory Pratt
2020-12-03 16:34 Jory Pratt
2020-11-08 0:02 Jory Pratt
2020-09-28 22:56 Jory Pratt
2020-06-14 23:35 Jory Pratt
2020-04-04 3:02 Jory Pratt
2020-04-02 13:46 Jory Pratt
2020-03-21 3:09 Jory Pratt
2020-03-17 14:32 Jory Pratt
2020-03-07 17:37 Jory Pratt
2020-02-21 1:02 Jory Pratt
2020-02-14 14:02 Jory Pratt
2020-01-29 15:16 Jory Pratt
2020-01-12 0:23 Jory Pratt
2020-01-08 3:12 Jory Pratt
2019-12-21 21:50 Jory Pratt
2019-12-20 19:01 Jory Pratt
2019-12-14 21:32 Jory Pratt
2019-12-05 16:52 Jory Pratt
2019-11-29 17:09 Jory Pratt
2019-11-23 0:20 Jory Pratt
2019-11-13 22:40 Jory Pratt
2019-10-10 14:39 Jory Pratt
2019-09-26 2:53 Jory Pratt
2019-09-23 5:08 Jory Pratt
2019-09-13 12:37 Jory Pratt
2019-09-13 3:43 Jory Pratt
2019-09-09 14:13 Jory Pratt
2019-08-23 21:50 Jory Pratt
2019-08-22 3:05 Jory Pratt
2019-08-11 21:22 Jory Pratt
2019-07-25 0:34 Jory Pratt
2019-07-09 20:24 Jory Pratt
2019-06-29 7:49 Jory Pratt
2019-06-26 4:52 Jory Pratt
2019-06-11 21:13 Jory Pratt
2019-06-06 1:22 Jory Pratt
2019-05-30 5:55 Jory Pratt
2019-05-22 23:45 Jory Pratt
2019-05-20 21:04 Jory Pratt
2019-05-08 5:13 Jory Pratt
2019-05-08 3:26 Jory Pratt
2019-04-25 4:09 Jory Pratt
2019-04-17 1:24 Anthony G. Basile
2019-04-17 1:13 Anthony G. Basile
2019-04-11 16:55 Jory Pratt
2019-04-05 16:03 Jory Pratt
2019-03-27 21:34 Jory Pratt
2018-12-03 5:08 Anthony G. Basile
2018-10-31 12:26 Anthony G. Basile
2018-10-04 21:25 Anthony G. Basile
2018-10-04 21:21 Anthony G. Basile
2018-08-22 1:25 Anthony G. Basile
2018-08-19 17:46 Anthony G. Basile
2018-08-19 17:41 Anthony G. Basile
2018-08-19 17:20 Anthony G. Basile
2018-07-04 23:31 Jory Pratt
2018-06-05 4:43 Aric Belsito
2018-06-02 1:18 Aric Belsito
2018-05-21 16:23 Aric Belsito
2018-05-15 20:17 Jory Pratt
2018-05-08 18:01 Jory Pratt
2018-05-07 19:21 Aric Belsito
2018-04-29 17:19 Aric Belsito
2018-04-22 17:46 Anthony G. Basile
2018-04-21 19:42 Aric Belsito
2018-04-21 19:26 Aric Belsito
2018-03-28 16:07 Aric Belsito
2018-03-28 15:59 Aric Belsito
2018-03-22 3:24 Aric Belsito
2018-03-04 17:23 Anthony G. Basile
2018-03-04 16:57 Anthony G. Basile
2018-02-09 4:34 Aric Belsito
2018-01-29 19:54 Aric Belsito
2018-01-25 20:03 Aric Belsito
2018-01-24 21:14 Aric Belsito
2018-01-24 21:11 Aric Belsito
2018-01-22 23:15 Jory Pratt
2017-12-31 16:52 Anthony G. Basile
2017-12-29 21:42 Aric Belsito
2017-11-24 18:56 Aric Belsito
2017-11-22 4:57 Aric Belsito
2017-11-14 21:29 Aric Belsito
2017-11-08 3:25 Aric Belsito
2017-10-31 17:04 Aric Belsito
2017-10-20 4:23 Aric Belsito
2017-10-02 17:04 Aric Belsito
2017-09-18 1:00 Aric Belsito
2017-09-05 18:48 Aric Belsito
2017-09-05 13:39 Anthony G. Basile
2017-08-31 20:10 Jory Pratt
2017-08-22 15:24 Aric Belsito
2017-08-13 17:33 Jory Pratt
2017-08-08 20:09 Aric Belsito
2017-07-15 1:01 Aric Belsito
2017-06-30 20:45 Aric Belsito
2017-06-21 16:37 Aric Belsito
2017-06-21 16:18 Aric Belsito
2017-06-11 1:26 Aric Belsito
2017-05-30 20:06 Aric Belsito
2017-05-16 0:36 Aric Belsito
2017-05-08 20:55 Aric Belsito
2017-04-30 2:14 Aric Belsito
2017-04-17 16:12 Aric Belsito
2017-04-03 1:52 Aric Belsito
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1523550840.9cc8ff34f363b6e6d4d73baacdc5d1a5ec964f1d.lluixhi@gentoo \
--to=lluixhi@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox