From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- x11-libs/libdrm/Manifest | 6 ++- x11-libs/libdrm/libdrm-2.4.100.ebuild | 2 +- x11-libs/libdrm/libdrm-2.4.101.ebuild | 71 +++++++++++++++++++++++++++++++++++ x11-libs/libdrm/libdrm-9999.ebuild | 15 +++----- 4 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 x11-libs/libdrm/libdrm-2.4.101.ebuild (limited to 'x11-libs/libdrm') diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index 2546cbe2545f..77cef689c70d 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -1,4 +1,6 @@ DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 -EBUILD libdrm-2.4.100.ebuild 2123 BLAKE2B 9aee90f7a8d0da7b135b2a6d895991d22e7f27488b1314742b545f11a373db6dc46cd9e6262a78e7c505d3c11f5bdf3b84f4d17cd42b01a3b997c2c677cd0c75 SHA512 8c7ad36e3a1aa40af4b95db26084148e39e401ef55a146174dbc302478fec93f31e7b1e91735dc79ebf7d2acc78109a445dbedae14a7c7d518d0b494ce03dab4 -EBUILD libdrm-9999.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a +DIST libdrm-2.4.101.tar.xz 408856 BLAKE2B 4b2ab7ecf6c360bbe259913943aadabacdbc4fe2eef72cddced4e2abf830e253230d28c8c2e595f93c20a48813eeeef6eb8d20250a8afe1ddce76c48bfa3988a SHA512 658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c +EBUILD libdrm-2.4.100.ebuild 2120 BLAKE2B 97b0766f1a0b6bd1b796d4049891323c7442bc2d05f3f58bfab236d335b21c76c0cf4312702e3b0d57f6de3fae681bc3eeec97ae17e80a0b6783a11c23921e1d SHA512 e136099e103664353af667600f77f2bdeb8594395cc15f27a5e06b85f18ca28962ac81e955b886e0db157e5e8caf1b59c6ffe952d2286e5d3c9131d5ea9d71a3 +EBUILD libdrm-2.4.101.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801 +EBUILD libdrm-9999.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild index aae3267d6665..83a5eaf7240b 100644 --- a/x11-libs/libdrm/libdrm-2.4.100.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.100.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then SRC_URI="" else SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" diff --git a/x11-libs/libdrm/libdrm-2.4.101.ebuild b/x11-libs/libdrm/libdrm-2.4.101.ebuild new file mode 100644 index 000000000000..46ea35c8a426 --- /dev/null +++ b/x11-libs/libdrm/libdrm-2.4.101.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} meson multilib-minimal + +DESCRIPTION="X.Org libdrm library" +HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 + +IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" +RESTRICT="test" # see bug #236845 +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind )" + +multilib_src_configure() { + local emesonargs=( + # Udev is only used by tests now. + -Dudev=false + -Dcairo-tests=false + -Damdgpu=$(usex video_cards_amdgpu true false) + -Dexynos=$(usex video_cards_exynos true false) + -Dfreedreno=$(usex video_cards_freedreno true false) + -Dintel=$(usex video_cards_intel true false) + -Dnouveau=$(usex video_cards_nouveau true false) + -Domap=$(usex video_cards_omap true false) + -Dradeon=$(usex video_cards_radeon true false) + -Dtegra=$(usex video_cards_tegra true false) + -Dvc4=$(usex video_cards_vc4 true false) + -Detnaviv=$(usex video_cards_vivante true false) + -Dvmwgfx=$(usex video_cards_vmware true false) + -Dlibkms=$(usex libkms true false) + # valgrind installs its .pc file to the pkgconfig for the primary arch + -Dvalgrind=$(usex valgrind auto false) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild index 7178075e7431..46ea35c8a426 100644 --- a/x11-libs/libdrm/libdrm-9999.ebuild +++ b/x11-libs/libdrm/libdrm-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" @@ -16,8 +16,8 @@ HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" @@ -30,16 +30,11 @@ RESTRICT="test" # see bug #236845 LICENSE="MIT" SLOT="0" -RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] ) +RDEPEND=" video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind )" -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - multilib_src_configure() { local emesonargs=( # Udev is only used by tests now. -- cgit v1.2.3