diff options
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/libdrm/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/libdrm/files/2.4.18-0001-datatypes.patch | 21 | ||||
-rw-r--r-- | x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild | 45 | ||||
-rw-r--r-- | x11-libs/libdrm/libdrm-2.4.21.ebuild | 41 |
4 files changed, 6 insertions, 108 deletions
diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog index 443e1d875358..135d0b1a8928 100644 --- a/x11-libs/libdrm/ChangeLog +++ b/x11-libs/libdrm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/libdrm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.133 2010/10/21 01:19:26 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.134 2010/10/21 14:08:38 scarabeus Exp $ + + 21 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -files/2.4.18-0001-datatypes.patch, -libdrm-2.4.18_pre20100211-r1.ebuild, + -libdrm-2.4.21.ebuild: + old 21 Oct 2010; Brent Baude <ranger@gentoo.org> libdrm-2.4.20-r1.ebuild: Marking libdrm-2.4.20-r1 ppc stable for bug 239063 diff --git a/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch b/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch deleted file mode 100644 index 6a1bfafcbb1b..000000000000 --- a/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h -index dfc390e..49b3b54 100644 ---- a/include/drm/drm_mode.h -+++ b/include/drm/drm_mode.h -@@ -308,11 +308,11 @@ struct drm_mode_crtc_lut { - #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT - - struct drm_mode_crtc_page_flip { -- uint32_t crtc_id; -- uint32_t fb_id; -- uint32_t flags; -- uint32_t reserved; -- uint64_t user_data; -+ __u32 crtc_id; -+ __u32 fb_id; -+ __u32 flags; -+ __u32 reserved; -+ __u64 user_data; - }; - - #endif diff --git a/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild b/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild deleted file mode 100644 index 6ee0066c568a..000000000000 --- a/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild,v 1.9 2010/08/02 18:38:28 armin76 Exp $ - -EAPI=2 -SNAPSHOT="yes" -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="http://dri.freedesktop.org/" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2" -fi - -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}" - -PATCHES=( - # Fixes buidling of x11-drivers/xf86-video-openchrome, Gentoo bug 298352, - # upstream bug 26994 - "${FILESDIR}"/2.4.18-0001-datatypes.patch - ) - -pkg_setup() { - # libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is - # installed, bugs 297630, bug 316421 and bug 316541, and is presently only - # useful on amd64 and x86. - CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api $(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")" -} - -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/libdrm-2.4.21.ebuild b/x11-libs/libdrm/libdrm-2.4.21.ebuild deleted file mode 100644 index 283629afd555..000000000000 --- a/x11-libs/libdrm/libdrm-2.4.21.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.21.ebuild,v 1.1 2010/06/16 12:21:59 chithanh Exp $ - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="http://dri.freedesktop.org/" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2" -fi - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="kernel_linux" -RESTRICT="test" # see bug #236845 - -RDEPEND="dev-libs/libpthread-stubs" -DEPEND="${RDEPEND}" - -pkg_setup() { - # libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is - # installed, bugs 297630, bug 316421 and bug 316541, and is presently only - # useful on amd64 and x86. - CONFIGURE_OPTIONS="--enable-udev - --enable-nouveau-experimental-api - --enable-vmwgfx-experimental-api - $(use_enable kernel_linux libkms) - $(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")" -} - -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/*." -} |