diff options
| -rw-r--r-- | x11-drivers/xf86-video-ati/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/Manifest | 9 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/files/detect-dga-cpio-etc-per-platform.patch | 117 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6 | 1 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r1 | 1 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r2 | 1 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r1.ebuild | 26 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r2.ebuild (renamed from x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6.ebuild) | 4 |
8 files changed, 16 insertions, 154 deletions
diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog index 3e6be6500b64..f288d4771eb3 100644 --- a/x11-drivers/xf86-video-ati/ChangeLog +++ b/x11-drivers/xf86-video-ati/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-drivers/xf86-video-ati # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.4 2005/08/20 22:55:31 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.5 2005/09/03 14:46:36 joshuabaergen Exp $ + +*xf86-video-ati-6.5.6-r2 (03 Sep 2005) + + 03 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> + -files/detect-dga-cpio-etc-per-platform.patch, + -xf86-video-ati-6.5.6.ebuild, -xf86-video-ati-6.5.6-r1.ebuild, + +xf86-video-ati-6.5.6-r2.ebuild: + New CVS snapshot of driver which includes previous patch. Old versions + removed. 20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> xf86-video-ati-6.5.6.ebuild, xf86-video-ati-6.5.6-r1.ebuild: diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest index 3a94a8a83da2..c9a553a029ff 100644 --- a/x11-drivers/xf86-video-ati/Manifest +++ b/x11-drivers/xf86-video-ati/Manifest @@ -1,6 +1,3 @@ -MD5 6d6edea232cd6f5a3fee58fb81200258 ChangeLog 903 -MD5 c174d527ef6b900a493a6b771241c032 xf86-video-ati-6.5.6.ebuild 675 -MD5 16869dee8b2ac45889f90a4c95515011 xf86-video-ati-6.5.6-r1.ebuild 739 -MD5 e9296af01f62cf628bfb2b969a8121c6 files/detect-dga-cpio-etc-per-platform.patch 3885 -MD5 73547ec47cd075a80b875b58f9ac3532 files/digest-xf86-video-ati-6.5.6 73 -MD5 73547ec47cd075a80b875b58f9ac3532 files/digest-xf86-video-ati-6.5.6-r1 73 +MD5 c3230b4521e26f5e97b69dee644695fe ChangeLog 1240 +MD5 a443e05510af5243186c2feeca748108 xf86-video-ati-6.5.6-r2.ebuild 683 +MD5 2a3072cca7e320b99b99f7a82fed7932 files/digest-xf86-video-ati-6.5.6-r2 73 diff --git a/x11-drivers/xf86-video-ati/files/detect-dga-cpio-etc-per-platform.patch b/x11-drivers/xf86-video-ati/files/detect-dga-cpio-etc-per-platform.patch deleted file mode 100644 index 7c9971a26312..000000000000 --- a/x11-drivers/xf86-video-ati/files/detect-dga-cpio-etc-per-platform.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -urN xf86-video-ati-6.5.6.orig/configure.ac xf86-video-ati-6.5.6/configure.ac ---- xf86-video-ati-6.5.6.orig/configure.ac 2005-08-01 13:15:22.000000000 -0700 -+++ xf86-video-ati-6.5.6/configure.ac 2005-08-16 11:27:10.000000000 -0700 -@@ -88,6 +88,74 @@ - AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) - fi - -+# Note that this is sort of inverted from drivers/ati/Imakefile in -+# the monolith. We test for foo, not for !foo (i.e. ATMISC_CPIO, not -+# ATIMISC_AVOID_CPIO), but the defines are negative. So beware. Oh yeah, -+# TV_OUT is the special case where it's a positive define, not AVOID_TV_OUT. -+ -+# AVOID_CPIO: Only x86, amd64, and alpha are cool with CPIO. It needs a -+# little-endian, undirected PIO space of at least 64kB. -+# AVOID_NON_PCI: Platforms which don't deal with PCI master aborts should -+# stick to PCI-only probing, stick their fingers in their ears, and pretend -+# that ISA cards simply don't exist. -+# AVOID_DGA: ??? -+# ATI_TV_OUT: This only works on x86. -+ -+ATIMISC_CPIO=no -+ATIMISC_NON_PCI=yes -+ATIMISC_DGA=yes -+ATIMISC_TV_OUT=no -+ -+case $host_cpu in -+ i*86) -+ ATIMISC_TV_OUT=yes -+ ATIMISC_CPIO=yes -+ ;; -+ amd64|alpha) -+ ATIMISC_CPIO=yes -+ ;; -+ sparc) -+ ATIMISC_DGA=no -+ ;; -+ powerpc) -+ ATIMISC_NON_PCI=no -+ ;; -+ *) -+ ;; -+esac -+ -+AC_MSG_CHECKING([whether to include PIO support]) -+AM_CONDITIONAL(ATIMISC_CPIO, test "x$ATIMISC_CPIO" = xyes) -+if test "x$ATIMISC_CPIO" = xyes; then -+ echo "yes, PIO" -+else -+ AC_DEFINE(AVOID_CPIO, 1, [Avoid PIO and use MMIO for atimisc.]) -+ echo "no, MMIO" -+fi -+ -+AC_MSG_CHECKING([whether to include support for non-PCI devices]) -+AM_CONDITIONAL(ATIMISC_NON_PCI, test "x$ATIMISC_NON_PCI" = xyes) -+if test "x$ATI_AVOID_NON_PCI" = xyes; then -+ echo "yes, PCI and ISA" -+else -+ AC_DEFINE(AVOID_NON_PCI, 1, [Only probe PCI cards; do not probe ISA.]) -+ echo "no, PCI only" -+fi -+ -+AC_MSG_CHECKING([whether to include DGA support]) -+AC_MSG_RESULT([$ATIMISC_DGA]) -+AM_CONDITIONAL(ATIMISC_DGA, test "x$ATIMISC_DGA" = xyes) -+if ! test "x$ATIMISC_DGA" = xyes; then -+ AC_DEFINE(AVOID_DGA, 1, [Do not build DGA support.]) -+fi -+ -+AC_MSG_CHECKING([whether to include TV Out support]) -+AC_MSG_RESULT([$ATIMISC_TV_OUT]) -+AM_CONDITIONAL(ATIMISC_TV_OUT, test "x$ATIMISC_TV_OUT" = xyes) -+if test "x$ATIMISC_TV_OUT" = xyes; then -+ AC_DEFINE(TV_OUT, 1, [Build TV-Out support for atimisc.]) -+fi -+ - AC_SUBST([XORG_CFLAGS]) - AC_SUBST([DRI_CFLAGS]) - AC_SUBST([moduledir]) -diff -urN xf86-video-ati-6.5.6.orig/src/Makefile.am xf86-video-ati-6.5.6/src/Makefile.am ---- xf86-video-ati-6.5.6.orig/src/Makefile.am 2005-08-01 13:15:22.000000000 -0700 -+++ xf86-video-ati-6.5.6/src/Makefile.am 2005-08-16 11:27:10.000000000 -0700 -@@ -32,6 +32,15 @@ - RADEON_DRI_SRCS = radeon_dri.c - endif - -+if ATIMISC_CPIO -+ATI_CPIO_SOURCES = ativgaio.c -+ATIMISC_CPIO_SOURCES = ativga.c atibank.c atiwonder.c atiwonderio.c -+endif -+ -+if ATIMISC_DGA -+ATIMISC_DGA_SOURCES = atidga.c -+endif -+ - AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ - - ati_drv_la_LTLIBRARIES = ati_drv.la -@@ -39,7 +48,7 @@ - ati_drv_ladir = @moduledir@/drivers - ati_drv_la_SOURCES = \ - ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \ -- atiprobe.c atividmem.c ativgaio.c atimodule.c \ -+ atiprobe.c atividmem.c atimodule.c $(ATI_CPIO_SOURCES) \ - radeon_probe.c r128_probe.c - - atimisc_drv_la_LTLIBRARIES = atimisc_drv.la -@@ -51,8 +60,8 @@ - atilock.c atimach64.c atimach64accel.c atimach64cursor.c \ - atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \ - atiprint.c atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \ -- atixv.c atibank.c ativga.c atiwonder.c atiwonderio.c atidga.c \ -- atiload.c atimisc.c $(ATIMISC_DRI_SRCS) -+ atixv.c atiload.c atimisc.c $(ATIMISC_DRI_SRCS) $(ATIMISC_DGA_SOURCES) \ -+ $(ATIMISC_CPIO_SOURCES) - - r128_drv_la_LTLIBRARIES = r128_drv.la - r128_drv_la_LDFLAGS = -module -avoid-version diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6 deleted file mode 100644 index ee9b0e899465..000000000000 --- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 bb4ec6a49d4c586112a6181e36fe2840 xf86-video-ati-6.5.6.tar.bz2 620648 diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r1 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r1 deleted file mode 100644 index ee9b0e899465..000000000000 --- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 bb4ec6a49d4c586112a6181e36fe2840 xf86-video-ati-6.5.6.tar.bz2 620648 diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r2 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r2 new file mode 100644 index 000000000000..27efd0ae9294 --- /dev/null +++ b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.6-r2 @@ -0,0 +1 @@ +MD5 d7f46cdafc2558e164a30f4e609a237b xf86-video-ati-6.5.6.tar.bz2 638575 diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r1.ebuild deleted file mode 100644 index 53031e93d899..000000000000 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r1.ebuild,v 1.2 2005/08/20 22:55:31 lu_zero Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit x-modular - -PATCHES="${FILESDIR}/detect-dga-cpio-etc-per-platform.patch" - -DESCRIPTION="X.Org driver for ati cards" -KEYWORDS="~ppc ~sparc ~x86" -IUSE="dri" -RDEPEND="x11-base/xorg-server" -DEPEND="${RDEPEND} - x11-proto/xproto - dri? ( x11-proto/xf86driproto )" - -CONFIGURE_OPTIONS="$(use_enable dri)" - -pkg_setup() { - if use dri && ! built_with_use x11-base/xorg-server dri; then - die "Build x11-base/xorg-server with USE=dri." - fi -} diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r2.ebuild index 456600cb7f21..59c0caf0f4cc 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6.ebuild,v 1.3 2005/08/20 22:55:31 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.6-r2.ebuild,v 1.1 2005/09/03 14:46:36 joshuabaergen Exp $ # Must be before x-modular eclass is inherited -#SNAPSHOT="yes" +SNAPSHOT="yes" inherit x-modular |