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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9503158094 for ; Fri, 24 Jun 2022 16:26:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F402E07A9; Fri, 24 Jun 2022 16:26:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06A71E079E for ; Fri, 24 Jun 2022 16:26:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C1C43411D6 for ; Fri, 24 Jun 2022 16:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AACB448 for ; Fri, 24 Jun 2022 16:26:30 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1656087955.c5ff2b759f9d072bb1b413c6d40cc063cd6ffd86.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa-amber/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa-amber/Manifest media-libs/mesa-amber/mesa-amber-21.3.8.ebuild X-VCS-Directories: media-libs/mesa-amber/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c5ff2b759f9d072bb1b413c6d40cc063cd6ffd86 X-VCS-Branch: master Date: Fri, 24 Jun 2022 16:26: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b01bd047-f5ad-4a71-bf74-74248afec05e X-Archives-Hash: ed9d7b328cd0618f57197122bbdccdef commit: c5ff2b759f9d072bb1b413c6d40cc063cd6ffd86 Author: Matt Turner gentoo org> AuthorDate: Fri Jun 24 16:16:30 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jun 24 16:25:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ff2b75 media-libs/mesa-amber: Drop old versions Signed-off-by: Matt Turner gentoo.org> media-libs/mesa-amber/Manifest | 1 - media-libs/mesa-amber/mesa-amber-21.3.8.ebuild | 206 ------------------------- 2 files changed, 207 deletions(-) diff --git a/media-libs/mesa-amber/Manifest b/media-libs/mesa-amber/Manifest index db13cde7caff..3bedcf5babcb 100644 --- a/media-libs/mesa-amber/Manifest +++ b/media-libs/mesa-amber/Manifest @@ -1,2 +1 @@ -DIST mesa-21.3.8.tar.xz 16593540 BLAKE2B 89a471af3354ae0cf0597c1b6bcd2aff8074d58c16504154291f86cd9a9701f98883cf1077f60a8f17d24be800691a5bfb7ef4ddb10dfa355181bf87805b660c SHA512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 DIST mesa-21.3.9.tar.xz 16607716 BLAKE2B 79669f9492c505b1729c526adf5a8261737b6088bdf01db654a0dca8ba22600ec985b574edfeee3a28c76e6e0f815782362973876e1d75b58f4417f45df70add SHA512 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684 diff --git a/media-libs/mesa-amber/mesa-amber-21.3.8.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.8.ebuild deleted file mode 100644 index 260958124591..000000000000 --- a/media-libs/mesa-amber/mesa-amber-21.3.8.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit meson-multilib python-any-r1 linux-info - -MY_P="${P/-amber}" -MY_P="${MY_P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="amber" -RESTRICT="!test? ( test )" - -RADEON_CARDS="r100 r200 radeon" -VIDEO_CARDS="${RADEON_CARDS} i915 i965 intel nouveau" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - cpu_flags_x86_sse2 debug gles1 +gles2 selinux test valgrind wayland +X - +zstd" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107" -RDEPEND=" - !<=media-libs/mesa-21.3.8 - !media-libs/mesa:amber - media-libs/mesa[${MULTILIB_USEDEP}] - - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - ${LIBDRM_DEPSTRING}[video_cards_nouveau?,${MULTILIB_USEDEP}] - video_cards_intel? ( - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - X? ( - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done - -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind ) - X? ( - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-base/xorg-proto - ) -" -BDEPEND=" - ${PYTHON_DEPS} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") - wayland? ( dev-util/wayland-scanner ) -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - usr/lib/libGLX_amber.so.0.0.0 -)" - -python_check_deps() { - has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - if use video_cards_i965; then - if kernel_is -ge 5 11 3; then - CONFIG_CHECK="~KCMP" - elif kernel_is -ge 5 11; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" - elif kernel_is -ge 5 10 20; then - CONFIG_CHECK="~KCMP" - else - CONFIG_CHECK="~CHECKPOINT_RESTORE" - fi - linux-info_pkg_setup - fi - - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - - local platforms - use X && platforms+="x11" - use wayland && platforms+=",wayland" - emesonargs+=(-Dplatforms=${platforms#,}) - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - -Damber=true - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dshared-glapi=enabled - -Ddri3=enabled - -Degl=enabled - -Dgbm=enabled - $(meson_feature gles1) - $(meson_feature gles2) - -Dglvnd=true - -Dosmesa=false - -Dllvm=disabled - $(meson_use selinux) - $(meson_feature zstd) - $(meson_use cpu_flags_x86_sse2 sse2) - -Dvalgrind=$(usex valgrind auto disabled) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers='' - -Dvulkan-drivers='' - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_test() { - meson_src_test -t 100 -} - -multilib_src_install_all() { - # These are provided by media-libs/mesa:0 - local files=( - "${ED}"/usr/lib*/libgbm.so* - "${ED}"/usr/lib*/libglapi.so* - "${ED}"/usr/include - "${ED}"/usr/lib*/pkgconfig - "${ED}"/usr/share/drirc.d/00-mesa-defaults.conf - ) - rm -r "${files[@]}" || die - - # Move i915_dri.so -> i915c_dri.so to not conflict with media-libs/mesa:0. - for dridir in "${ED}"/usr/lib*/dri; do - if [[ -e ${dridir}/i915_dri.so ]]; then - mv ${dridir}/i915{,c}_dri.so || die - fi - done -} - -# $1 - VIDEO_CARDS flag (check skipped for "--") -# other args - names of DRI drivers to enable -dri_driver_enable() { - if [[ $1 == -- ]] || use $1; then - shift - DRI_DRIVERS+=("$@") - fi -}