aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2021-03-11 10:40:25 -0600
committerJory Pratt <anarchy@gentoo.org>2021-03-11 10:40:25 -0600
commit22a304833455fecf8398d8ce431f19a97169b2ba (patch)
tree4f70d4353f758bc0f4935114ed8c58bd62675368 /x11-libs
parentnet-misc/networkmanager: sync with ::gentoo, adjust patches (diff)
downloadmusl-22a304833455fecf8398d8ce431f19a97169b2ba.tar.gz
musl-22a304833455fecf8398d8ce431f19a97169b2ba.tar.bz2
musl-22a304833455fecf8398d8ce431f19a97169b2ba.zip
x11-libs: remove libdrm, use what is provided in ::gentoo
Closes: https://github.com/gentoo/musl/pull/382 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Jory Pratt <anarchy@gentoo.org>
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libdrm/Manifest2
-rw-r--r--x11-libs/libdrm/files/fix-ioctl.patch15
-rw-r--r--x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch26
-rw-r--r--x11-libs/libdrm/libdrm-2.4.102.ebuild73
-rw-r--r--x11-libs/libdrm/libdrm-2.4.103.ebuild73
-rw-r--r--x11-libs/libdrm/metadata.xml12
6 files changed, 0 insertions, 201 deletions
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
deleted file mode 100644
index f01e85d..0000000
--- a/x11-libs/libdrm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
-DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
diff --git a/x11-libs/libdrm/files/fix-ioctl.patch b/x11-libs/libdrm/files/fix-ioctl.patch
deleted file mode 100644
index 3cf390b..0000000
--- a/x11-libs/libdrm/files/fix-ioctl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur libdrm-2.4.91.orig/tests/nouveau/threaded.c libdrm-2.4.91/tests/nouveau/threaded.c
---- libdrm-2.4.91.orig/tests/nouveau/threaded.c 2018-03-05 21:06:45.000000000 +0000
-+++ libdrm-2.4.91/tests/nouveau/threaded.c 2018-05-07 19:25:46.371706548 +0000
-@@ -24,7 +24,10 @@
- # include "config.h"
- #endif
-
--#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>
diff --git a/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch b/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch
deleted file mode 100644
index 1895489..0000000
--- a/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dc34852ecca82a19694178e8d346bf1f413a6e1e Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Sat, 1 Aug 2020 18:26:33 -0500
-Subject: [PATCH] don't build noveau tests
-
----
- tests/meson.build | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 196edbf..651826b 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -44,9 +44,6 @@ endif
- if with_etnaviv
- subdir('etnaviv')
- endif
--if with_nouveau
-- subdir('nouveau')
--endif
-
- drmsl = executable(
- 'drmsl',
---
-2.26.2
-
diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild
deleted file mode 100644
index d40daba..0000000
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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="amd64 arm arm64 ~mips ppc x86"
-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 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4.102-disable-noveau-tests.patch )
-
-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-2.4.103.ebuild b/x11-libs/libdrm/libdrm-2.4.103.ebuild
deleted file mode 100644
index b8e57bd..0000000
--- a/x11-libs/libdrm/libdrm-2.4.103.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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="amd64 ~arm arm64 ~mips ~ppc ~x86"
-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 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4.102-disable-noveau-tests.patch )
-
-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/metadata.xml b/x11-libs/libdrm/metadata.xml
deleted file mode 100644
index 25fe9f8..0000000
--- a/x11-libs/libdrm/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>x11@gentoo.org</email>
-<name>X11</name>
-</maintainer>
-<use>
-<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
-<flag name="valgrind">Compile in valgrind memory hints</flag>
-</use>
-</pkgmetadata>