commit: 5df32021810cf62e21ab536f2c4dcfe196bd3c84 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Sep 3 01:51:28 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Sep 3 01:55:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df32021
x11-libs/libdrm: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/libdrm/Manifest | 2 - .../files/libdrm-2.4.120-backport-pr353.patch | 62 ---------------- x11-libs/libdrm/libdrm-2.4.120.ebuild | 83 ---------------------- x11-libs/libdrm/libdrm-2.4.121.ebuild | 81 --------------------- 4 files changed, 228 deletions(-) diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index 64ee45a21490..9d7aeb84cb5e 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -1,4 +1,2 @@ -DIST libdrm-2.4.120.tar.xz 479564 BLAKE2B 218d674da334c32aae27a31c10992cb276b08543704c875c7d7bf8f3dd348d1cf1c95f35b0afc8f3034d83152c2df460f84807388a21b241792db3e81c98dbfc SHA512 6dc16e5134a669eeb59debb1dc2d15b857483ab7476dc2b94bd05a32d8953f046f5656f6cf9e1a63e97e7156fb65ebb58b6a29fe45cb6326058baaf820626e70 -DIST libdrm-2.4.121.tar.xz 480840 BLAKE2B 23b8c68e12e5d3ed34dcf9577ef934e7990526018f76933a35434c7ea69ba081850e2d4e00e783880bcfe570d62910161364515ce8fde715743abbcb39d3ffb4 SHA512 cc8816d61884caa0e404348d1caeb0b2952fb50e1dc401716adfe08121096e2a67826db0bda0d8b163d67c5ee048870177670d5eac28a5abe5792d09ba77ab2e DIST libdrm-2.4.122.tar.xz 481012 BLAKE2B ca6aaf0fe55dfcfe33a0d39a7b3ea07aa4cbe772294ec7f419a4edbb40cbce14c399e180e35dd781ef225a16daae8f40d4893599eb018b68cc78e4e981f2e6e2 SHA512 ea6bac94416d4ba0e9805e142ae62904236bc49f803d4fc10c92968a4df64c818dd42524ad7a4e988062836783a148e27094050bb2754f751a368627f794ad13 DIST libdrm-2.4.123.tar.xz 481112 BLAKE2B 5a621682ef32bb9b9b69b153a36db4b85df54595ade9910091ff62a477ea30fc9e7f22ab5d9b8c8a5f9f1cf428cb400b5e62f3cf811227666de718ddd8cdcc34 SHA512 d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d diff --git a/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch b/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch deleted file mode 100644 index 1d01db322a8c..000000000000 --- a/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch +++ /dev/null @@ -1,62 +0,0 @@ -https://bugs.gentoo.org/927204 -https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/353 - -From 525e80447fee011734af464b3b5d478b2b7b17af Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Fri, 22 Mar 2024 11:20:17 -0400 -Subject: [PATCH 1/2] symbols-check: Add _GLOBAL_OFFSET_TABLE_ - -This is exported on hppa/parisc. - -See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26978 - -Bug: https://bugs.gentoo.org/927204 ---- - symbols-check.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/symbols-check.py b/symbols-check.py -index 2e7ba68d1..47bc3bead 100644 ---- a/symbols-check.py -+++ b/symbols-check.py -@@ -7,6 +7,7 @@ import subprocess - - # This list contains symbols that _might_ be exported for some platforms - PLATFORM_SYMBOLS = [ -+ '_GLOBAL_OFFSET_TABLE_', - '__bss_end__', - '__bss_start__', - '__bss_start', --- -GitLab - - -From c45ffb1edf19faff79238934abe01fd92e9e3d0a Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Fri, 22 Mar 2024 11:21:39 -0400 -Subject: [PATCH 2/2] symbols-check: Add _fbss, _fdata, _ftext - -These are exported on mips/mips64. - -See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11955 ---- - symbols-check.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/symbols-check.py b/symbols-check.py -index 47bc3bead..c63c0d112 100644 ---- a/symbols-check.py -+++ b/symbols-check.py -@@ -17,6 +17,9 @@ PLATFORM_SYMBOLS = [ - '_end', - '_fini', - '_init', -+ '_fbss', -+ '_fdata', -+ '_ftext', - ] - - --- -GitLab - diff --git a/x11-libs/libdrm/libdrm-2.4.120.ebuild b/x11-libs/libdrm/libdrm-2.4.120.ebuild deleted file mode 100644 index 009f5144834f..000000000000 --- a/x11-libs/libdrm/libdrm-2.4.120.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"; -PYTHON_COMPAT=( python3_{10..12} ) - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} python-any-r1 meson-multilib - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"; -if [[ ${PV} != 9999* ]]; then - SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -LICENSE="MIT" -SLOT="0" -IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - valgrind? ( dev-debug/valgrind )" -RDEPEND="${COMMON_DEPEND} - video_cards_amdgpu? ( - tools? ( >=dev-util/cunit-2.1 ) - test? ( >=dev-util/cunit-2.1 ) - ) - udev? ( virtual/udev )" -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')" - -PATCHES=( "${FILESDIR}/${PN}-2.4.120-backport-pr353.patch" ) - -python_check_deps() { - python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ - symbols-check.py || die # bug #925550 -} - -multilib_src_configure() { - local emesonargs=( - $(meson_use udev) - -Dcairo-tests=disabled - $(meson_feature video_cards_amdgpu amdgpu) - $(meson_feature video_cards_exynos exynos) - $(meson_feature video_cards_freedreno freedreno) - $(meson_feature video_cards_intel intel) - $(meson_feature video_cards_nouveau nouveau) - $(meson_feature video_cards_omap omap) - $(meson_feature video_cards_radeon radeon) - $(meson_feature video_cards_tegra tegra) - $(meson_feature video_cards_vc4 vc4) - $(meson_feature video_cards_vivante etnaviv) - $(meson_feature video_cards_vmware vmwgfx) - # valgrind installs its .pc file to the pkgconfig for the primary arch - -Dvalgrind=$(usex valgrind auto disabled) - $(meson_native_use_bool tools install-test-programs) - ) - - if use test || { multilib_is_native_abi && use tools; }; then - emesonargs+=( -Dtests=true ) - else - emesonargs+=( -Dtests=false ) - fi - meson_src_configure -} diff --git a/x11-libs/libdrm/libdrm-2.4.121.ebuild b/x11-libs/libdrm/libdrm-2.4.121.ebuild deleted file mode 100644 index 75538252e16f..000000000000 --- a/x11-libs/libdrm/libdrm-2.4.121.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"; -PYTHON_COMPAT=( python3_{10..13} ) - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} python-any-r1 meson-multilib - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"; -if [[ ${PV} != 9999* ]]; then - SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -LICENSE="MIT" -SLOT="0" -IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - valgrind? ( dev-debug/valgrind )" -RDEPEND="${COMMON_DEPEND} - video_cards_amdgpu? ( - tools? ( >=dev-util/cunit-2.1 ) - test? ( >=dev-util/cunit-2.1 ) - ) - udev? ( virtual/udev )" -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')" - -python_check_deps() { - python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ - symbols-check.py || die # bug #925550 -} - -multilib_src_configure() { - local emesonargs=( - $(meson_use udev) - -Dcairo-tests=disabled - $(meson_feature video_cards_amdgpu amdgpu) - $(meson_feature video_cards_exynos exynos) - $(meson_feature video_cards_freedreno freedreno) - $(meson_feature video_cards_intel intel) - $(meson_feature video_cards_nouveau nouveau) - $(meson_feature video_cards_omap omap) - $(meson_feature video_cards_radeon radeon) - $(meson_feature video_cards_tegra tegra) - $(meson_feature video_cards_vc4 vc4) - $(meson_feature video_cards_vivante etnaviv) - $(meson_feature video_cards_vmware vmwgfx) - # valgrind installs its .pc file to the pkgconfig for the primary arch - -Dvalgrind=$(usex valgrind auto disabled) - $(meson_native_use_bool tools install-test-programs) - ) - - if use test || { multilib_is_native_abi && use tools; }; then - emesonargs+=( -Dtests=true ) - else - emesonargs+=( -Dtests=false ) - fi - meson_src_configure -}
