* [gentoo-commits] proj/musl:master commit in: x11-libs/libdrm/, x11-libs/libdrm/files/
@ 2015-12-07 14:31 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2015-12-07 14:31 UTC (permalink / raw
To: gentoo-commits
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 <felix.janda@posteo.de>
+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 <felix.janda@posteo.de>
+Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+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>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/libdrm/, x11-libs/libdrm/files/
@ 2017-04-04 18:46 Aric Belsito
0 siblings, 0 replies; 5+ messages in thread
From: Aric Belsito @ 2017-04-04 18:46 UTC (permalink / raw
To: gentoo-commits
commit: f68994cf56dfeaa402e0b710e8ff4b9449a9e0e9
Author: Lucas Francesco <lucas.francesco93 at gmail dot <com>
AuthorDate: Tue Apr 4 18:40:07 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Apr 4 18:40:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f68994cf
Delete unsupported version/remove lidrm from overlay
since 12 Mar 2017 libdrm-2.4.65 got dropped and 2.4.76/2.4.75 works
like a charm, so we dont need to keep libdrm patches on the overlay
anymore.
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 | 12 ----
4 files changed, 106 deletions(-)
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
deleted file mode 100644
index cc72c04..0000000
--- a/x11-libs/libdrm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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 44c389cbf632762144e32942699b4f39bb7d2351a35380c6ace4ca088444d8e9 SHA512 97ea6944bdde30baebe0ab96cda1266f0e3622f4c192ea9bdd3f5bad002abe151b5d0c156c867cfefc7c96688438ecf66b479fdeaf9b608626747bb5c86fd0d6 WHIRLPOOL c4865a7b723aa88726b124d505e937a1bc36b269688f91f8c7bc666cbc9621a59542e4379fddcd8b2cad398d14bcfc33c07307caba484fc154cf19c4f36ce932
-MISC metadata.xml 406 SHA256 4c8d75a84f37733d8e746655b9b809083158de1db8129c2b8e0d2dc4500dbf4c SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da WHIRLPOOL 6d09e0a07a60f4a47a7d4ad57c21298f4160baf57576e9eb58ad55e039843ef32fa1ac86ac99c450529bc81339ff369357b25c93e0c4a453d765584339fe62a9
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
deleted file mode 100644
index f6821a5..0000000
--- a/x11-libs/libdrm/files/libdrm-2.4.65-add-limits_h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4031dc17bb728850c9b079c8d5f9cc0a379b9d46 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-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 <felix.janda@posteo.de>
-Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
-
-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
deleted file mode 100644
index 8247c83..0000000
--- a/x11-libs/libdrm/libdrm-2.4.65-r99.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 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
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>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/libdrm/, x11-libs/libdrm/files/
@ 2020-08-01 16:58 Jory Pratt
0 siblings, 0 replies; 5+ messages in thread
From: Jory Pratt @ 2020-08-01 16:58 UTC (permalink / raw
To: gentoo-commits
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=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/libdrm/, x11-libs/libdrm/files/
@ 2020-08-01 23:33 Jory Pratt
0 siblings, 0 replies; 5+ messages in thread
From: Jory Pratt @ 2020-08-01 23:33 UTC (permalink / raw
To: gentoo-commits
commit: c89101b74f39891972e2e8e1d2e10b622bb28237
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 23:33:53 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 23:33:53 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c89101b7
x11-libs/libdrm: disable noveua tests
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
x11-libs/libdrm/files/fix-ioctl-102.patch | 28 ----------------------
.../libdrm-2.4.102-disable-noveau-tests.patch | 26 ++++++++++++++++++++
x11-libs/libdrm/libdrm-2.4.102.ebuild | 2 +-
3 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/x11-libs/libdrm/files/fix-ioctl-102.patch b/x11-libs/libdrm/files/fix-ioctl-102.patch
deleted file mode 100644
index 50c475e..0000000
--- a/x11-libs/libdrm/files/fix-ioctl-102.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/files/libdrm-2.4.102-disable-noveau-tests.patch b/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch
new file mode 100644
index 0000000..1895489
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch
@@ -0,0 +1,26 @@
+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
index 20747b9..179bcef 100644
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.102.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )"
-PATCHES=( "${FILESDIR}"/fix-ioctl-102.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.4.102-disable-noveau-tests.patch )
multilib_src_configure() {
local emesonargs=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/libdrm/, x11-libs/libdrm/files/
@ 2021-03-11 16:40 Jory Pratt
0 siblings, 0 replies; 5+ messages in thread
From: Jory Pratt @ 2021-03-11 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 22a304833455fecf8398d8ce431f19a97169b2ba
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 16:40:25 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 16:40:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=22a30483
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 <AT> gentoo.org>
x11-libs/libdrm/Manifest | 2 -
x11-libs/libdrm/files/fix-ioctl.patch | 15 -----
.../libdrm-2.4.102-disable-noveau-tests.patch | 26 --------
x11-libs/libdrm/libdrm-2.4.102.ebuild | 73 ----------------------
x11-libs/libdrm/libdrm-2.4.103.ebuild | 73 ----------------------
x11-libs/libdrm/metadata.xml | 12 ----
6 files changed, 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>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-11 16:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-07 14:31 [gentoo-commits] proj/musl:master commit in: x11-libs/libdrm/, x11-libs/libdrm/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2017-04-04 18:46 Aric Belsito
2020-08-01 16:58 Jory Pratt
2020-08-01 23:33 Jory Pratt
2021-03-11 16:40 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox