commit: c095ceb4a680eba6a24e35f2c49477182defdfa6 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Sat Aug 1 16:58:30 2020 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Sat Aug 1 16:58:30 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c095ceb4
x11-libs/libdrm: Update ioctl patch Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> x11-libs/libdrm/Manifest | 2 +- x11-libs/libdrm/files/fix-ioctl-102.patch | 28 ++++++++++++++++++++++ ...libdrm-2.4.100.ebuild => libdrm-2.4.102.ebuild} | 16 +++++-------- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index 9372b6a..7f4c41c 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -1,3 +1,3 @@ -DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 +DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b DIST libdrm-2.4.97.tar.bz2 837329 BLAKE2B b47393d81917a0b43c22f7798ff2e1c21a05fc716a63092dbe0e49cda0fe3bd899d5cc4d703ae49f781e283f5067c62cd37a4931362427e21c3356584cb5e810 SHA512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed diff --git a/x11-libs/libdrm/files/fix-ioctl-102.patch b/x11-libs/libdrm/files/fix-ioctl-102.patch new file mode 100644 index 0000000..50c475e --- /dev/null +++ b/x11-libs/libdrm/files/fix-ioctl-102.patch @@ -0,0 +1,28 @@ +From 6e24b7d1693f78ae83dc47f0ef7c0da3dfb2d590 Mon Sep 17 00:00:00 2001 +From: +Date: Sat, 1 Aug 2020 11:50:44 -0500 +Subject: [PATCH] Fix ioctl.h being redefined on musl + +--- + tests/nouveau/threaded.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c +index ddbac74..d30ebaa 100644 +--- a/tests/nouveau/threaded.c ++++ b/tests/nouveau/threaded.c +@@ -20,7 +20,10 @@ + * OTHER DEALINGS IN THE SOFTWARE. + */ + +-#include <sys/ioctl.h> ++// Use glibc's function prototype for ioctl() ++#include <bits/ioctl.h> ++int ioctl (int, unsigned long, ...); ++ + #include <dlfcn.h> + #include <fcntl.h> + #include <stdio.h> +-- +2.26.2 + diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild similarity index 83% rename from x11-libs/libdrm/libdrm-2.4.100.ebuild rename to x11-libs/libdrm/libdrm-2.4.102.ebuild index 46ceb5b..20747b9 100644 --- a/x11-libs/libdrm/libdrm-2.4.100.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.102.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="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" + SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"; + KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" @@ -30,16 +30,12 @@ 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 )" -PATCHES=( "${FILESDIR}"/fix-ioctl.patch ) -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} +PATCHES=( "${FILESDIR}"/fix-ioctl-102.patch ) multilib_src_configure() { local emesonargs=(
