commit: 173decc405f9028ddab52ec3a6fd8fa21e0a51ae Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Mon Dec 7 14:38:38 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Dec 7 14:38:38 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=173decc4
x11-libs/libdrm: backport fix. Package-Manager: portage-2.2.20.1 RepoMan-Options: --force x11-libs/libdrm/Manifest | 4 ++ .../libdrm/files/libdrm-2.4.65-add-limits_h.patch | 26 +++++++++ x11-libs/libdrm/libdrm-2.4.65-r99.ebuild | 64 ++++++++++++++++++++++ x11-libs/libdrm/metadata.xml | 9 +++ 4 files changed, 103 insertions(+) diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest new file mode 100644 index 0000000..29cea56 --- /dev/null +++ b/x11-libs/libdrm/Manifest @@ -0,0 +1,4 @@ +AUX libdrm-2.4.65-add-limits_h.patch 716 SHA256 f3a9f8fee736d7981df9f887b37ff03c5f1b9397950c337e899623d7fa7c0dfc SHA512 07710c258c2b665c1a6c8d6cbd4bca1f0c9976f1065d55ba7e31be4c2dd961d88c8d12e0fb4a80d4cd2db8d7d6f98b16977b27e4657b49041df9141de15d9031 WHIRLPOOL 12b7f1ac5afe7b4aee1951627bbeb3bba76fe01bd8dca336736ba0ddf4fb5835b26fd056d8741761c4279fd37d6e171376843acb99d511ac56ec27b769069116 +DIST libdrm-2.4.65.tar.bz2 645877 SHA256 71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4 SHA512 fabbb3ba163aa1307288472c11c6ce8f1e412cbd67ba3135a614f0e05bf4f881bf6ccc581e9cf05a7e2e965817bb71c0b5335263b5c0b0cb85829a0f29a6029d WHIRLPOOL b00d7aed0437ee0f64f60ed59becf41d165c101725cab700345203b2108a2adc9ed95d17acc0dff5706df86c87c13d058991417f42db40dfc523279cc5eb8547 +EBUILD libdrm-2.4.65-r99.ebuild 1860 SHA256 fafdb6f95fa8dbd183acf65db3152b635484b1a667d4cb3713ed424a26dc0f67 SHA512 5dc3856d63d7705e63d3a7377de4ed425cba8c9a96a397c9940a196580a80edad4a05cacd47e50bd2640004b8c8482343a9c0aca821f3028b97fd6913318889b WHIRLPOOL 43b98db86977ad8e79f6667cc91af59f3b057c3c5975cc05b7892fd346c98f72b13758066109002472755669c31c681ddd33411333c7d368bf3cb1796c60cad0 +MISC metadata.xml 334 SHA256 9d19c1397f594181749abef539a5ddd1d39fd5b9565a95de5788bc85231b68b2 SHA512 051cb32876b20b1c6d4dbe62dc3b1dabd268a6a26abb1e7b1d72d6fc7e2cb6c25751b1f56833d1c4f0773a563ce59a2cfb32bdfba6aaf75a019ad08a5c041601 WHIRLPOOL 7d9d0977b53fd1c058e9a2ebbed487528c40489b86eab6917ae06cd0c4ed64d14d9964d1ad93d73911e58b31c8a149a2c1c984b1b31012762de9319b6e793c46 diff --git a/x11-libs/libdrm/files/libdrm-2.4.65-add-limits_h.patch b/x11-libs/libdrm/files/libdrm-2.4.65-add-limits_h.patch new file mode 100644 index 0000000..f6821a5 --- /dev/null +++ b/x11-libs/libdrm/files/libdrm-2.4.65-add-limits_h.patch @@ -0,0 +1,26 @@ +From 4031dc17bb728850c9b079c8d5f9cc0a379b9d46 Mon Sep 17 00:00:00 2001 +From: Felix Janda <[email protected]> +Date: Sat, 26 Sep 2015 08:08:43 +0200 +Subject: xf86drm: include <limits.h> for PATH_MAX + +fixes compilation error with musl libc and Solaris based platforms. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92082 +Signed-off-by: Felix Janda <[email protected]> +Reviewed-by: Emil Velikov <[email protected]> + +diff --git a/xf86drm.c b/xf86drm.c +index a9f5c29..c1cab1b 100644 +--- a/xf86drm.c ++++ b/xf86drm.c +@@ -45,6 +45,7 @@ + #include <stddef.h> + #include <fcntl.h> + #include <errno.h> ++#include <limits.h> + #include <signal.h> + #include <time.h> + #include <sys/types.h> +-- +cgit v0.10.2 + diff --git a/x11-libs/libdrm/libdrm-2.4.65-r99.ebuild b/x11-libs/libdrm/libdrm-2.4.65-r99.ebuild new file mode 100644 index 0000000..33ccd34 --- /dev/null +++ b/x11-libs/libdrm/libdrm-2.4.65-r99.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +XORG_MULTILIB=yes +inherit xorg-2 + +DESCRIPTION="X.Org libdrm library" +HOMEPAGE="http://dri.freedesktop.org/"; +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" +else + SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"; +fi + +KEYWORDS="amd64 arm ~mips ppc x86" +VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra 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 + +RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}] + video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] ) + abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind )" + +src_prepare() { + if [[ ${PV} = 9999* ]]; then + # tests are restricted, no point in building them + sed -ie 's/tests //' "${S}"/Makefile.am + fi + + epatch "${FILESDIR}"/${P}-add-limits_h.patch + + xorg-2_src_prepare +} + +src_configure() { + XORG_CONFIGURE_OPTIONS=( + # Udev is only used by tests now. + --disable-udev + --disable-cairo-tests + $(use_enable video_cards_amdgpu amdgpu) + $(use_enable video_cards_exynos exynos-experimental-api) + $(use_enable video_cards_freedreno freedreno) + $(use_enable video_cards_intel intel) + $(use_enable video_cards_nouveau nouveau) + $(use_enable video_cards_omap omap-experimental-api) + $(use_enable video_cards_radeon radeon) + $(use_enable video_cards_tegra tegra-experimental-api) + $(use_enable video_cards_vmware vmwgfx) + $(use_enable libkms) + # valgrind installs its .pc file to the pkgconfig for the primary arch + --enable-valgrind=$(usex valgrind auto no) + ) + + xorg-2_src_configure +} diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml new file mode 100644 index 0000000..92b2156 --- /dev/null +++ b/x11-libs/libdrm/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> +<herd>x11</herd> +<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>
