From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13F491398ED for ; Fri, 29 Dec 2017 21:42:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F265FE0E1A; Fri, 29 Dec 2017 21:42:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEC3DE0E1A for ; Fri, 29 Dec 2017 21:42:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D752341650 for ; Fri, 29 Dec 2017 21:42:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B73F9AE8F for ; Fri, 29 Dec 2017 21:42:30 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1514583395.8d382f52e9395a5bcf93812ea80907ed076eb9b1.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/ X-VCS-Repository: proj/musl X-VCS-Files: media-libs/mesa/Manifest media-libs/mesa/mesa-17.1.10.ebuild media-libs/mesa/mesa-17.2.7.ebuild media-libs/mesa/mesa-17.3.0.ebuild media-libs/mesa/mesa-17.3.1.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 8d382f52e9395a5bcf93812ea80907ed076eb9b1 X-VCS-Branch: master Date: Fri, 29 Dec 2017 21:42:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 85a92f24-9cda-43ba-bbac-06843405ee91 X-Archives-Hash: ee135a4498068f6c84ae8da21684a29f commit: 8d382f52e9395a5bcf93812ea80907ed076eb9b1 Author: Aric Belsito gmail com> AuthorDate: Fri Dec 29 21:36:35 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Fri Dec 29 21:36:35 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8d382f52 media-libs/mesa: version bump to 17.3.1 media-libs/mesa/Manifest | 3 ++- media-libs/mesa/mesa-17.1.10.ebuild | 14 +++++------ .../{mesa-17.3.0.ebuild => mesa-17.2.7.ebuild} | 29 +++++++++++----------- .../{mesa-17.3.0.ebuild => mesa-17.3.1.ebuild} | 0 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 64ff7f6..c465862 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,3 +1,4 @@ DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b DIST mesa-17.2.6.tar.xz 10387604 BLAKE2B 43bd60f9e61bb04e3a2afe4bc6e18099a524cdec3c7948d9ccfffa5bfe50eb3e0625ba6da7bb3b32959ef4a5e3db982daf2f90d3ee555cf65084d70849b3ca12 SHA512 739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202 -DIST mesa-17.3.0.tar.xz 10667896 BLAKE2B 4786f1ac3fa2d2f07895c829f2c0770861d64f606d72635eb206cb9f0a1e84c061950fbf33b2c7b27055399da43d705ed9abd5d8f46c7bb3e3d9a6497f4bd71d SHA512 b0a616ce9a534a19c42eb0a626a178c6a7171aae1989351ea7c2a9e775a7478758b805dbfb754056720b1ef0454c3d3beb64aa59543be27f249ce97efae8e47e +DIST mesa-17.2.7.tar.xz 10353448 BLAKE2B cb116d7d7f8ace7769c348f04c0db194312553fd2b307471240dce5f971798e73c13cb7e2af6ed96a1109ea405207c3d7e8c910a1bc6197fcf37bdf4921d10b2 SHA512 f7cd06aa3ffb8ab80358304fa6a554f75c66105371072dae3a6f8f8e2a13891c8ac9eaf13c5defa74fa1236fed386ccd8c8b107e5fe80f9384237c9b1e726898 +DIST mesa-17.3.1.tar.xz 10669392 BLAKE2B 8e7a1299f79b47e9a4bc4d27123fda4e0effcb192f031c26942fd9eb056e751524c8d3f6e9f70c5871818b8c9972071e030f47ca73c112854d67695c53490597 SHA512 a2bd0123bf2df0db03197001a9e001b25f2609f3c6bf1bae66f3bc50c51d2558b5b77e232e81c1658c3a4dec88eda32a8b5a85c1fedc937a7441476228ef8238 diff --git a/media-libs/mesa/mesa-17.1.10.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild index de69592..d7e8e10 100644 --- a/media-libs/mesa/mesa-17.1.10.ebuild +++ b/media-libs/mesa/mesa-17.1.10.ebuild @@ -98,7 +98,7 @@ RDEPEND=" llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=sys-devel/llvm-3.9.0:0=[${MULTILIB_USEDEP}] ) ) video_cards_r600? ( virtual/libelf:0=[${MULTILIB_USEDEP}] @@ -106,7 +106,7 @@ RDEPEND=" video_cards_radeon? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}] ) opencl? ( app-eselect/eselect-opencl @@ -144,13 +144,13 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} llvm? ( video_cards_radeonsi? ( || ( - sys-devel/llvm[llvm_targets_AMDGPU] - sys-devel/llvm[video_cards_radeon] + sys-devel/llvm:0[llvm_targets_AMDGPU] + sys-devel/llvm:0[video_cards_radeon] ) ) ) opencl? ( - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}] + >=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/gettext @@ -188,7 +188,7 @@ x86? ( pkg_setup() { # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then + if use llvm && has_version "sys-devel/llvm:0[!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 diff --git a/media-libs/mesa/mesa-17.3.0.ebuild b/media-libs/mesa/mesa-17.2.7.ebuild similarity index 94% copy from media-libs/mesa/mesa-17.3.0.ebuild copy to media-libs/mesa/mesa-17.2.7.ebuild index 040450c..b0321f3 100644 --- a/media-libs/mesa/mesa-17.3.0.ebuild +++ b/media-libs/mesa/mesa-17.2.7.ebuild @@ -19,13 +19,13 @@ OPENGL_DIR="xorg-x11" MY_P="${P/_/-}" DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" +HOMEPAGE="https://www.mesa3d.org/" if [[ $PV == 9999 ]]; then SRC_URI="" else SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - 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" + 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" fi LICENSE="MIT" @@ -53,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_vivante ) + video_cards_imx? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) @@ -75,7 +75,7 @@ REQUIRED_USE=" video_cards_vmware? ( gallium ) " -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.85" +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82" # keep correct libdrm and dri2proto dep # keep blocks in rdepend for binpkg RDEPEND=" @@ -229,9 +229,6 @@ 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 @@ -280,11 +277,8 @@ pkg_setup() { } src_prepare() { + eapply "${FILESDIR}"/${PN}-11-execinfo.patch eapply "${FILESDIR}"/${PN}-13-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 @@ -326,7 +320,7 @@ multilib_src_configure() { myconf+=" $(use_enable d3d9 nine) $(use_enable llvm) - $(use_enable openmax omx-bellagio) + $(use_enable openmax omx) $(use_enable vaapi va) $(use_enable vdpau) $(use_enable xa) @@ -521,8 +515,13 @@ 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 /usr/share/doc/${P}/patents.txt.bz2 for an" - elog "explanation." + 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." fi } diff --git a/media-libs/mesa/mesa-17.3.0.ebuild b/media-libs/mesa/mesa-17.3.1.ebuild similarity index 100% rename from media-libs/mesa/mesa-17.3.0.ebuild rename to media-libs/mesa/mesa-17.3.1.ebuild