From 7367536b73b8a287fe7206f24493c9b50cacb463 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 19 Feb 2012 19:01:10 -0500 Subject: Remove x11-libs/libdrm Old version. Purpose of DRM patch unknown. (I assume it's for supporting DRI on the Fuloong, but I don't have hardware, and the 3D driver for SiS has been removed in Mesa-8.0.) Signed-off-by: Matt Turner --- x11-libs/libdrm/ChangeLog | 154 ---------------------------- x11-libs/libdrm/Manifest | 7 -- x11-libs/libdrm/files/libdrm-loongson.patch | 54 ---------- x11-libs/libdrm/libdrm-2.3.0.ebuild | 42 -------- x11-libs/libdrm/libdrm-2.4.4.ebuild | 42 -------- x11-libs/libdrm/metadata.xml | 5 - 6 files changed, 304 deletions(-) delete mode 100644 x11-libs/libdrm/ChangeLog delete mode 100644 x11-libs/libdrm/Manifest delete mode 100644 x11-libs/libdrm/files/libdrm-loongson.patch delete mode 100644 x11-libs/libdrm/libdrm-2.3.0.ebuild delete mode 100644 x11-libs/libdrm/libdrm-2.4.4.ebuild delete mode 100644 x11-libs/libdrm/metadata.xml diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog deleted file mode 100644 index 3b69bd9..0000000 --- a/x11-libs/libdrm/ChangeLog +++ /dev/null @@ -1,154 +0,0 @@ -# ChangeLog for x11-libs/libdrm -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.40 2007/01/06 01:03:50 kloeri Exp $ - - 06 Jan 2007; Bryan Østergaard libdrm-2.0.2.ebuild: - Stable on Alpha. - -*libdrm-2.3.0 (10 Nov 2006) - - 10 Nov 2006; Joshua Baergen - -libdrm-2.2.0.ebuild, +libdrm-2.3.0.ebuild: - Version bump for 7.2RC2 with support for upcoming X servers. Adds drmOpenOnce - and drmCloseOnce and support for the server to use the system libdrm, instead - of the (now) removed internal one. These changes are only important for GIT - head or >=1.2.99.0 servers. - -*libdrm-2.2.0 (02 Nov 2006) - - 02 Nov 2006; Joshua Baergen - +libdrm-2.2.0.ebuild: - Version bump with a large amount of changes. Notables: Mach64 work and - support for the new memory manager. - - 14 Oct 2006; Bryan Østergaard libdrm-2.0.2.ebuild: - Stable on ia64. - - 13 Oct 2006; Joshua Baergen - libdrm-2.0.2.ebuild: - AMD64/x86 stable for bug #144549 (X7.1). - - 12 Sep 2006; Gustavo Zacarias libdrm-2.0.2.ebuild: - Stable on hppa - - 04 Sep 2006; Joshua Kinard libdrm-2.0.2.ebuild: - Marked stable on mips. - - 24 Aug 2006; Markus Rothe libdrm-2.0.2.ebuild: - Stable on ppc64 - - 23 Aug 2006; Ferris McCormick libdrm-2.0.2.ebuild: - Stable on sparc (part of general bookkeeping to sync sparc to a known state - now that xorg-x11-7.1 is stable on sparc). - - 20 Aug 2006; Donnie Berkholz ; libdrm-2.0.2.ebuild: - Stable on x86/ppc. - - 19 Jul 2006; Guy Martin libdrm-2.0.1.ebuild: - Stable on hppa. - -*libdrm-2.0.2 (14 Jul 2006) - - 14 Jul 2006; Donnie Berkholz ; +libdrm-2.0.2.ebuild: - Bump, change ewarn to elog. - - 10 Jul 2006; Aron Griffis libdrm-2.0.1.ebuild: - Mark 2.0.1 stable on ia64 - - 30 Jun 2006; Donnie Berkholz ; libdrm-2.0.1.ebuild: - ppc/sparc/mips/alpha/arm/sh stable - - 30 Jun 2006; Donnie Berkholz ; +libdrm-2.0.1.ebuild: - Restore mistakenly removed ebuild. - - 30 Jun 2006; Donnie Berkholz ; -libdrm-2.0.ebuild, - -libdrm-2.0.1.ebuild: - Pull old versions. - - 30 Jun 2006; Chris Gianelloni libdrm-2.0.1.ebuild: - Stable on amd64. - - 30 Jun 2006; Markus Rothe libdrm-2.0.1.ebuild: - Stable on ppc64 - - 30 Jun 2006; Donnie Berkholz ; libdrm-2.0.1.ebuild: - x86 stable. - -*libdrm-2.0.1 (01 Apr 2006) - - 01 Apr 2006; Joshua Baergen - +libdrm-2.0.1.ebuild: - Bump from upstream. Includes some new defines required by Mesa 6.5/HEAD. - - 31 Mar 2006; Diego Pettenò libdrm-2.0.ebuild: - Add ~x86-fbsd keyword. - - 10 Mar 2006; Donnie Berkholz ; libdrm-2.0.ebuild: - (#125506) Use --library for revdep-rebuild, not --soname. - - 09 Mar 2006; Aron Griffis libdrm-2.0.ebuild: - Mark 2.0 ~ia64 - - 14 Feb 2006; Markus Rothe libdrm-2.0.ebuild: - Added ~ppc64 - - 31 Jan 2006; Rene Nussbaumer libdrm-2.0.ebuild: - Unstable on hppa. - - 26 Dec 2005; Stefaan De Roeck libdrm-2.0.ebuild: - Marked ~alpha - - 17 Dec 2005; Joshua Baergen ChangeLog: - Bump for 7.0RC4. - - 09 Dec 2005; Donnie Berkholz ; -libdrm-1.0.1.ebuild, - -libdrm-1.0.3.ebuild, -libdrm-1.0.4.ebuild, -libdrm-1.0.5.ebuild: - Pull old versions. - - 05 Dec 2005; Joshua Baergen libdrm-2.0.ebuild: - Doh, now libdrm stays... - - 04 Dec 2005; Joshua Baergen libdrm-2.0.ebuild: - Keep the old libdrm.so.1 around so things don't break horribly on upgrade. - -*libdrm-2.0 (04 Dec 2005) - - 04 Dec 2005; Joshua Baergen +libdrm-2.0.ebuild: - Version bump. - -*libdrm-1.0.5 (31 Oct 2005) - - 31 Oct 2005; Donnie Berkholz ; +libdrm-1.0.5.ebuild: - Bump with via fixes. - -*libdrm-1.0.4 (20 Oct 2005) - - 20 Oct 2005; Donnie Berkholz ; +libdrm-1.0.4.ebuild: - Bump to remove libX11 dependency. - - 09 Sep 2005; Donnie Berkholz ; +metadata.xml: - Add metadata. - - 28 Aug 2005; MATSUU Takuto libdrm-1.0.3.ebuild: - Marked ~sh - - 20 Aug 2005; Luca Barbato libdrm-1.0.1.ebuild, - libdrm-1.0.3.ebuild: - Marked ~ppc - -*libdrm-1.0.3 (20 Aug 2005) - - 20 Aug 2005; Donnie Berkholz ; +libdrm-1.0.3.ebuild: - Bump. - - 15 Aug 2005; Herbie Hopkins libdrm-1.0.1.ebuild: - Marked ~amd64 - - 09 Aug 2005; Ferris McCormick libdrm-1.0.1.ebuild: - Add ~sparc keyword (X modular testing). - -*libdrm-1.0.1 (08 Aug 2005) - - 08 Aug 2005; Donnie Berkholz ; +libdrm-1.0.1.ebuild: - Initial commit for modular X. - diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest deleted file mode 100644 index 049ef01..0000000 --- a/x11-libs/libdrm/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX libdrm-loongson.patch 2196 RMD160 a1c39f37c019296513dace34f82793fa6322b750 SHA1 15f736fba60ab5ec56b6b64508cbe6c868fe6d08 SHA256 5348f74d784e8f16f996571656377d8b85473a88ab5df202267e6ffcfa6fa7e4 -DIST libdrm-2.3.0.tar.gz 391509 RMD160 2ca594cf17fc074b1addd1f370dd3409b5a03dd7 SHA1 fd62459b11c39a58e5b45b8af30a8217d5ce0e1b SHA256 76f90a22e141832bccea3fabf14e2b2a53e1ff72fe8414e2836ea8ac7e2e3dab -DIST libdrm-2.4.4.tar.gz 487110 RMD160 0520f6dc8103998b796f3e1759594a2a4cd0d1b6 SHA1 4b904e4eafc368d9f1b827a7439fc80a41746cb3 SHA256 83d2245a7d4dc6a02c46906f014b81ab3bb9fa0f601dba95123337312a805282 -EBUILD libdrm-2.3.0.ebuild 1247 RMD160 39b4260b84811f5566f8b1e0d71e23b3d753b83c SHA1 d84aabc763ec62b41235775b86774813b2c66d32 SHA256 d7ff70ce16c12378f998a4aa2e809c7bb8d44828ee7236d1bce001f66897a30c -EBUILD libdrm-2.4.4.ebuild 1206 RMD160 cecf01aefaa87c3801ee527a22465055c2aca21f SHA1 643449e17e647fc279cfb872bcb124a80ab041a9 SHA256 fa8ff7cae0b9e6e9d3086c9d2a49216599d2a4f16a5e83c60305b135e00260a9 -MISC ChangeLog 5078 RMD160 82343b31fe834c7f30e822c79e368de8d9e7e84b SHA1 5a7569a17d67ec633a0ada4bfca8bd869abc59fd SHA256 fb3712816e68f0327cf8ed8e070844a425c68fdcefad986ff749aa187926941a -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/x11-libs/libdrm/files/libdrm-loongson.patch b/x11-libs/libdrm/files/libdrm-loongson.patch deleted file mode 100644 index c067c9d..0000000 --- a/x11-libs/libdrm/files/libdrm-loongson.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN libdrm-2.3.0/libdrm/xf86drm.h libdrm-2.3.0.new/libdrm/xf86drm.h ---- libdrm-2.3.0/libdrm/xf86drm.h 2006-11-09 05:55:14.000000000 +0800 -+++ libdrm-2.3.0.new/libdrm/xf86drm.h 2007-03-01 05:29:41.000000000 +0800 -@@ -346,6 +346,29 @@ - "r" (new)); \ - } while(0) - -+#elif defined(__mips__) -+ -+#define DRM_CAS(lock, old, new, ret) \ -+ do { \ -+ __asm__ __volatile__( \ -+ " .set mips3;.set noreorder;\n" \ -+ " sync; \n" \ -+ " ll %1, %0;\n" \ -+ " bne %1, %2, 1f;\n" \ -+ " li %1, 1; \n" \ -+ " move %1, %3; \n" \ -+ " sc %1, %0;\n" \ -+ " xori %1, %1, 1\n" \ -+ "1: \n" \ -+ " .set mips0; .set reorder;\n" \ -+ : "=m" (__drm_dummy_lock(lock)),\ -+ "=&r" (ret) \ -+ : "r" (old), \ -+ "r" (new) \ -+ :"memory","$8" \ -+ ); \ -+ } while(0) -+ - #elif defined(__sparc__) - - #define DRM_CAS(lock,old,new,__ret) \ -@@ -427,7 +450,7 @@ - #define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */ - #endif - --#if defined(__alpha__) || defined(__powerpc__) -+#if defined(__alpha__) || defined(__powerpc__) || defined(__mips__) - #define DRM_CAS_RESULT(_result) int _result - #else - #define DRM_CAS_RESULT(_result) char _result -diff -urN libdrm-2.3.0/shared-core/drm_sarea.h libdrm-2.3.0.new/shared-core/drm_sarea.h ---- libdrm-2.3.0/shared-core/drm_sarea.h 2006-11-08 12:03:26.000000000 +0800 -+++ libdrm-2.3.0.new/shared-core/drm_sarea.h 2007-03-01 05:31:34.000000000 +0800 -@@ -37,6 +37,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else diff --git a/x11-libs/libdrm/libdrm-2.3.0.ebuild b/x11-libs/libdrm/libdrm-2.3.0.ebuild deleted file mode 100644 index aa30d01..0000000 --- a/x11-libs/libdrm/libdrm-2.3.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.3.0.ebuild,v 1.1 2006/11/10 03:48:39 joshuabaergen Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="http://dri.freedesktop.org/" -SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack "${A}" - cd "${S}" - epatch "${FILESDIR}/${PN}-loongson.patch" -} - -pkg_preinst() { - x-modular_pkg_preinst - - if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then - cp -pPR "${ROOT}"/usr/$(get_libdir)/libdrm.so.{1,1.0.0} "${IMAGE}"/usr/$(get_libdir)/ - fi -} - -pkg_postinst() { - x-modular_pkg_postinst - - if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then - elog "You must re-compile all packages that are linked against" - elog "libdrm 1 by using revdep-rebuild from gentoolkit:" - elog "# revdep-rebuild --library libdrm.so.1" - elog "After this, you can delete /usr/$(get_libdir)/libdrm.so.1" - elog "and /usr/$(get_libdir)/libdrm.so.1.0.0 ." - epause - fi -} diff --git a/x11-libs/libdrm/libdrm-2.4.4.ebuild b/x11-libs/libdrm/libdrm-2.4.4.ebuild deleted file mode 100644 index 9825ea8..0000000 --- a/x11-libs/libdrm/libdrm-2.4.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.4.ebuild,v 1.2 2009/02/05 13:33:40 remi Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="http://dri.freedesktop.org/" -SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" -RESTRICT="test" # see bug #236845 - -RDEPEND="dev-libs/libpthread-stubs" -DEPEND="${RDEPEND}" - -# FIXME, we should try to see how we can fit the --enable-udev configure flag -src_unpack() { - unpack "${A}" - cd "${S}" - epatch "${FILESDIR}/${PN}-loongson.patch" -} - -pkg_preinst() { - x-modular_pkg_preinst - - if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then - cp -pPR "${ROOT}"/usr/$(get_libdir)/libdrm.so.{1,1.0.0} "${IMAGE}"/usr/$(get_libdir)/ - fi -} - -pkg_postinst() { - x-modular_pkg_postinst - - ewarn "libdrm's ABI may have changed without change in library name" - ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and" - ewarn "your video drivers in x11-drivers/*." -} diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml deleted file mode 100644 index 01c4c00..0000000 --- a/x11-libs/libdrm/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -x11 - -- cgit v1.2.3-65-gdbad