x11-drivers/xf86-video-i810: remove 2.3 release candidates and patches

(Portage version: 2.1.5_rc10)

7 files changed, 8 insertions, 409 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index d6745e2e2104..fdbdf26a1eaa 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.86 2008/04/29 07:27:33 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.87 2008/05/14 08:49:35 remi Exp $
+
+  14 May 2008; Rémi Cardona <remi@gentoo.org>
+  -files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patc
+  h, -files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch,
+  -xf86-video-i810-2.2.99.901.ebuild, -xf86-video-i810-2.2.99.902.ebuild,
+  -xf86-video-i810-2.2.99.903.ebuild, -xf86-video-i810-2.2.99.903-r1.ebuild:
+  remove 2.3 release candidates and patches
 
 *xf86-video-i810-2.3.0 (29 Apr 2008)
 
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch
deleted file mode 100644
index 751e2937e8b6..000000000000
--- a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/src/i830.h b/src/i830.h
-index 1319c6a..bd41a2f 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -288,6 +288,7 @@ typedef struct _I830OutputPrivateRec {
-    I2CBusPtr		    pDDCBus;
-    struct _I830DVODriver    *i2c_drv;
-    Bool			    load_detect_temp;
-+   uint32_t		    lvds_bits;
-    int                      pipe_mask;
-    int			    clone_mask;
-    /** Output-private structure.  Should replace i2c_drv */
-diff --git a/src/i830_display.c b/src/i830_display.c
-index 6a2d1d7..4f3f8ef 100644
---- a/src/i830_display.c
-+++ b/src/i830_display.c
-@@ -1059,6 +1059,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
-     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     I830Ptr pI830 = I830PTR(pScrn);
-     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-+    I830OutputPrivatePtr intel_output;
-     int pipe = intel_crtc->pipe;
-     int plane = intel_crtc->plane;
-     int fp_reg = (pipe == 0) ? FPA0 : FPB0;
-@@ -1088,7 +1089,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
-      */
-     for (i = 0; i < xf86_config->num_output; i++) {
- 	xf86OutputPtr  output = xf86_config->output[i];
--	I830OutputPrivatePtr intel_output = output->driver_private;
-+	intel_output = output->driver_private;
- 
- 	if (output->crtc != crtc)
- 	    continue;
-@@ -1302,6 +1303,8 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
- 		lvds |= LVDS_DITHER_ENABLE;
- 	}
- 
-+	lvds |= intel_output->lvds_bits;
-+
- 	OUTREG(LVDS, lvds);
- 	POSTING_READ(LVDS);
-     }
-diff --git a/src/i830_lvds.c b/src/i830_lvds.c
-index 33b4f26..ddc9b8e 100644
---- a/src/i830_lvds.c
-+++ b/src/i830_lvds.c
-@@ -62,7 +62,6 @@ struct i830_lvds_priv {
-     
-     /* The panel needs dithering enabled */
-     Bool	    panel_wants_dither;
--    Bool	    need_border;
- 
-     /* restore backlight to this value */
-     int		    backlight_duty_cycle;
-@@ -542,23 +541,22 @@ i830_lvds_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
-     adjusted_mode->Clock = dev_priv->panel_fixed_mode->Clock;
-     xf86SetModeCrtc(adjusted_mode, INTERLACE_HALVE_V);
- 
-+    /* Make sure pre-965s set dither correctly */
-+    if (!IS_I965G(pI830) && dev_priv->panel_wants_dither)
-+	pfit_control |= PANEL_8TO6_DITHER_ENABLE;
-+
-     /* Native modes don't need fitting */
-     if (adjusted_mode->HDisplay == mode->HDisplay &&
- 	adjusted_mode->VDisplay == mode->VDisplay) {
--	pfit_control = 0;
- 	pfit_pgm_ratios = 0;
- 	border = 0;
- 	goto out;
-     }
- 
--    /* Basic panel fitting options */
--    if (!IS_I965G(pI830)) {
--	if (dev_priv->panel_wants_dither)
--	    pfit_control |= PANEL_8TO6_DITHER_ENABLE;
--    } else {
-+    /* 965+ wants fuzzy fitting */
-+    if (IS_I965G(pI830))
- 	pfit_control |= (intel_crtc->pipe << PFIT_PIPE_SHIFT) |
- 	    PFIT_FILTER_FUZZY;
--    }
- 
-     /*
-      * Deal with panel fitting options.  Figure out how to stretch the image
-@@ -721,8 +719,11 @@ i830_lvds_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
- out:
-     dev_priv->pfit_control = pfit_control;
-     dev_priv->pfit_pgm_ratios = pfit_pgm_ratios;
--    dev_priv->need_border = border;
- 
-+    if (border)
-+	intel_output->lvds_bits |= LVDS_BORDER_ENABLE;
-+    else
-+	intel_output->lvds_bits &= ~LVDS_BORDER_ENABLE;
-     /* XXX: It would be nice to support lower refresh rates on the
-      * panels to reduce power consumption, and perhaps match the
-      * user's requested refresh rate.
-@@ -734,23 +735,7 @@ out:
- static void
- i830_lvds_prepare(xf86OutputPtr output)
- {
--    I830OutputPrivatePtr    intel_output = output->driver_private;
--    struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
--    ScrnInfoPtr		    pScrn = output->scrn;
--    I830Ptr		    pI830 = I830PTR(pScrn);
--    uint32_t		    lvds;
--
--    lvds = INREG(LVDS);
--
--    i830_lvds_dpms(output, DPMSModeOff);
--    /*
--     * ->prepare will be called after the CRTC is off but before
--     * we set the mode, so program the PFIT regs here.
--     */
--    if (dev_priv->need_border)
--	OUTREG(LVDS, lvds | LVDS_BORDER_ENABLE);
--    else
--	OUTREG(LVDS, lvds & (~LVDS_BORDER_ENABLE));
-+	i830_lvds_dpms(output, DPMSModeOff);
- }
- 
- static void
-@@ -767,8 +752,6 @@ i830_lvds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
-      */
-     OUTREG(PFIT_PGM_RATIOS, dev_priv->pfit_pgm_ratios);
-     OUTREG(PFIT_CONTROL, dev_priv->pfit_control);
--    /* It's harmless to turn on the LVDS if it's already on */
--    i830_lvds_dpms(output, DPMSModeOn);
- }
- 
- /**
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch
deleted file mode 100644
index ba7a883d3c13..000000000000
--- a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/src/i830.h b/src/i830.h
-index 834e4dc..e2c39cc 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -857,6 +857,17 @@ static inline int i830_fb_compression_supported(I830Ptr pI830)
- 
- Bool i830_pixmap_tiled(PixmapPtr p);
- 
-+#define i830_exa_check_pitch_2d(p) do {\
-+    uint32_t pitch = intel_get_pixmap_pitch(p);\
-+    if (pitch > KB(32)) return FALSE;\
-+} while(0)
-+
-+/* For pre-965 chip only, as they have 8KB limit for 3D */
-+#define i830_exa_check_pitch_3d(p) do {\
-+    uint32_t pitch = intel_get_pixmap_pitch(p);\
-+    if (pitch > KB(8)) return FALSE;\
-+} while(0)
-+
- /* Batchbuffer compatibility handling */
- #define BEGIN_BATCH(n) BEGIN_LP_RING(n)
- #define ENSURE_BATCH(n)
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index 155e7a9..41c0578 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -3108,7 +3108,7 @@ I830FreeScreen(int scrnIndex, int flags)
- #ifdef INTEL_XVMC
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     I830Ptr pI830 = I830PTR(pScrn);
--    if (pI830->XvMCEnabled)
-+    if (pI830 && pI830->XvMCEnabled)
- 	intel_xvmc_finish(xf86Screens[scrnIndex]);
- #endif
-    I830FreeRec(xf86Screens[scrnIndex]);
-diff --git a/src/i830_exa.c b/src/i830_exa.c
-index 9b5bb93..2c807c5 100644
---- a/src/i830_exa.c
-+++ b/src/i830_exa.c
-@@ -170,6 +170,8 @@ I830EXAPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
-     if (pPixmap->drawable.bitsPerPixel == 24)
- 	I830FALLBACK("solid 24bpp unsupported!\n");
- 
-+    i830_exa_check_pitch_2d(pPixmap);
-+
-     offset = exaGetPixmapOffset(pPixmap);
-     pitch = exaGetPixmapPitch(pPixmap);
- 
-@@ -255,6 +257,9 @@ I830EXAPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
-     if (!EXA_PM_IS_SOLID(&pSrcPixmap->drawable, planemask))
- 	I830FALLBACK("planemask is not solid");
- 
-+    i830_exa_check_pitch_2d(pSrcPixmap);
-+    i830_exa_check_pitch_2d(pDstPixmap);
-+
-     pI830->pSrcPixmap = pSrcPixmap;
- 
-     pI830->BR[13] = I830CopyROP[alu] << 16;
-diff --git a/src/i830_lvds.c b/src/i830_lvds.c
-index a5004b4..1562c21 100644
---- a/src/i830_lvds.c
-+++ b/src/i830_lvds.c
-@@ -1366,9 +1366,10 @@ i830_lvds_init(ScrnInfoPtr pScrn)
- 
-     /*
-      * Default to filling the whole screen if the mode is less than the
--     * native size, without breaking aspect ratio.
-+     * native size. (Change default to origin FULL mode, i8xx can only work
-+     * in that mode for now.)
-      */
--    dev_priv->fitting_mode = FULL_ASPECT;
-+    dev_priv->fitting_mode = FULL;
- 
-     return;
- 
-diff --git a/src/i830_render.c b/src/i830_render.c
-index 195e9a8..3a959e8 100644
---- a/src/i830_render.c
-+++ b/src/i830_render.c
-@@ -398,6 +398,11 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
-     Bool is_affine_src, is_affine_mask;
-     Bool is_nearest = FALSE;
- 
-+    i830_exa_check_pitch_3d(pSrc);
-+    if (pMask)
-+	i830_exa_check_pitch_3d(pMask);
-+    i830_exa_check_pitch_3d(pDst);
-+
-     IntelEmitInvarientState(pScrn);
-     *pI830->last_3d = LAST_3D_RENDER;
- 
-diff --git a/src/i915_render.c b/src/i915_render.c
-index 2b9ed04..4a02cf5 100644
---- a/src/i915_render.c
-+++ b/src/i915_render.c
-@@ -323,6 +323,11 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
-     Bool is_affine_src, is_affine_mask;
-     Bool is_nearest = FALSE;
- 
-+    i830_exa_check_pitch_3d(pSrc);
-+    if (pMask)
-+	i830_exa_check_pitch_3d(pMask);
-+    i830_exa_check_pitch_3d(pDst);
-+
-     IntelEmitInvarientState(pScrn);
-     *pI830->last_3d = LAST_3D_RENDER;
- 
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.901.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.901.ebuild
deleted file mode 100644
index 1dd40ee77a11..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.901.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.901.ebuild,v 1.1 2008/03/28 07:34:52 remi Exp $
-
-# Must be before x-modular eclass is inherited
-# Enable snapshot to get the man page in the right place
-# This should be fixed with a XDP patch later
-SNAPSHOT="yes"
-XDPVER=-1
-
-inherit x-modular
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2
-	x11-libs/libXvMC"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2.2
-			x11-libs/libX11 )"
-
-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-i810/xf86-video-i810-2.2.99.902.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.902.ebuild
deleted file mode 100644
index 59524e9b9a97..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.902.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.902.ebuild,v 1.1 2008/04/06 21:21:12 remi Exp $
-
-# Must be before x-modular eclass is inherited
-# Enable snapshot to get the man page in the right place
-# This should be fixed with a XDP patch later
-SNAPSHOT="yes"
-XDPVER=-1
-
-inherit x-modular
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2
-	x11-libs/libXvMC"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2.2
-			x11-libs/libX11 )"
-
-PATCHES=("${FILESDIR}/${PN}-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch")
-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-i810/xf86-video-i810-2.2.99.903-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild
deleted file mode 100644
index 6416c821de26..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild,v 1.1 2008/04/18 17:28:17 remi Exp $
-
-# Must be before x-modular eclass is inherited
-# Enable snapshot to get the man page in the right place
-# This should be fixed with a XDP patch later
-SNAPSHOT="yes"
-XDPVER=-1
-
-inherit x-modular
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2
-	x11-libs/libXvMC"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2.2
-			x11-libs/libX11 )"
-
-PATCHES=("${FILESDIR}/${PN}-2.2.99.903-fix-panel-resize-on-i8xx.patch")
-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-i810/xf86-video-i810-2.2.99.903.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903.ebuild
deleted file mode 100644
index c9bbb827518d..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903.ebuild,v 1.1 2008/04/14 05:55:53 remi Exp $
-
-# Must be before x-modular eclass is inherited
-# Enable snapshot to get the man page in the right place
-# This should be fixed with a XDP patch later
-SNAPSHOT="yes"
-XDPVER=-1
-
-inherit x-modular
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2
-	x11-libs/libXvMC"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2.2
-			x11-libs/libX11 )"
-
-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
-}