Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Mon Nov 6 21:29:10 CET 2006.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-11-03 20:54:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-11-06 16:40:41.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Nov 6 16:39:25 CET 2006 - sndirsch@suse.de
+
+- updated rendition driver to release 1.2.3
+ * Build fix for systems with instead of
+ (X.Org Bug #7707)
+- updated intel modesetting driver (git_2006-11-06)
+
+-------------------------------------------------------------------
Old:
----
xf86-video-rendition-4.1.1.tar.bz2
New:
----
xf86-video-rendition-4.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.WT2C2F/_old 2006-11-06 21:00:14.000000000 +0100
+++ /var/tmp/diff_new_pack.WT2C2F/_new 2006-11-06 21:00:14.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 13
+Release: 16
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -40,7 +40,7 @@
Source16: xf86-video-newport-0.2.1.tar.bz2
Source17: xf86-video-nsc-2.8.2.tar.bz2
Source18: xf86-video-nv-1.2.0.tar.bz2
-Source19: xf86-video-rendition-4.1.1.tar.bz2
+Source19: xf86-video-rendition-4.1.2.tar.bz2
Source20: xf86-video-s3-X11R7.1-0.4.1.tar.bz2
Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2
Source22: xf86-video-savage-2.1.2.tar.bz2
@@ -204,6 +204,11 @@
%{_mandir}/man4/*
%changelog -n xorg-x11-driver-video
+* Mon Nov 06 2006 - sndirsch@suse.de
+- updated rendition driver to release 1.2.3
+ * Build fix for systems with instead of
+ (X.Org Bug #7707)
+- updated intel modesetting driver (git_2006-11-06)
* Fri Nov 03 2006 - sndirsch@suse.de
- updated trident dirver to release 1.2.3
* Remove spurious line that stops blit's from working (on XP4/XP5)
++++++ xf86-video-intel.modesetting.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830.h new/xf86-video-intel.modesetting/src/i830.h
--- old/xf86-video-intel.modesetting/src/i830.h 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830.h 2006-11-06 16:34:19.000000000 +0100
@@ -205,6 +205,11 @@
int type;
int pipe;
Bool disabled;
+ /**
+ * Marks that the output and associated pipe is temporarily enabled for
+ * load detection.
+ */
+ Bool load_detect_temp;
/**
* Turns the output on/off, or sets intermediate power levels if available.
@@ -287,31 +292,29 @@
void *dev_priv;
};
+typedef struct _I830PipeRec {
+ Bool gammaEnabled;
+ int x;
+ int y;
+ Bool cursorInRange;
+ Bool cursorShown;
+ Bool planeEnabled;
+ DisplayModeRec curMode;
+} I830PipeRec, *I830PipePtr;
+
typedef struct _I830Rec {
unsigned char *MMIOBase;
unsigned char *FbBase;
int cpp;
- unsigned int bios_version;
-
- Bool newPipeSwitch;
-
- Bool fakeSwitch;
-
- int fixedPipe;
-
DisplayModePtr currentMode;
/* Mode saved during randr reprobe, which will need to be freed at the point
* of the next SwitchMode, when we lose this last reference to it.
*/
DisplayModePtr savedCurrentMode;
- Bool gammaEnabled[MAX_DISPLAY_PIPES];
-
- int pipeX[MAX_DISPLAY_PIPES];
- int pipeY[MAX_DISPLAY_PIPES];
- Bool cursorInRange[MAX_DISPLAY_PIPES];
- Bool cursorShown[MAX_DISPLAY_PIPES];
+ I830PipeRec pipes[MAX_DISPLAY_PIPES];
+
Bool Clone;
int CloneRefresh;
int CloneHDisplay;
@@ -478,8 +481,6 @@
/* [0] is Pipe A, [1] is Pipe B. */
int availablePipes;
/* [0] is display plane A, [1] is display plane B. */
- int planeEnabled[MAX_DISPLAY_PIPES];
- DisplayModeRec pipeCurMode[MAX_DISPLAY_PIPES];
/* Driver phase/state information */
Bool preinit;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_crt.c new/xf86-video-intel.modesetting/src/i830_crt.c
--- old/xf86-video-intel.modesetting/src/i830_crt.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_crt.c 2006-11-06 16:34:19.000000000 +0100
@@ -32,6 +32,7 @@
#include "xf86.h"
#include "i830.h"
#include "i830_xf86Modes.h"
+#include "i830_display.h"
static void
i830_crt_dpms(ScrnInfoPtr pScrn, I830OutputPtr output, int mode)
@@ -166,7 +167,7 @@
* \return FALSE if CRT is disconnected.
*/
static Bool
-i830_crt_detect_load(ScrnInfoPtr pScrn)
+i830_crt_detect_load(ScrnInfoPtr pScrn, I830OutputPtr output)
{
I830Ptr pI830 = I830PTR(pScrn);
CARD32 adpa, pipeconf;
@@ -174,7 +175,7 @@
int pipeconf_reg, bclrpat_reg, dpll_reg;
int pipe;
- pipe = pI830->pipe;
+ pipe = output->pipe;
if (pipe == 0) {
bclrpat_reg = BCLRPAT_A;
pipeconf_reg = PIPEACONF;
@@ -263,15 +264,12 @@
if (i830_crt_detect_ddc(pScrn))
return OUTPUT_STATUS_CONNECTED;
- /* Use the load-detect method if we're not currently outputting to the CRT,
- * or we don't care.
- *
- * Actually, the method is unreliable currently. We need to not share a
- * pipe, as it seems having other outputs on that pipe will result in a
- * false positive.
- */
- if (0) {
- if (i830_crt_detect_load(pScrn))
+ /* Use the load-detect method if we have no other way of telling. */
+ if (i830GetLoadDetectPipe(pScrn, output) != -1) {
+ Bool connected = i830_crt_detect_load(pScrn, output);
+
+ i830ReleaseLoadDetectPipe(pScrn, output);
+ if (connected)
return OUTPUT_STATUS_CONNECTED;
else
return OUTPUT_STATUS_DISCONNECTED;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_cursor.c new/xf86-video-intel.modesetting/src/i830_cursor.c
--- old/xf86-video-intel.modesetting/src/i830_cursor.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_cursor.c 2006-11-06 16:34:19.000000000 +0100
@@ -105,14 +105,15 @@
I830SetPipeCursor (ScrnInfoPtr pScrn, int pipe, Bool force)
{
I830Ptr pI830 = I830PTR(pScrn);
+ I830PipePtr pI830Pipe = &pI830->pipes[pipe];
CARD32 temp;
Bool show;
- if (!pI830->planeEnabled[pipe])
+ if (!pI830Pipe->planeEnabled)
return;
- show = pI830->cursorOn && pI830->cursorInRange[pipe];
- if (show && (force || !pI830->cursorShown[pipe]))
+ show = pI830->cursorOn && pI830Pipe->cursorInRange;
+ if (show && (force || !pI830Pipe->cursorShown))
{
if (IS_MOBILE(pI830) || IS_I9XX(pI830)) {
int cursor_control;
@@ -124,7 +125,7 @@
temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
if (pI830->CursorIsARGB) {
temp |= CURSOR_MODE_64_ARGB_AX;
- if (pI830->gammaEnabled[pipe])
+ if (pI830Pipe->gammaEnabled)
temp |= MCURSOR_GAMMA_ENABLE;
} else
temp |= CURSOR_MODE_64_4C_AX;
@@ -138,15 +139,15 @@
temp |= CURSOR_ENABLE;
if (pI830->CursorIsARGB) {
temp |= CURSOR_FORMAT_ARGB;
- if (pI830->gammaEnabled[pipe])
+ if (pI830Pipe->gammaEnabled)
temp |= CURSOR_GAMMA_ENABLE;
} else
temp |= CURSOR_FORMAT_3C;
OUTREG(CURSOR_CONTROL, temp);
}
- pI830->cursorShown[pipe] = TRUE;
+ pI830Pipe->cursorShown = TRUE;
}
- else if (!show && (force || pI830->cursorShown[pipe]))
+ else if (!show && (force || pI830Pipe->cursorShown))
{
if (IS_MOBILE(pI830) || IS_I9XX(pI830))
{
@@ -164,7 +165,7 @@
temp &= ~(CURSOR_ENABLE|CURSOR_GAMMA_ENABLE);
OUTREG(CURSOR_CONTROL, temp);
}
- pI830->cursorShown[pipe] = FALSE;
+ pI830Pipe->cursorShown = FALSE;
}
/* Flush cursor changes. */
@@ -179,7 +180,8 @@
int i;
DPRINTF(PFX, "I830InitHWCursor\n");
- for (i = 0; i < MAX_DISPLAY_PIPES; i++) pI830->cursorShown[i] = FALSE;
+ for (i = 0; i < MAX_DISPLAY_PIPES; i++)
+ pI830->pipes[i].cursorShown = FALSE;
/* Initialise the HW cursor registers, leaving the cursor hidden. */
if (IS_MOBILE(pI830) || IS_I9XX(pI830)) {
for (i = 0; i < MAX_DISPLAY_PIPES; i++)
@@ -484,11 +486,12 @@
for (pipe = 0; pipe < MAX_DISPLAY_PIPES; pipe++)
{
- DisplayModePtr mode = &pI830->pipeCurMode[pipe];
- int thisx = x - pI830->pipeX[pipe];
- int thisy = y - pI830->pipeY[pipe];
+ I830PipePtr pI830Pipe = &pI830->pipes[pipe];
+ DisplayModePtr mode = &pI830Pipe->curMode;
+ int thisx = x - pI830Pipe->x;
+ int thisy = y - pI830Pipe->y;
- if (!pI830->planeEnabled[pipe])
+ if (!pI830Pipe->planeEnabled)
continue;
/*
@@ -524,7 +527,7 @@
if (pipe == 1)
OUTREG(CURSOR_B_POSITION, temp);
- pI830->cursorInRange[pipe] = inrange;
+ pI830Pipe->cursorInRange = inrange;
I830SetPipeCursor (pScrn, pipe, FALSE);
}
@@ -577,14 +580,14 @@
DPRINTF(PFX, "I830SetCursorColors\n");
- if (pI830->planeEnabled[0])
+ if (pI830->pipes[0].planeEnabled)
{
OUTREG(CURSOR_A_PALETTE0, bg & 0x00ffffff);
OUTREG(CURSOR_A_PALETTE1, fg & 0x00ffffff);
OUTREG(CURSOR_A_PALETTE2, fg & 0x00ffffff);
OUTREG(CURSOR_A_PALETTE3, bg & 0x00ffffff);
}
- if (pI830->planeEnabled[1])
+ if (pI830->pipes[1].planeEnabled)
{
OUTREG(CURSOR_B_PALETTE0, bg & 0x00ffffff);
OUTREG(CURSOR_B_PALETTE1, fg & 0x00ffffff);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_display.c new/xf86-video-intel.modesetting/src/i830_display.c
--- old/xf86-video-intel.modesetting/src/i830_display.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_display.c 2006-11-06 16:34:19.000000000 +0100
@@ -237,6 +237,7 @@
i830PipeSetBase(ScrnInfoPtr pScrn, int pipe, int x, int y)
{
I830Ptr pI830 = I830PTR(pScrn);
+ I830PipePtr pI830Pipe = &pI830->pipes[pipe];
unsigned long Start;
int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);
int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
@@ -255,8 +256,8 @@
OUTREG(dspbase, Start + ((y * pScrn->displayWidth + x) * pI830->cpp));
}
- pI830->pipeX[pipe] = x;
- pI830->pipeY[pipe] = y;
+ pI830Pipe->x = x;
+ pI830Pipe->y = y;
}
/**
@@ -356,13 +357,19 @@
}
/**
- * Sets the given video mode on the given pipe. Assumes that plane A feeds
- * pipe A, and plane B feeds pipe B. Should not affect the other planes/pipes.
+ * Sets the given video mode on the given pipe.
+ *
+ * Plane A is always output to pipe A, and plane B to pipe B. The plane
+ * will not be enabled if plane_enable is FALSE, which is used for
+ * load detection, when something else will be output to the pipe other than
+ * display data.
*/
Bool
-i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe)
+i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe,
+ Bool plane_enable)
{
I830Ptr pI830 = I830PTR(pScrn);
+ I830PipePtr pI830Pipe = &pI830->pipes[pipe];
int m1 = 0, m2 = 0, n = 0, p1 = 0, p2 = 0;
CARD32 dpll = 0, fp = 0, temp;
CARD32 htot, hblank, hsync, vtot, vblank, vsync, dspcntr;
@@ -391,7 +398,7 @@
else
outputs = (pI830->operatingDevices >> 8) & 0xff;
- if (I830ModesEqual(&pI830->pipeCurMode[pipe], pMode))
+ if (I830ModesEqual(&pI830Pipe->curMode, pMode))
return TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Requested pix clock: %d\n",
@@ -576,7 +583,7 @@
FatalError("unknown display bpp\n");
}
- if (pI830->gammaEnabled[pipe]) {
+ if (pI830Pipe->gammaEnabled) {
dspcntr |= DISPPLANE_GAMMA_ENABLE;
}
@@ -626,17 +633,19 @@
OUTREG(dspstride_reg, pScrn->displayWidth * pI830->cpp);
OUTREG(dspsize_reg, dspsize);
OUTREG(dsppos_reg, 0);
- i830PipeSetBase(pScrn, pipe, pI830->pipeX[pipe], pI830->pipeX[pipe]);
+ i830PipeSetBase(pScrn, pipe, pI830Pipe->x, pI830Pipe->y);
OUTREG(pipesrc_reg, pipesrc);
/* Then, turn the pipe on first */
temp = INREG(pipeconf_reg);
OUTREG(pipeconf_reg, temp | PIPEACONF_ENABLE);
- /* And then turn the plane on */
- OUTREG(dspcntr_reg, dspcntr);
+ if (plane_enable) {
+ /* And then turn the plane on */
+ OUTREG(dspcntr_reg, dspcntr);
+ }
- pI830->pipeCurMode[pipe] = *pMode;
+ pI830Pipe->curMode = *pMode;
return TRUE;
}
@@ -658,63 +667,49 @@
* internal TV) should have no outputs trying to pull data out of it, so
* we're ready to turn those off.
*/
- if (!pI830->planeEnabled[0]) {
- CARD32 dspcntr, pipeconf, dpll;
+ for (i = 0; i < MAX_DISPLAY_PIPES; i++) {
+ I830PipePtr pI830Pipe = &pI830->pipes[i];
+ int dspcntr_reg = pipe == 0 ? DSPACNTR : DSPBCNTR;
+ int pipeconf_reg = pipe == 0 ? PIPEACONF : PIPEBCONF;
+ int dpll_reg = pipe == 0 ? DPLL_A : DPLL_B;
+ CARD32 dspcntr, pipeconf, dpll;
+ char *pipe_name = pipe == 0 ? "A" : "B";
- dspcntr = INREG(DSPACNTR);
+ if (pI830Pipe->planeEnabled)
+ continue;
+
+ dspcntr = INREG(dspcntr_reg);
if (dspcntr & DISPLAY_PLANE_ENABLE) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling plane A\n");
- OUTREG(DSPACNTR, dspcntr & ~DISPLAY_PLANE_ENABLE);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling plane %s\n",
+ pipe_name);
+
+ OUTREG(dspcntr_reg, dspcntr & ~DISPLAY_PLANE_ENABLE);
/* Wait for vblank for the disable to take effect */
i830WaitForVblank(pScrn);
}
- pipeconf = INREG(PIPEACONF);
+ pipeconf = INREG(pipeconf_reg);
if (pipeconf & PIPEACONF_ENABLE) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling pipe A\n");
- OUTREG(PIPEACONF, pipeconf & ~PIPEACONF_ENABLE);
- }
-
- dpll = INREG(DPLL_A);
- if (dpll & DPLL_VCO_ENABLE) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DPLL A\n");
- OUTREG(DPLL_A, dpll & ~DPLL_VCO_ENABLE);
- }
-
- memset(&pI830->pipeCurMode[0], 0, sizeof(pI830->pipeCurMode[0]));
- }
-
- if (!pI830->planeEnabled[1]) {
- CARD32 dspcntr, pipeconf, dpll;
-
- dspcntr = INREG(DSPBCNTR);
- if (dspcntr & DISPLAY_PLANE_ENABLE) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling plane B\n");
- OUTREG(DSPBCNTR, dspcntr & ~DISPLAY_PLANE_ENABLE);
-
- /* Wait for vblank for the disable to take effect */
- i830WaitForVblank(pScrn);
- }
-
- pipeconf = INREG(PIPEBCONF);
- if (pipeconf & PIPEBCONF_ENABLE) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling pipe B\n");
- OUTREG(PIPEBCONF, pipeconf & ~PIPEBCONF_ENABLE);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling pipe %s\n",
+ pipe_name);
+ OUTREG(pipeconf_reg, pipeconf & ~PIPEACONF_ENABLE);
}
- dpll = INREG(DPLL_B);
+ dpll = INREG(dpll_reg);
if (dpll & DPLL_VCO_ENABLE) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DPLL B\n");
- OUTREG(DPLL_B, dpll & ~DPLL_VCO_ENABLE);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DPLL %s\n",
+ pipe_name);
+ OUTREG(dpll_reg, dpll & ~DPLL_VCO_ENABLE);
}
- memset(&pI830->pipeCurMode[1], 0, sizeof(pI830->pipeCurMode[1]));
+ memset(&pI830Pipe->curMode, 0, sizeof(pI830Pipe->curMode));
}
}
/**
- * This function sets the given mode on the active pipes.
+ * This function configures the screens in clone mode on
+ * all active outputs using a mode similar to the specified mode.
*/
Bool
i830SetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
@@ -732,31 +727,18 @@
didLock = I830DRILock(pScrn);
#endif
- if (pI830->operatingDevices & 0xff) {
- pI830->planeEnabled[0] = 1;
- } else {
- pI830->planeEnabled[0] = 0;
- }
-
- if (pI830->operatingDevices & 0xff00) {
- pI830->planeEnabled[1] = 1;
- } else {
- pI830->planeEnabled[1] = 0;
- }
+ pI830->pipes[0].planeEnabled = (pI830->operatingDevices & 0xff) != 0;
+ pI830->pipes[1].planeEnabled = (pI830->operatingDevices & 0xff00) != 0;
- for (i = 0; i < pI830->num_outputs; i++) {
+ for (i = 0; i < pI830->num_outputs; i++)
pI830->output[i].pre_set_mode(pScrn, &pI830->output[i], pMode);
- }
- if (pI830->planeEnabled[0]) {
- ok = i830PipeSetMode(pScrn, i830PipeFindClosestMode(pScrn, 0, pMode),
- 0);
- if (!ok)
- goto done;
- }
- if (pI830->planeEnabled[1]) {
- ok = i830PipeSetMode(pScrn, i830PipeFindClosestMode(pScrn, 1, pMode),
- 1);
+ for (i = 0; i < MAX_DISPLAY_PIPES; i++)
+ {
+ if (pI830->pipes[i].planeEnabled)
+ ok = i830PipeSetMode(pScrn, i830PipeFindClosestMode(pScrn, i,
+ pMode),
+ i, TRUE);
if (!ok)
goto done;
}
@@ -776,13 +758,10 @@
/* If we might have enabled/disabled some pipes, we need to reset
* cloning mode support.
*/
- if ((pI830->operatingDevices & 0x00ff) &&
- (pI830->operatingDevices & 0xff00))
- {
+ if (pI830->pipes[0].planeEnabled && pI830->pipes[1].planeEnabled)
pI830->Clone = TRUE;
- } else {
+ else
pI830->Clone = FALSE;
- }
/* If HW cursor currently showing, reset cursor state */
if (pI830->CursorInfoRec && !pI830->SWCursor && pI830->cursorOn)
@@ -817,12 +796,32 @@
for (i = 0; i < pI830->availablePipes; i++) {
CARD32 dspcntr = INREG(DSPACNTR + (DSPBCNTR - DSPACNTR) * i);
+ CARD32 pipeconf = INREG(PIPEACONF + (PIPEBCONF - PIPEACONF) * i);
+ Bool hw_plane_enable = (dspcntr & DISPLAY_PLANE_ENABLE) != 0;
+ Bool hw_pipe_enable = (pipeconf & PIPEACONF_ENABLE) != 0;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ " Pipe %c is %s\n",
+ 'A' + i, pI830->pipes[i].planeEnabled ? "on" : "off");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
" Display plane %c is now %s and connected to pipe %c.\n",
'A' + i,
- pI830->planeEnabled[i] ? "enabled" : "disabled",
+ pI830->pipes[i].planeEnabled ? "enabled" : "disabled",
dspcntr & DISPPLANE_SEL_PIPE_MASK ? 'B' : 'A');
+ if (hw_pipe_enable != pI830->pipes[i].planeEnabled) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ " Hardware claims pipe %c is %s while software "
+ "believes it is %s\n",
+ 'A' + i, hw_pipe_enable ? "on" : "off",
+ pI830->pipes[i].planeEnabled ? "on" : "off");
+ }
+ if (hw_plane_enable != pI830->pipes[i].planeEnabled) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ " Hardware claims plane %c is %s while software "
+ "believes it is %s\n",
+ 'A' + i, hw_plane_enable ? "on" : "off",
+ pI830->pipes[i].planeEnabled ? "on" : "off");
+ }
}
for (i = 0; i < pI830->num_outputs; i++) {
@@ -852,3 +851,99 @@
pI830->output[i].pipe == 0 ? 'A' : 'B');
}
}
+
+/**
+ * Get a pipe with a simple mode set on it for doing load-based monitor
+ * detection.
+ *
+ * It will be up to the load-detect code to adjust the pipe as appropriate for
+ * its requirements. The pipe will be connected to no other outputs.
+ *
+ * Currently this code will only succeed if there is a pipe with no outputs
+ * configured for it. In the future, it could choose to temporarily disable
+ * some outputs to free up a pipe for its use.
+ *
+ * \return monitor number, or -1 if no pipes are available.
+ */
+int
+i830GetLoadDetectPipe(ScrnInfoPtr pScrn, I830OutputPtr output)
+{
+ I830Ptr pI830 = I830PTR(pScrn);
+ Bool pipe_available[MAX_DISPLAY_PIPES];
+ int i;
+ /* VESA 640x480x72Hz mode to set on the pipe */
+ DisplayModeRec mode = {
+ NULL, NULL, "640x480", MODE_OK, M_T_DEFAULT,
+ 31500,
+ 640, 664, 704, 832, 0,
+ 480, 489, 491, 520, 0,
+ V_NHSYNC | V_NVSYNC,
+ 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ FALSE, FALSE, 0, NULL, 0, 0.0, 0.0
+ };
+
+ /* If the output is not marked disabled, check if it's already assigned
+ * to an active pipe, and is alone on that pipe. If so, we're done.
+ */
+ if (!output->disabled) {
+ int pipeconf_reg = (output->pipe == 0) ? PIPEACONF : PIPEBCONF;
+
+ if (INREG(pipeconf_reg) & PIPEACONF_ENABLE) {
+ /* Actually, maybe we don't need to be all alone on the pipe.
+ * The worst that should happen is false positives. Need to test,
+ * but actually fixing this during server startup is messy.
+ */
+#if 0
+ for (i = 0; i < pI830->num_outputs; i++) {
+ if (&pI830->output[i] != output &&
+ pI830->output[i].pipe == output->pipe)
+ {
+ return -1;
+ }
+ }
+#endif
+ return output->pipe;
+ }
+ }
+
+ for (i = 0; i < pI830->availablePipes; i++) {
+ pipe_available[i] = TRUE;
+ }
+
+ for (i = 0; i < pI830->num_outputs; i++) {
+ if (!pI830->output[i].disabled)
+ {
+ pipe_available[pI830->output[i].pipe] = FALSE;
+ }
+ }
+
+ for (i = 0; i < pI830->availablePipes; i++) {
+ if (pipe_available[i])
+ break;
+ }
+
+ if (i == pI830->availablePipes) {
+ return -1;
+ }
+ output->load_detect_temp = TRUE;
+ output->pipe = i;
+ output->disabled = FALSE;
+
+ I830xf86SetModeCrtc(&mode, INTERLACE_HALVE_V);
+
+ i830PipeSetMode(pScrn, &mode, i, FALSE);
+
+ return i;
+}
+
+void
+i830ReleaseLoadDetectPipe(ScrnInfoPtr pScrn, I830OutputPtr output)
+{
+ if (output->load_detect_temp) {
+ output->disabled = TRUE;
+ i830DisableUnusedFunctions(pScrn);
+ output->load_detect_temp = FALSE;
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_display.h new/xf86-video-intel.modesetting/src/i830_display.h
--- old/xf86-video-intel.modesetting/src/i830_display.h 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_display.h 2006-11-06 16:34:19.000000000 +0100
@@ -26,9 +26,12 @@
*/
/* i830_display.c */
-Bool i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe);
+Bool i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe,
+ Bool plane_enable);
void i830DisableUnusedFunctions(ScrnInfoPtr pScrn);
Bool i830SetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode);
void i830PipeSetBase(ScrnInfoPtr pScrn, int pipe, int x, int y);
void i830WaitForVblank(ScrnInfoPtr pScrn);
void i830DescribeOutputConfiguration(ScrnInfoPtr pScrn);
+int i830GetLoadDetectPipe(ScrnInfoPtr pScrn, I830OutputPtr output);
+void i830ReleaseLoadDetectPipe(ScrnInfoPtr pScrn, I830OutputPtr output);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_dri.c new/xf86-video-intel.modesetting/src/i830_dri.c
--- old/xf86-video-intel.modesetting/src/i830_dri.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_dri.c 2006-11-06 16:34:19.000000000 +0100
@@ -1485,7 +1485,7 @@
if (pI830->directRenderingEnabled && pI830->drmMinor >= 5) {
if (on) {
- if (pI830->planeEnabled[1])
+ if (pI830->pipes[1].planeEnabled)
pipe.pipe = DRM_I830_VBLANK_PIPE_B;
else
pipe.pipe = DRM_I830_VBLANK_PIPE_A;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_driver.c new/xf86-video-intel.modesetting/src/i830_driver.c
--- old/xf86-video-intel.modesetting/src/i830_driver.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_driver.c 2006-11-06 16:34:19.000000000 +0100
@@ -640,6 +640,7 @@
pI830 = I830PTR(pScrn);
for(p=0; p < pI830->availablePipes; p++) {
+ I830PipePtr pI830Pipe = &pI830->pipes[p];
if (p == 0) {
palreg = PALETTE_A;
@@ -653,10 +654,10 @@
dspsurf = DSPBSURF;
}
- if (pI830->planeEnabled[p] == 0)
+ if (pI830Pipe->planeEnabled == 0)
continue;
- pI830->gammaEnabled[p] = 1;
+ pI830Pipe->gammaEnabled = 1;
/* To ensure gamma is enabled we need to turn off and on the plane */
temp = INREG(dspreg);
@@ -1265,16 +1266,6 @@
pI830->LinearAlloc = 0;
}
- pI830->fixedPipe = -1;
- if ((s = xf86GetOptValString(pI830->Options, OPTION_FIXEDPIPE)) &&
- I830IsPrimary(pScrn)) {
-
- if (strstr(s, "A") || strstr(s, "a") || strstr(s, "0"))
- pI830->fixedPipe = 0;
- else if (strstr(s, "B") || strstr(s, "b") || strstr(s, "1"))
- pI830->fixedPipe = 1;
- }
-
I830PreInitDDC(pScrn);
pI830->MonType1 = PIPE_NONE;
@@ -1681,16 +1672,6 @@
}
}
- if (IS_I9XX(pI830))
- pI830->newPipeSwitch = TRUE;
- else
- if (pI830->availablePipes == 2 && pI830->bios_version >= 3062) {
- /* BIOS build 3062 changed the pipe switching functionality */
- pI830->newPipeSwitch = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using new Pipe switch code\n");
- } else
- pI830->newPipeSwitch = FALSE;
-
PrintDisplayDeviceInfo(pScrn);
if (xf86IsEntityShared(pScrn->entityList[0])) {
@@ -2404,8 +2385,8 @@
}
if (IS_I965G(pI830)) {
- OUTREG(DSPASURF, pI830->saveDSPABASE);
- OUTREG(DSPBSURF, pI830->saveDSPBBASE);
+ OUTREG(DSPASURF, pI830->saveDSPASURF);
+ OUTREG(DSPBSURF, pI830->saveDSPBSURF);
}
OUTREG(VCLK_DIVISOR_VGA0, pI830->saveVCLK_DIVISOR_VGA0);
@@ -3400,7 +3381,8 @@
I830EnterVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- I830Ptr pI830 = I830PTR(pScrn);
+ I830Ptr pI830 = I830PTR(pScrn);
+ int i;
DPRINTF(PFX, "Enter VT\n");
@@ -3431,7 +3413,8 @@
SetHWOperatingState(pScrn);
/* Mark that we'll need to re-set the mode for sure */
- memset(pI830->pipeCurMode, 0, sizeof(pI830->pipeCurMode));
+ for (i = 0; i < MAX_DISPLAY_PIPES; i++)
+ memset(&pI830->pipes[i].curMode, 0, sizeof(pI830->pipes[i].curMode));
if (!i830SetMode(pScrn, pScrn->currentMode))
return FALSE;
@@ -3584,7 +3567,7 @@
base = DSPBADDR;
surf = DSPBSURF;
}
- if (pI830->planeEnabled[i]) {
+ if (pI830->pipes[i].planeEnabled) {
temp = INREG(ctrl);
if (on)
temp |= DISPLAY_PLANE_ENABLE;
@@ -3633,7 +3616,7 @@
ctrl = DSPBCNTR;
base = DSPBADDR;
}
- if (pI830->planeEnabled[i]) {
+ if (pI830->pipes[i].planeEnabled) {
temp = INREG(ctrl);
if (PowerManagementMode == DPMSModeOn)
temp |= DISPLAY_PLANE_ENABLE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_modes.c new/xf86-video-intel.modesetting/src/i830_modes.c
--- old/xf86-video-intel.modesetting/src/i830_modes.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_modes.c 2006-11-06 16:34:19.000000000 +0100
@@ -385,27 +385,6 @@
}
/**
- * Appends a list of modes to another mode list, without duplication.
- */
-static void
-i830AppendModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
- DisplayModePtr addModes)
-{
- DisplayModePtr first = *modeList;
- DisplayModePtr last = i830GetModeListTail(first);
-
- if (addModes == NULL)
- return;
-
- if (first == NULL) {
- *modeList = addModes;
- } else {
- last->next = addModes;
- addModes->prev = last;
- }
-}
-
-/**
* This function removes a mode from a list of modes. It should probably be
* moved to xf86Mode.c.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_randr.c new/xf86-video-intel.modesetting/src/i830_randr.c
--- old/xf86-video-intel.modesetting/src/i830_randr.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_randr.c 2006-11-06 16:34:19.000000000 +0100
@@ -489,12 +489,13 @@
struct _I830OutputRec *output;
RROutputPtr rrout;
int pipe = (int) crtc->devPrivate;
+ I830PipePtr pI830Pipe = &pI830->pipes[pipe];
int i, j;
- DisplayModePtr pipeMode = &pI830->pipeCurMode[pipe];
+ DisplayModePtr pipeMode = &pI830Pipe->curMode;
int pipe_type;
- x = pI830->pipeX[pipe];
- y = pI830->pipeY[pipe];
+ x = pI830Pipe->x;
+ y = pI830Pipe->y;
rotation = RR_Rotate_0;
numOutputs = 0;
for (i = 0; i < pI830->num_outputs; i++)
@@ -550,6 +551,7 @@
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
I830Ptr pI830 = I830PTR(pScrn);
int pipe = (int) (crtc->devPrivate);
+ I830PipePtr pI830Pipe = &pI830->pipes[pipe];
DisplayModePtr display_mode = mode ? mode->devPrivate : NULL;
/* Sync the engine before adjust mode */
@@ -560,10 +562,10 @@
if (display_mode != randrp->modes[pipe])
{
- pI830->planeEnabled[pipe] = mode != NULL;
+ pI830Pipe->planeEnabled = mode != NULL;
if (display_mode)
{
- if (!i830PipeSetMode (pScrn, display_mode, pipe))
+ if (!i830PipeSetMode (pScrn, display_mode, pipe, TRUE))
return FALSE;
/* XXX need I830SDVOPostSetMode here */
}
@@ -833,18 +835,15 @@
{
int mmWidth, mmHeight;
- if (mode->HDisplay == pScreen->width &&
- mode->VDisplay == pScreen->height)
- {
- mmWidth = pScrn->widthmm;
- mmHeight = pScrn->heightmm;
- }
- else
- {
-#define MMPERINCH 25.4
- mmWidth = (double) mode->HDisplay / pScrn->xDpi * MMPERINCH;
- mmHeight = (double) mode->VDisplay / pScrn->yDpi * MMPERINCH;
- }
+ mmWidth = pScreen->mmWidth;
+ mmHeight = pScreen->mmHeight;
+ if (mode->HDisplay != pScreen->width)
+ mmWidth = mmWidth * mode->HDisplay / pScreen->width;
+ if (mode->VDisplay == pScreen->height)
+ mmHeight = mmHeight * mode->VDisplay / pScreen->height;
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Setting screen physical size to %d x %d\n",
+ mmWidth, mmHeight);
I830RandRScreenSetSize (pScreen,
mode->HDisplay,
mode->VDisplay,
@@ -874,7 +873,6 @@
rp->rrCrtcSet = I830RandRCrtcSet;
rp->rrCrtcSetGamma = I830RandRCrtcSetGamma;
rp->rrSetConfig = NULL;
- memset (rp->modes, '\0', sizeof (rp->modes));
pScrn->PointerMoved = I830RandRPointerMoved;
return TRUE;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel.modesetting/src/i830_xf86Modes.c new/xf86-video-intel.modesetting/src/i830_xf86Modes.c
--- old/xf86-video-intel.modesetting/src/i830_xf86Modes.c 2006-11-03 16:39:18.000000000 +0100
+++ new/xf86-video-intel.modesetting/src/i830_xf86Modes.c 2006-11-06 16:34:19.000000000 +0100
@@ -317,7 +317,7 @@
#if 0
if (mode->Flags & V_CLKDIV2) add(&flags, "vclk/2");
#endif
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(scrnIndex, X_INFO,
"Modeline \"%s\"x%.01f %6.2f %i %i %i %i %i %i %i %i%s "
"(%.01f kHz)\n",
mode->name, mode->VRefresh, mode->Clock/1000., mode->HDisplay,
++++++ xf86-video-rendition-4.1.1.tar.bz2 -> xf86-video-rendition-4.1.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/ChangeLog new/xf86-video-rendition-4.1.2/ChangeLog
--- old/xf86-video-rendition-4.1.1/ChangeLog 2006-10-12 00:26:52.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/ChangeLog 2006-11-05 19:02:34.000000000 +0100
@@ -1,64 +1,318 @@
-2006-04-12 Adam Jackson
+commit 59db4ddcaee381595e4a134de3cc5f6eb8de4fe8
+Author: Matthieu Herrb
+Date: Sun Nov 5 19:01:56 2006 +0100
- * src/vloaduc.c:
- Bug #6564: Additional #include for POSIX. (Matthieu Herrb)
+ Bump to 4.1.2
-2006-04-07 Adam Jackson
+commit 998f5b0fd8f66d248941c0f827bb4912d3bbde93
+Author: Matthieu Herrb
+Date: Sun Nov 5 18:59:48 2006 +0100
- * configure.ac:
- * src/rendition.c:
- * src/rendition.h:
- * src/vloaduc.c:
- Unlibcwrap. Bump server version requirement. Bump to 4.1.0.
+ Replace ChangeLog with a generated file.
-2006-02-08 Luc Verhaegen
+commit d5ffaaa013c8109d894c7015f0258ca1802b0225
+Author: Matthieu Herrb
+Date: Sun Nov 5 18:14:57 2006 +0100
- * src/rendition.c: (renditionPreInit):
+ Add emacs droppings to .gitignore
- Cull ifdeffed out code which used to call xf86GetClocks.
- Rendition has programmable dotclock anyway.
+commit 9a8c7cc28d80cfb75a55a6896eed25b01f2eb0f6
+Author: Matthieu Herrb
+Date: Sun Nov 5 18:14:22 2006 +0100
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ renamed: .cvsignore -> .gitignore
- * configure.ac:
- Update package version for X11R7 release.
+commit 6dd36416843d033b041864c78832bb4fa6c66fd2
+Author: Matthieu Herrb
+Date: Sun Nov 5 18:12:02 2006 +0100
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Build fix for systems with instead of . Bugzilla #7707.
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 9935b3093922798e26d79ae7182d86e0cafa91f5
+Author: Adam Jackson
+Date: Fri Oct 13 18:40:46 2006 -0400
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 4.1.1
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 4dfc16c59d34780e514d06d74c6cb8ef9f5ad22f
+Author: Adam Jackson
+Date: Wed Apr 12 20:30:03 2006 +0000
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bug #6564: Additional #include for POSIX. (Matthieu Herrb)
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit c59c3f4f0854b0bb27a5378d58ebaa3fb0814494
+Author: Adam Jackson
+Date: Fri Apr 7 19:47:58 2006 +0000
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Unlibcwrap. Bump server version requirement. Bump to 4.1.0.
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit 0723e761f846fa55e850eba14406a106c784dd52
+Author: Luc Verhaegen
+Date: Wed Feb 8 13:08:54 2006 +0000
-2005-11-29 Adam Jackson
+ Rendition: Cull ifdeffed out code which used to call xf86GetClocks.
+ Rendition has programmable dotclock anyway.
- * configure.ac:
- Only build dlloader modules by default.
+commit b8fdfed363a4345cb835c9ea7cd0ceca2db3c964
+Author: Kevin E Martin
+Date: Wed Dec 21 02:30:01 2005 +0000
-2005-11-11 Adam Jackson
+ Update package version for X11R7 release.
- * src/Makefile.am:
- Monolith parity, only install the .uc files, not .data
+commit cae4e36cd8723c6932f5b467c0880ece3e53c636
+Author: Adam Jackson
+Date: Mon Dec 19 16:25:54 2005 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Stub COPYING files
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 98b1f6995d4f08494e27d3ce5310474bdc10a463
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:18 2005 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for final X11R7 release candidate.
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit 34b294994fa03eeda73293865dcc273c10268b5d
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:36 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 725c2003e1e4ab4b84b8a66fe1178b6824ba227e
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:34 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit ce7ac7a45bc95817afd1eeacfcf512c4285c685e
+Author: Kevin E Martin
+Date: Fri Dec 2 02:16:09 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 0f9d833c0c537ccca8473525b9ddb6e327651230
+Author: Adam Jackson
+Date: Tue Nov 29 23:30:00 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 259b50ea6c99df34c1c7fd5664b4f41389ec6f66
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:04:10 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit c8d78848d2690488be409bfa4cc68b5592ae73a9
+Author: Eric Anholt
+Date: Mon Nov 21 10:49:16 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit ea9a31afadd414b98e7d9da885e8746bc69f2253
+Author: Adam Jackson
+Date: Fri Nov 11 20:23:36 2005 +0000
+
+ Monolith parity, only install the .uc files, not .data
+
+commit 03aef516214058e956706b9be3749863e8e60232
+Author: Kevin E Martin
+Date: Wed Nov 9 21:31:21 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 9888b941c84b632d670b4764157b36a677edcd7e
+Author: Kevin E Martin
+Date: Wed Nov 9 21:15:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 2e19028b6b96675cdd8dc283e25a720eb16a6aca
+Author: Kean Johnson
+Date: Tue Nov 8 06:33:28 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit 625d7c3bee425ecf8d154776448bf15bd97d8525
+Author: Kevin E Martin
+Date: Tue Nov 1 15:08:54 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit b7e9f7f67b01848786a53a7a910a1062d334ad72
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:04 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 515103e0af4a3b77ed0954f3fdad492177325ec4
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:01:54 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 2e861a9f1012c62b2355391217028c276c8f9e8a
+Author: Adam Jackson
+Date: Mon Oct 17 22:57:35 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 8c7050a21016623fc134877644145a95f2cd74cf
+Author: Alan Coopersmith
+Date: Mon Oct 17 00:09:04 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit f7efbfaa8c4f68a7c26a87da3f3d1e2a05bfff8c
+Author: Adam Jackson
+Date: Thu Oct 13 21:16:32 2005 +0000
+
+ Remove orphaned references to xf[14]bpp.
+
+commit 63d931868260f82fde17767efb21db592ca4df33
+Author: Søren Sandmann Pedersen
+Date: Tue Oct 4 20:01:03 2005 +0000
+
+ Check in generated README files
+
+commit 31d5b943184c592a232435996d079009bff2410c
+Author: Søren Sandmann Pedersen
+Date: Mon Oct 3 21:22:08 2005 +0000
+
+ - For all drivers that have a <driver>.sgml file, add code in their build
+ system to build the README file at make dist time
+ - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
+ will check if the required tools and files exist, and if so set a
+ conditional.
+ - util/modular/symlink.sh
+ - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
+ - Add all the README.<driver> to the list of excluded files
+ - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
+ it spew less warnings when the text file is built.
+
+commit a0aa21229a97d6e2111b607312f4144da05d7f68
+Author: Søren Sandmann Pedersen
+Date: Wed Sep 28 15:58:45 2005 +0000
+
+ Dist data to make rendition driver pass distcheck
+
+commit 7a6cdd84fca0b55fbcebac37e9d2c2dd6ad09d7c
+Author: Søren Sandmann Pedersen
+Date: Tue Sep 27 22:22:16 2005 +0000
+
+ Add some files to the rendition and sunffb build systems
+
+commit f957da4c5f904557804a3113add92969d5c7ae0e
+Author: Eric Anholt
+Date: Wed Sep 14 07:56:55 2005 +0000
+
+ Install the microcode in the modules dir, as the monolithic build does.
+
+commit 8abe45c3ae9d1eada32f001d8e731262fbadd680
+Author: Daniel Stone
+Date: Thu Aug 18 09:03:47 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit ef7921174f0254945afcb897609f7dfe5117081a
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:44 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit a705b3f7934be052f001603b58dce1f089aff91a
+Author: Søren Sandmann Pedersen
+Date: Tue Jul 26 18:45:47 2005 +0000
+
+ Build system for rendition
+
+commit 9accd592ec5f3afa5777872008d81624bbbffe54
+Author: Adam Jackson
+Date: Mon Jul 11 02:29:58 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 6567bb5128407e9e098b602b1b0d5cd94d7bfc0b
+Author: Adam Jackson
+Date: Sat Jun 25 21:16:55 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit bd23ae5f99a76f7ea784f62a30544f31baedb307
+Author: Daniel Stone
+Date: Wed Apr 20 12:25:29 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to for Xtrans files.
+
+commit 8352e1febb4136d28a66b0daa248b419c420b6af
+Author: Eric Anholt
+Date: Wed Jun 16 09:24:13 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 583f85aad19d41987a089d28acded5e846aff71c
+Author: Egbert Eich
+Date: Fri Apr 23 19:42:41 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 3be5437c8270dc20e271f9f692d246dda5b84c60
+Author: Egbert Eich
+Date: Sun Mar 14 08:33:30 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 7adf752647c09920ce46a347a6e39aa8bc89dd55
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:23 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit acf9f479b6759f9c9d71829ee28ca4db0acfeca4
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:54 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit e3035db18f828ef26fada297dcb3ad3c05d46033
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:23 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 5c1c3690ddc5161f424b16e39f827288bd4e19e1
+Author: Egbert Eich
+Date: Thu Jan 29 08:08:36 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 0f7b2fb64d8a84cf5b4b2394a4d8ed95b56aa4d3
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:38 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit fccdc80b12e14862e954520a14aa3df14e795961
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 5829e7dac95cea113b0895e7a5a3625bbf8a0529
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/Makefile.am new/xf86-video-rendition-4.1.2/Makefile.am
--- old/xf86-video-rendition-4.1.1/Makefile.am 2006-10-12 00:26:52.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/Makefile.am 2006-11-05 18:56:36.000000000 +0100
@@ -27,3 +27,12 @@
endif
EXTRA_DIST = README.sgml
+
+CLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ git-log > ChangeLog
+
+dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/Makefile.in new/xf86-video-rendition-4.1.2/Makefile.in
--- old/xf86-video-rendition-4.1.1/Makefile.in 2006-10-14 00:40:23.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/Makefile.in 2006-11-05 19:02:14.000000000 +0100
@@ -222,6 +222,7 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = README.sgml
+CLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -463,6 +464,9 @@
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -582,6 +586,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -644,7 +649,7 @@
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -659,6 +664,13 @@
@BUILD_LINUXDOC_TRUE@README: README.sgml
@BUILD_LINUXDOC_TRUE@ $(MAKE_TEXT) README.sgml && mv README.txt README
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ git-log > ChangeLog
+
+dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/aclocal.m4 new/xf86-video-rendition-4.1.2/aclocal.m4
--- old/xf86-video-rendition-4.1.1/aclocal.m4 2006-10-14 00:40:19.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/aclocal.m4 2006-11-05 19:02:09.000000000 +0100
@@ -6568,69 +6568,35 @@
fi[]dnl
])# PKG_CHECK_MODULES
+dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $
dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
+dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the
-dnl "Software"), to deal in the Software without restriction, including
-dnl without limitation the rights to use, copy, modify, merge, publish,
-dnl distribute, and/or sell copies of the Software, and to permit persons
-dnl to whom the Software is furnished to do so, provided that the above
-dnl copyright notice(s) and this permission notice appear in all copies of
-dnl the Software and that both the above copyright notice(s) and this
-dnl permission notice appear in supporting documentation.
-dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of a copyright holder
-dnl shall not be used in advertising or otherwise to promote the sale, use
-dnl or other dealings in this Software without prior written authorization
-dnl of the copyright holder.
-
-# XORG_MACROS_VERSION(required-version)
-# -------------------------------------
-# Minimum version: 1.1.0
-#
-# If you're using a macro added in Version 1.1 or newer, include this in
-# your configure.ac with the minimum required version, such as:
-# XORG_MACROS_VERSION(1.1)
-#
-# To force at least a version with this macro defined, also add:
-# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-#
-#
-# See the "minimum version" comment for each macro you use to see what
-# version you require.
-AC_DEFUN([XORG_MACROS_VERSION],[
- [XORG_MACROS_needed_version=$1
- XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
- XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
- AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.1
- XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
- XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
- if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
- AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
- fi
- if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
- AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
- fi
- AC_MSG_RESULT([yes, $XORG_MACROS_version])
-]) # XORG_MACROS_VERSION
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl
# XORG_PROG_RAWCPP()
# ------------------
-# Minimum version: 1.0.0
-#
# Find cpp program and necessary flags for use in pre-processing text files
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
@@ -6673,8 +6639,6 @@
# XORG_MANPAGE_SECTIONS()
# -----------------------
-# Minimum version: 1.0.0
-#
# Determine which sections man pages go in for the different man page types
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
@@ -6684,47 +6648,75 @@
AC_REQUIRE([AC_CANONICAL_HOST])
if test x$APP_MAN_SUFFIX = x ; then
- APP_MAN_SUFFIX=1
+ case $host_os in
+ linux* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
+ *) APP_MAN_SUFFIX=1 ;;
+ esac
fi
if test x$APP_MAN_DIR = x ; then
- APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+ case $host_os in
+ linux* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
+ *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+ esac
fi
if test x$LIB_MAN_SUFFIX = x ; then
- LIB_MAN_SUFFIX=3
+ case $host_os in
+ linux* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;;
+ *) LIB_MAN_SUFFIX=3 ;;
+ esac
fi
if test x$LIB_MAN_DIR = x ; then
- LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+ case $host_os in
+ linux* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;;
+ *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+ esac
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
+ linux* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+ case $host_os in
+ linux* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
+ *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+ esac
fi
+# In Imake's linux.cf, the misc man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
+# linux* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+ case $host_os in
+# linux* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;;
+ *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+ esac
fi
+# In Imake's linux.cf, the driver man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
+# linux* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+ case $host_os in
+# linux* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+ *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+ esac
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -6754,8 +6746,6 @@
# XORG_CHECK_LINUXDOC
# -------------------
-# Minimum version: 1.0.0
-#
# Defines the variable MAKE_TEXT if the necessary tools and
# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
# Whether or not the necessary tools and files are found can be checked
@@ -6807,8 +6797,6 @@
# XORG_CHECK_MALLOC_ZERO
# ----------------------
-# Minimum version: 1.0.0
-#
# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
# malloc(0) returns NULL. Packages should add one of these cflags to
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
@@ -6853,78 +6841,6 @@
AC_SUBST([XTMALLOC_ZERO_CFLAGS])
]) # XORG_CHECK_MALLOC_ZERO
-# XORG_WITH_LINT()
-# ----------------
-# Minimum version: 1.1.0
-#
-# Sets up flags for source checkers such as lint and sparse if --with-lint
-# is specified. (Use --with-lint=sparse for sparse.)
-# Sets $LINT to name of source checker passed with --with-lint (default: lint)
-# Sets $LINT_FLAGS to flags to pass to source checker
-# Sets LINT automake conditional if enabled (default: disabled)
-#
-AC_DEFUN([XORG_WITH_LINT],[
-
-# Allow checking code with lint, sparse, etc.
-AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
- [Use a lint-style source code checker (default: disabled)])],
- [use_lint=$withval], [use_lint=no])
-if test "x$use_lint" = "xyes" ; then
- LINT="lint"
-else
- LINT="$use_lint"
-fi
-if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
- case $LINT in
- lint|*/lint)
- case $host_os in
- solaris*)
- LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
- ;;
- esac
- ;;
- esac
-fi
-
-AC_SUBST(LINT)
-AC_SUBST(LINT_FLAGS)
-AM_CONDITIONAL(LINT, [test x$LINT != xno])
-
-]) # XORG_WITH_LINT
-
-# XORG_LINT_LIBRARY(LIBNAME)
-# --------------------------
-# Minimum version: 1.1.0
-#
-# Sets up flags for building lint libraries for checking programs that call
-# functions in the library.
-# Disabled by default, enable with --enable-lint-library
-# Sets:
-# @LINTLIB@ - name of lint library file to make
-# MAKE_LINT_LIB - automake conditional
-#
-
-AC_DEFUN([XORG_LINT_LIBRARY],[
-AC_REQUIRE([XORG_WITH_LINT])
-# Build lint "library" for more indepth checks of programs calling this library
-AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
- [Create lint library (default: disabled)])],
- [make_lint_lib=$enableval], [make_lint_lib=no])
-if test "x$make_lint_lib" != "xno" ; then
- if test "x$LINT" = "xno" ; then
- AC_MSG_ERROR([Cannot make lint library without --with-lint])
- fi
- if test "x$make_lint_lib" = "xyes" ; then
- LINTLIB=llib-l$1.ln
- else
- LINTLIB=$make_lint_lib
- fi
-fi
-AC_SUBST(LINTLIB)
-AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
-
-]) # XORG_LINT_LIBRARY
-
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/config.h.in new/xf86-video-rendition-4.1.2/config.h.in
--- old/xf86-video-rendition-4.1.1/config.h.in 2006-10-14 00:40:31.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/config.h.in 2006-11-05 19:02:34.000000000 +0100
@@ -5,6 +5,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_ELF_ABI_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_ELF_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/configure new/xf86-video-rendition-4.1.2/configure
--- old/xf86-video-rendition-4.1.1/configure 2006-10-14 00:40:22.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/configure 2006-11-05 19:02:13.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xf86-video-rendition 4.1.1.
+# Generated by GNU Autoconf 2.59 for xf86-video-rendition 4.1.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-rendition'
PACKAGE_TARNAME='xf86-video-rendition'
-PACKAGE_VERSION='4.1.1'
-PACKAGE_STRING='xf86-video-rendition 4.1.1'
+PACKAGE_VERSION='4.1.2'
+PACKAGE_STRING='xf86-video-rendition 4.1.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -966,7 +966,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-rendition 4.1.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-rendition 4.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1032,7 +1032,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-rendition 4.1.1:";;
+ short | recursive ) echo "Configuration of xf86-video-rendition 4.1.2:";;
esac
cat <<\_ACEOF
@@ -1181,7 +1181,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-rendition configure 4.1.1
+xf86-video-rendition configure 4.1.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1195,7 +1195,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-rendition $as_me 4.1.1, which was
+It was created by xf86-video-rendition $as_me 4.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1843,7 +1843,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-rendition'
- VERSION='4.1.1'
+ VERSION='4.1.2'
cat >>confdefs.h <<_ACEOF
@@ -20094,6 +20094,157 @@
+for ac_header in elf.h elf_abi.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
DRIVER_NAME=rendition
@@ -20103,47 +20254,75 @@
if test x$APP_MAN_SUFFIX = x ; then
- APP_MAN_SUFFIX=1
+ case $host_os in
+ linux* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
+ *) APP_MAN_SUFFIX=1 ;;
+ esac
fi
if test x$APP_MAN_DIR = x ; then
- APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+ case $host_os in
+ linux* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
+ *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+ esac
fi
if test x$LIB_MAN_SUFFIX = x ; then
- LIB_MAN_SUFFIX=3
+ case $host_os in
+ linux* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;;
+ *) LIB_MAN_SUFFIX=3 ;;
+ esac
fi
if test x$LIB_MAN_DIR = x ; then
- LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+ case $host_os in
+ linux* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;;
+ *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+ esac
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
+ linux* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+ case $host_os in
+ linux* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
+ *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+ esac
fi
+# In Imake's linux.cf, the misc man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
+# linux* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+ case $host_os in
+# linux* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;;
+ *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+ esac
fi
+# In Imake's linux.cf, the driver man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
+# linux* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+ case $host_os in
+# linux* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+ *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+ esac
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -20762,7 +20941,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by xf86-video-rendition $as_me 4.1.1, which was
+This file was extended by xf86-video-rendition $as_me 4.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20825,7 +21004,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-rendition config.status 4.1.1
+xf86-video-rendition config.status 4.1.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/configure.ac new/xf86-video-rendition-4.1.2/configure.ac
--- old/xf86-video-rendition-4.1.1/configure.ac 2006-10-14 00:40:09.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/configure.ac 2006-11-05 19:00:37.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.1.1,
+ 4.1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
@@ -60,6 +60,7 @@
# Checks for header files.
AC_HEADER_STDC
+AC_CHECK_HEADERS([elf.h] [elf_abi.h])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-rendition-4.1.1/src/vloaduc.c new/xf86-video-rendition-4.1.2/src/vloaduc.c
--- old/xf86-video-rendition-4.1.1/src/vloaduc.c 2006-10-12 00:26:52.000000000 +0200
+++ new/xf86-video-rendition-4.1.2/src/vloaduc.c 2006-11-05 18:30:37.000000000 +0100
@@ -12,12 +12,17 @@
#include "v1krisc.h"
#include "vloaduc.h"
#include "vos.h"
-#include "elf.h"
#include
#include
#include
#include
+#ifdef HAVE_ELF_H
+#include
+#endif
+#ifdef HAVE_ELF_ABI_H
+#include
+#endif
/*
* defines
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org