forked from pool/xorg-x11-server
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
a2eb7a9f58
commit
fc9df3f737
16
64bit-portability-issue.diff
Normal file
16
64bit-portability-issue.diff
Normal file
@ -0,0 +1,16 @@
|
||||
--- composite/compinit.c.orig 2008-06-27 19:54:41.000000000 +0000
|
||||
+++ composite/compinit.c 2008-06-27 20:10:45.000000000 +0000
|
||||
@@ -122,11 +122,11 @@
|
||||
if (ret && (mask & CWBackingStore)) {
|
||||
if (pWin->backingStore != NotUseful) {
|
||||
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
|
||||
- pWin->backStorage = TRUE;
|
||||
+ pWin->backStorage = (pointer) TRUE;
|
||||
} else {
|
||||
compUnredirectWindow(serverClient, pWin,
|
||||
CompositeRedirectAutomatic);
|
||||
- pWin->backStorage = FALSE;
|
||||
+ pWin->backStorage = (pointer) FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6aa8a9c0eeb7a8bb86230d87b7bf0a99e5c07bc75892df47559b209dd807e19c
|
||||
size 3427683
|
||||
@ -1,11 +0,0 @@
|
||||
--- hw/xfree86/xaa/xaaInitAccel.c.orig 2007-11-06 15:45:37.000000000 +0100
|
||||
+++ hw/xfree86/xaa/xaaInitAccel.c 2008-04-10 06:38:52.000000000 +0200
|
||||
@@ -542,7 +542,7 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoR
|
||||
#define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
|
||||
|
||||
if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
|
||||
- !xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
|
||||
+ !xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS, TRUE)) {
|
||||
XAAMSG("\tOffscreen Pixmaps\n");
|
||||
} else {
|
||||
infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
|
||||
@ -42,20 +42,20 @@ index 03c2c3a..843efb7 100644
|
||||
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
|
||||
|
||||
relink:
|
||||
--- xorg-server-1.4.0.90/configure.ac.orig 2008-04-05 02:06:32.000000000 +0000
|
||||
+++ xorg-server-1.4.0.90/configure.ac 2008-04-05 02:12:34.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
--- xorg-server-1.4.99.902/configure.ac.orig 2008-06-16 19:17:48.000000000 +0200
|
||||
+++ xorg-server-1.4.99.902/configure.ac 2008-06-16 19:24:06.000000000 +0200
|
||||
@@ -466,7 +466,7 @@
|
||||
AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
|
||||
[ FONTDIR="$withval" ],
|
||||
[ FONTDIR="${libdir}/X11/fonts" ])
|
||||
-DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
|
||||
+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
|
||||
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
|
||||
[ FONTPATH="$withval" ],
|
||||
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
|
||||
--- xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2007-12-07 02:38:42.000000000 +0000
|
||||
+++ xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-04-05 02:14:06.000000000 +0000
|
||||
@@ -1920,15 +1920,13 @@
|
||||
case $host_os in
|
||||
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
|
||||
esac
|
||||
--- xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2008-04-10 20:58:01.000000000 +0200
|
||||
+++ xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-06-16 19:26:46.000000000 +0200
|
||||
@@ -1908,14 +1908,12 @@
|
||||
{
|
||||
/* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/
|
||||
"/local/",
|
||||
@ -63,7 +63,6 @@ index 03c2c3a..843efb7 100644
|
||||
+ "/misc/:unscaled",
|
||||
"/75dpi/:unscaled",
|
||||
"/100dpi/:unscaled",
|
||||
"/Speedo/",
|
||||
"/Type1/",
|
||||
"/TrueType/",
|
||||
"/freefont/",
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
+#ifdef DPMSExtension
|
||||
+ XFD_ANDSET(&tmp_set, &devicesReadable, &EnabledDevices);
|
||||
+ if (XFD_ANYSET (&tmp_set) && (DPMSPowerLevel != DPMSModeOn))
|
||||
+ DPMSSet(DPMSModeOn);
|
||||
+ DPMSSet(serverClient, DPMSModeOn);
|
||||
+#endif
|
||||
+
|
||||
if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- hw/xfree86/modes/xf86EdidModes.c.orig 2007-09-29 17:01:58.097559000 +0200
|
||||
+++ hw/xfree86/modes/xf86EdidModes.c 2007-09-29 17:03:07.269882000 +0200
|
||||
@@ -401,8 +401,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr
|
||||
|
||||
Monitor->DDC = DDC;
|
||||
|
||||
- Monitor->widthmm = 10 * DDC->features.hsize;
|
||||
- Monitor->heightmm = 10 * DDC->features.vsize;
|
||||
+ if (!Monitor->widthmm)
|
||||
+ Monitor->widthmm = 10 * DDC->features.hsize;
|
||||
+ if (!Monitor->heightmm)
|
||||
+ Monitor->heightmm = 10 * DDC->features.vsize;
|
||||
|
||||
/* If this is a digital display, then we can use reduced blanking */
|
||||
if (DDC->features.input_type)
|
||||
@ -1,53 +0,0 @@
|
||||
commit 184e571957f697f2a125dc9c9da0c7dfb92c2cd9
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Tue Nov 20 13:05:26 2007 +0100
|
||||
|
||||
Adjust offsets of modes that do not fit virtual screen size.
|
||||
|
||||
Fixes memory corruption if a too small "Virtual" was specified in xorg.conf
|
||||
for the selected multi-monitor configuration.
|
||||
|
||||
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
|
||||
index 653042c..760a498 100644
|
||||
--- a/hw/xfree86/modes/xf86Crtc.c
|
||||
+++ b/hw/xfree86/modes/xf86Crtc.c
|
||||
@@ -260,6 +260,30 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
|
||||
crtc->y = y;
|
||||
crtc->rotation = rotation;
|
||||
|
||||
+ /* Shift offsets that move us out of virtual size */
|
||||
+ if (x + mode->HDisplay > xf86_config->maxWidth ||
|
||||
+ y + mode->VDisplay > xf86_config->maxHeight)
|
||||
+ {
|
||||
+ if (x + mode->HDisplay > xf86_config->maxWidth)
|
||||
+ crtc->x = xf86_config->maxWidth - mode->HDisplay;
|
||||
+ if (y + mode->VDisplay > xf86_config->maxHeight)
|
||||
+ crtc->y = xf86_config->maxHeight - mode->VDisplay;
|
||||
+ if (crtc->x < 0 || crtc->y < 0)
|
||||
+ {
|
||||
+ xf86DrvMsg (scrn->scrnIndex, X_ERROR,
|
||||
+ "Mode %dx%d does not fit virtual size %dx%d - "
|
||||
+ "internal error\n", mode->HDisplay, mode->VDisplay,
|
||||
+ xf86_config->maxWidth, xf86_config->maxHeight);
|
||||
+ goto done;
|
||||
+ }
|
||||
+ xf86DrvMsg (scrn->scrnIndex, X_ERROR,
|
||||
+ "Mode %dx%d+%d+%d does not fit virtual size %dx%d - "
|
||||
+ "offset updated to +%d+%d\n",
|
||||
+ mode->HDisplay, mode->VDisplay, x, y,
|
||||
+ xf86_config->maxWidth, xf86_config->maxHeight,
|
||||
+ crtc->x, crtc->y);
|
||||
+ }
|
||||
+
|
||||
/* XXX short-circuit changes to base location only */
|
||||
|
||||
/* Pass our mode to the outputs and the CRTC to give them a chance to
|
||||
@@ -301,7 +325,7 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
|
||||
/* Set up the DPLL and any output state that needs to adjust or depend
|
||||
* on the DPLL.
|
||||
*/
|
||||
- crtc->funcs->mode_set(crtc, mode, adjusted_mode, x, y);
|
||||
+ crtc->funcs->mode_set(crtc, mode, adjusted_mode, crtc->x, crtc->y);
|
||||
for (i = 0; i < xf86_config->num_output; i++)
|
||||
{
|
||||
xf86OutputPtr output = xf86_config->output[i];
|
||||
@ -1,26 +0,0 @@
|
||||
commit 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f
|
||||
Author: Keith Packard <keithp@koto.keithp.com>
|
||||
Date: Mon Oct 22 13:38:16 2007 -0700
|
||||
|
||||
Leave hardware-specified preferred modes alone when user preference exists.
|
||||
|
||||
Instead of removing the preference bit marking the hardware declared mode
|
||||
preference, leave it in place and just move the user preferred mode to the
|
||||
front of the list while marking it with the USERPREF bit which will cause it
|
||||
to be selected by the initial mode selection code.
|
||||
|
||||
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
|
||||
index 0a48d5b..bb416fd 100644
|
||||
--- a/hw/xfree86/modes/xf86Crtc.c
|
||||
+++ b/hw/xfree86/modes/xf86Crtc.c
|
||||
@@ -1417,9 +1417,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
|
||||
output->probed_modes = mode;
|
||||
}
|
||||
mode->type |= (M_T_PREFERRED|M_T_USERPREF);
|
||||
+ break;
|
||||
}
|
||||
- else
|
||||
- mode->type &= ~M_T_PREFERRED;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
commit c6c284e64b1f537a3243856cf78cf3f2324e4c2b
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Mon Nov 26 15:38:20 2007 +0100
|
||||
|
||||
Initialize Mode with 0 in xf86RandRModeConvert.
|
||||
|
||||
Asking for trouble if non-initialized values contain random data.
|
||||
|
||||
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
|
||||
index c1a06b2..61a7db3 100644
|
||||
--- a/hw/xfree86/modes/xf86RandR12.c
|
||||
+++ b/hw/xfree86/modes/xf86RandR12.c
|
||||
@@ -683,11 +683,8 @@ xf86RandRModeConvert (ScrnInfoPtr scrn,
|
||||
RRModePtr randr_mode,
|
||||
DisplayModePtr mode)
|
||||
{
|
||||
- mode->prev = NULL;
|
||||
- mode->next = NULL;
|
||||
- mode->name = NULL;
|
||||
+ memset(mode, 0, sizeof(DisplayModeRec));
|
||||
mode->status = MODE_OK;
|
||||
- mode->type = 0;
|
||||
|
||||
mode->Clock = randr_mode->mode.dotClock / 1000;
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
commit f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Mon Nov 12 15:11:03 2007 +0100
|
||||
|
||||
Only clear crtc of output if it is the one we're actually working on.
|
||||
|
||||
Upon recreation of the RandR internal data structures in RRCrtcNotify() the
|
||||
crtc of an output could be NULLed if the crtc was shared (cloned) between two
|
||||
outputs and one of them got another crtc assigned.
|
||||
|
||||
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
|
||||
index db5007e..43cfb29 100644
|
||||
--- a/randr/rrcrtc.c
|
||||
+++ b/randr/rrcrtc.c
|
||||
@@ -150,7 +150,8 @@ RRCrtcNotify (RRCrtcPtr crtc,
|
||||
break;
|
||||
if (i == numOutputs)
|
||||
{
|
||||
- crtc->outputs[j]->crtc = NULL;
|
||||
+ if (crtc->outputs[j]->crtc == crtc)
|
||||
+ crtc->outputs[j]->crtc = NULL;
|
||||
RROutputChanged (crtc->outputs[j], FALSE);
|
||||
RRCrtcChanged (crtc, FALSE);
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
commit fa19e84714aa84a2f2e817e363d6440349d0b619
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Tue Nov 20 16:54:50 2007 +0100
|
||||
|
||||
Fix initial placement of LeftOf and Above.
|
||||
|
||||
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
|
||||
index 760a498..5a1ed8c 100644
|
||||
--- a/hw/xfree86/modes/xf86Crtc.c
|
||||
+++ b/hw/xfree86/modes/xf86Crtc.c
|
||||
@@ -1094,10 +1094,10 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
|
||||
output->initial_x += xf86ModeWidth (modes[or], relative->initial_rotation);
|
||||
break;
|
||||
case OPTION_ABOVE:
|
||||
- output->initial_y -= xf86ModeHeight (modes[or], relative->initial_rotation);
|
||||
+ output->initial_y -= xf86ModeHeight (modes[o], relative->initial_rotation);
|
||||
break;
|
||||
case OPTION_LEFT_OF:
|
||||
- output->initial_x -= xf86ModeWidth (modes[or], relative->initial_rotation);
|
||||
+ output->initial_x -= xf86ModeWidth (modes[o], relative->initial_rotation);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -1,130 +0,0 @@
|
||||
commit feac0759522cbdc3e61ccfa373df735903c5cb27
|
||||
Author: Keith Packard <keithp@koto.keithp.com>
|
||||
Date: Wed Oct 17 11:42:28 2007 +0800
|
||||
|
||||
Make config file preferred mode override monitor preferred mode.
|
||||
|
||||
Add a new even-more-preferred bit to each mode which is used to make config
|
||||
file preferences selected instead of the monitor preferred mode.
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
|
||||
index 0365ddd..af98b4f 100644
|
||||
--- a/hw/xfree86/common/xf86str.h
|
||||
+++ b/hw/xfree86/common/xf86str.h
|
||||
@@ -142,6 +142,7 @@ typedef enum {
|
||||
# define M_T_DEFAULT 0x10 /* (VESA) default modes */
|
||||
# define M_T_USERDEF 0x20 /* One of the modes from the config file */
|
||||
# define M_T_DRIVER 0x40 /* Supplied by the driver (EDID, etc) */
|
||||
+# define M_T_USERPREF 0x80 /* mode preferred by the user config */
|
||||
|
||||
/* Video mode */
|
||||
typedef struct _DisplayModeRec {
|
||||
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
|
||||
index f589b5a..0a48d5b 100644
|
||||
--- a/hw/xfree86/modes/xf86Crtc.c
|
||||
+++ b/hw/xfree86/modes/xf86Crtc.c
|
||||
@@ -711,7 +711,8 @@ xf86DefaultMode (xf86OutputPtr output, int width, int height)
|
||||
for (mode = output->probed_modes; mode; mode = mode->next)
|
||||
{
|
||||
int dpi;
|
||||
- int preferred = (mode->type & M_T_PREFERRED) != 0;
|
||||
+ int preferred = (((mode->type & M_T_PREFERRED) != 0) +
|
||||
+ ((mode->type & M_T_USERPREF) != 0));
|
||||
int diff;
|
||||
|
||||
if (xf86ModeWidth (mode, output->initial_rotation) > width ||
|
||||
@@ -1415,7 +1416,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
|
||||
mode->prev = NULL;
|
||||
output->probed_modes = mode;
|
||||
}
|
||||
- mode->type |= M_T_PREFERRED;
|
||||
+ mode->type |= (M_T_PREFERRED|M_T_USERPREF);
|
||||
}
|
||||
else
|
||||
mode->type &= ~M_T_PREFERRED;
|
||||
@@ -1532,6 +1533,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
|
||||
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
|
||||
int o, c;
|
||||
DisplayModePtr target_mode = NULL;
|
||||
+ int target_preferred = 0;
|
||||
Rotation target_rotation = RR_Rotate_0;
|
||||
xf86CrtcPtr *crtcs;
|
||||
DisplayModePtr *modes;
|
||||
@@ -1572,43 +1574,34 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
|
||||
}
|
||||
|
||||
/*
|
||||
- * Let outputs with preferred modes drive screen size
|
||||
+ * User preferred > preferred > other modes
|
||||
*/
|
||||
for (o = 0; o < config->num_output; o++)
|
||||
{
|
||||
- xf86OutputPtr output = config->output[o];
|
||||
+ xf86OutputPtr output = config->output[o];
|
||||
+ DisplayModePtr default_mode;
|
||||
+ int default_preferred;
|
||||
|
||||
- if (enabled[o] &&
|
||||
- xf86OutputHasPreferredMode (output, width, height))
|
||||
+ if (!enabled[o])
|
||||
+ continue;
|
||||
+ default_mode = xf86DefaultMode (output, width, height);
|
||||
+ if (!default_mode)
|
||||
+ continue;
|
||||
+ default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) +
|
||||
+ ((default_mode->type & M_T_USERPREF) != 0));
|
||||
+ if (default_preferred > target_preferred || !target_mode)
|
||||
{
|
||||
- target_mode = xf86DefaultMode (output, width, height);
|
||||
+ target_mode = default_mode;
|
||||
+ target_preferred = default_preferred;
|
||||
target_rotation = output->initial_rotation;
|
||||
- if (target_mode)
|
||||
- {
|
||||
- modes[o] = target_mode;
|
||||
- config->compat_output = o;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- if (!target_mode)
|
||||
- {
|
||||
- for (o = 0; o < config->num_output; o++)
|
||||
- {
|
||||
- xf86OutputPtr output = config->output[o];
|
||||
- if (enabled[o])
|
||||
- {
|
||||
- target_mode = xf86DefaultMode (output, width, height);
|
||||
- target_rotation = output->initial_rotation;
|
||||
- if (target_mode)
|
||||
- {
|
||||
- modes[o] = target_mode;
|
||||
- config->compat_output = o;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
+ config->compat_output = o;
|
||||
}
|
||||
}
|
||||
+ if (target_mode)
|
||||
+ modes[config->compat_output] = target_mode;
|
||||
+ /*
|
||||
+ * Fill in other output modes
|
||||
+ */
|
||||
for (o = 0; o < config->num_output; o++)
|
||||
{
|
||||
xf86OutputPtr output = config->output[o];
|
||||
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
|
||||
index 9693e12..4c843cd 100644
|
||||
--- a/hw/xfree86/modes/xf86Crtc.h
|
||||
+++ b/hw/xfree86/modes/xf86Crtc.h
|
||||
@@ -39,6 +39,9 @@
|
||||
#ifndef M_T_DRIVER
|
||||
#define M_T_DRIVER 0x40
|
||||
#endif
|
||||
+#ifndef M_T_USERPREF
|
||||
+#define M_T_USERPREF 0x80
|
||||
+#endif
|
||||
#ifndef HARDWARE_CURSOR_ARGB
|
||||
#define HARDWARE_CURSOR_ARGB 0x00004000
|
||||
#endif
|
||||
@ -1,15 +1,3 @@
|
||||
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/common/xf86Config.c ./hw/xfree86/common/xf86Config.c
|
||||
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/common/xf86Config.c 2006-07-30 09:52:06.000000000 +0200
|
||||
+++ ./hw/xfree86/common/xf86Config.c 2006-08-31 10:22:07.000000000 +0200
|
||||
@@ -98,7 +98,6 @@ extern DeviceAssocRec mouse_assoc;
|
||||
"/etc/X11/%R," "%P/etc/X11/%R," \
|
||||
"%E," "%F," \
|
||||
"/etc/X11/%F," "%P/etc/X11/%F," \
|
||||
- "%D/%X," \
|
||||
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
|
||||
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
|
||||
"%P/etc/X11/%X," \
|
||||
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre ./hw/xfree86/doc/man/xorg.conf.man.pre
|
||||
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-07-20 22:27:48.000000000 +0200
|
||||
+++ ./hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-31 10:35:00.000000000 +0200
|
||||
@@ -65,7 +65,6 @@ search locations are as follows:
|
||||
@ -32,63 +20,3 @@ diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre
|
||||
.I <hostname>
|
||||
is the machine's hostname as reported by gethostname(3).
|
||||
.PP
|
||||
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/cpconfig.c ./hw/xfree86/parser/cpconfig.c
|
||||
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/cpconfig.c 2006-07-22 01:12:40.000000000 +0200
|
||||
+++ ./hw/xfree86/parser/cpconfig.c 2006-08-31 10:24:48.000000000 +0200
|
||||
@@ -62,7 +62,7 @@ xrealloc (void *p, int size)
|
||||
#endif
|
||||
|
||||
#define CONFPATH "%A,%R,/etc/X11/%R,%P/etc/X11/%R,%E,%F,/etc/X11/%F," \
|
||||
- "%P/etc/X11/%F,%D/%X,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
|
||||
+ "%P/etc/X11/%F,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
|
||||
"%P/etc/X11/%X,%P/lib/X11/%X.%H,%P/lib/X11/%X"
|
||||
|
||||
int
|
||||
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/scan.c ./hw/xfree86/parser/scan.c
|
||||
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/scan.c 2006-07-22 01:12:40.000000000 +0200
|
||||
+++ ./hw/xfree86/parser/scan.c 2006-08-31 10:24:19.000000000 +0200
|
||||
@@ -448,7 +448,6 @@ xf86pathIsSafe(const char *path)
|
||||
* %E config file environment ($XORGCONFIG) as an absolute path
|
||||
* %F config file environment ($XORGCONFIG) as a relative path
|
||||
* %G config file environment ($XORGCONFIG) as a safe path
|
||||
- * %D $HOME
|
||||
* %P projroot
|
||||
* %M major version number
|
||||
* %% %
|
||||
@@ -597,14 +596,6 @@ DoSubstitution(const char *template, con
|
||||
} else
|
||||
BAIL_OUT;
|
||||
break;
|
||||
- case 'D':
|
||||
- if (!home)
|
||||
- home = getenv("HOME");
|
||||
- if (home && xf86pathIsAbsolute(home))
|
||||
- APPEND_STR(home);
|
||||
- else
|
||||
- BAIL_OUT;
|
||||
- break;
|
||||
case 'P':
|
||||
if (projroot && xf86pathIsAbsolute(projroot))
|
||||
APPEND_STR(projroot);
|
||||
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/utils/xorgcfg/config.h ./hw/xfree86/utils/xorgcfg/config.h
|
||||
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/utils/xorgcfg/config.h 2006-07-22 01:12:40.000000000 +0200
|
||||
+++ ./hw/xfree86/utils/xorgcfg/config.h 2006-08-31 10:22:56.000000000 +0200
|
||||
@@ -108,7 +108,6 @@ extern int config_mode;
|
||||
"/etc/X11/%R," "%P/etc/X11/%R," \
|
||||
"%E," "%F," \
|
||||
"/etc/X11/%F," "%P/etc/X11/%F," \
|
||||
- "%D/%X," \
|
||||
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
|
||||
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
|
||||
"%P/etc/X11/%X," \
|
||||
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c ./hw/xwin/winconfig.c
|
||||
--- ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c 2006-07-22 01:12:41.000000000 +0200
|
||||
+++ ./hw/xwin/winconfig.c 2006-08-31 10:22:29.000000000 +0200
|
||||
@@ -49,7 +49,6 @@
|
||||
"/etc/X11/%R," "%P/etc/X11/%R," \
|
||||
"%E," "%F," \
|
||||
"/etc/X11/%F," "%P/etc/X11/%F," \
|
||||
- "%D/%X," \
|
||||
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
|
||||
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
|
||||
"%P/etc/X11/%X," \
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
diff -aur a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2006-09-21 21:46:45.000000000 -0700
|
||||
+++ b/configure.ac 2006-09-21 21:46:29.000000000 -0700
|
||||
@@ -194,6 +194,7 @@
|
||||
case $host_os in
|
||||
*netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
|
||||
esac
|
||||
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
|
||||
;;
|
||||
arm*)
|
||||
ARM_VIDEO=yes
|
||||
@@ -220,6 +221,7 @@
|
||||
xorg_loader_sparcmuldiv="yes"
|
||||
SPARC64_VIDEO=yes
|
||||
BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
|
||||
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
;;
|
||||
x86_64*|amd64*)
|
||||
use_x86_asm="yes"
|
||||
@@ -231,8 +233,16 @@
|
||||
SYS_LIBS=-lamd64
|
||||
;;
|
||||
esac
|
||||
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
+ ;;
|
||||
+ ia64*)
|
||||
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
+ ;;
|
||||
+ s390*)
|
||||
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
;;
|
||||
esac
|
||||
+AC_SUBST(GLX_ARCH_DEFINES)
|
||||
|
||||
dnl BSD *_video.c selection
|
||||
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
|
||||
diff -aur a/GL/glx/Makefile.am b/GL/glx/Makefile.am
|
||||
--- a/GL/glx/Makefile.am 2006-07-05 11:31:36.000000000 -0700
|
||||
+++ b/GL/glx/Makefile.am 2006-09-21 21:37:03.000000000 -0700
|
||||
@@ -17,7 +17,8 @@
|
||||
-I@MESA_SOURCE@/src/mesa/glapi \
|
||||
-I@MESA_SOURCE@/src/mesa/main \
|
||||
-DXFree86Server \
|
||||
- @GLX_DEFINES@
|
||||
+ @GLX_DEFINES@ \
|
||||
+ @GLX_ARCH_DEFINES@
|
||||
|
||||
# none yet
|
||||
#sdk_HEADERS =
|
||||
--- xorg-server-1.1.99.3/hw/dmx/glxProxy/Makefile.am.orig 2006-10-09 21:05:37.000000000 +0200
|
||||
+++ xorg-server-1.1.99.3/hw/dmx/glxProxy/Makefile.am 2006-10-09 21:06:25.000000000 +0200
|
||||
@@ -40,4 +40,5 @@
|
||||
-I@MESA_SOURCE@/include \
|
||||
-DHAVE_DMX_CONFIG_H \
|
||||
@DMXMODULES_CFLAGS@ \
|
||||
+ @GLX_ARCH_DEFINES@ \
|
||||
-I$(top_srcdir)/hw/xfree86/os-support
|
||||
46
ia64Pci.h
46
ia64Pci.h
@ -1,46 +0,0 @@
|
||||
/*
|
||||
* Copyright 2004, Egbert Eich
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
* deal in the Software without restriction, including without limitation the
|
||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
* sell copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
|
||||
* NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the name of Egbert Eich shall not
|
||||
* be used in advertising or otherwise to promote the sale, use or other deal-
|
||||
*ings in this Software without prior written authorization from Egbert Eich.
|
||||
*
|
||||
*/
|
||||
#ifdef HAVE_XORG_CONFIG_H
|
||||
#include <xorg-config.h>
|
||||
#endif
|
||||
|
||||
#ifndef _IA64_PCI_H
|
||||
# define _IA64_PCI_H
|
||||
|
||||
#include "Pci.h"
|
||||
|
||||
typedef enum {
|
||||
NONE_CHIPSET,
|
||||
I460GX_CHIPSET,
|
||||
E8870_CHIPSET,
|
||||
ZX1_CHIPSET,
|
||||
ALTIX_CHIPSET
|
||||
} IA64Chipset;
|
||||
|
||||
# ifdef OS_PROBE_PCI_CHIPSET
|
||||
extern IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags);
|
||||
# endif
|
||||
#endif
|
||||
@ -1,11 +0,0 @@
|
||||
--- configure.ac.orig 2007-11-18 14:40:43.363103865 +0100
|
||||
+++ configure.ac 2007-11-18 14:41:10.763089274 +0100
|
||||
@@ -1659,7 +1659,7 @@
|
||||
AM_CONDITIONAL(MFB, [test "x$MFB" = xyes])
|
||||
AM_CONDITIONAL(CFB, [test "x$CFB" = xyes])
|
||||
AM_CONDITIONAL(AFB, [test "x$AFB" = xyes])
|
||||
-if test "x$MFB" = xyes -o "x$CFB" = xyes -o "x$AFB" = xyes; then
|
||||
+if test "x$CFB" = xyes -o "x$AFB" = xyes; then
|
||||
if test "x$XORG" != xyes; then
|
||||
AC_MSG_ERROR([legacy fb support requires the Xorg server])
|
||||
fi
|
||||
10
no-return-in-nonvoid-function.diff
Normal file
10
no-return-in-nonvoid-function.diff
Normal file
@ -0,0 +1,10 @@
|
||||
--- hw/kdrive/src/kdrive.c.orig 2008-06-27 19:35:41.000000000 +0000
|
||||
+++ hw/kdrive/src/kdrive.c 2008-06-27 19:40:53.000000000 +0000
|
||||
@@ -1397,6 +1397,7 @@ KdInitOutput (ScreenInfo *pScreenInfo
|
||||
int
|
||||
DPMSSet(ClientPtr client, int level)
|
||||
{
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
int
|
||||
@ -1,13 +0,0 @@
|
||||
--- hw/xfree86/common/xf86Bus.c.orig 2006-07-14 10:50:57.000000000 +0200
|
||||
+++ hw/xfree86/common/xf86Bus.c 2006-07-14 10:51:27.000000000 +0200
|
||||
@@ -2488,8 +2488,10 @@
|
||||
* No need to validate on Alpha Linux or OpenBSD/sparc64,
|
||||
* trust the kernel.
|
||||
*/
|
||||
+#if 0
|
||||
ValidatePci();
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
xf86MsgVerb(X_INFO, 3, "resource ranges after probing:\n");
|
||||
xf86PrintResList(3, Acc);
|
||||
@ -1,13 +1,13 @@
|
||||
diff -urp ../xserver.orig/hw/xfree86/os-support/bus/linuxPci.c ./hw/xfree86/os-support/bus/linuxPci.c
|
||||
--- ../xserver.orig/hw/xfree86/os-support/bus/linuxPci.c 2006-11-08 16:13:49.000000000 +0000
|
||||
+++ ./hw/xfree86/os-support/bus/linuxPci.c 2006-11-09 13:29:34.000000000 +0000
|
||||
@@ -150,6 +150,9 @@ linuxPciOpenFile(PCITAG tag, Bool write)
|
||||
--- hw/xfree86/os-support/bus/linuxPci.c.orig 2008-04-10 20:58:00.000000000 +0200
|
||||
+++ hw/xfree86/os-support/bus/linuxPci.c 2008-06-16 18:12:32.000000000 +0200
|
||||
@@ -133,6 +133,10 @@ linuxPciOpenFile(struct pci_device *dev,
|
||||
struct stat ignored;
|
||||
static int is26 = -1;
|
||||
|
||||
+#if __PPC
|
||||
+ is26 = 0;
|
||||
+#endif
|
||||
domain = PCI_DOM_FROM_TAG(tag);
|
||||
bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));
|
||||
dev = PCI_DEV_FROM_TAG(tag);
|
||||
+
|
||||
if (dev == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
Index: programs/Xserver/render/picture.c
|
||||
===================================================================
|
||||
RCS file: /home/eich/cvs/xc/programs/Xserver/render/picture.c,v
|
||||
retrieving revision 1.1.1.28
|
||||
diff -u -r1.1.1.28 picture.c
|
||||
--- programs/Xserver/render/picture.c 25 Nov 2005 10:05:52 -0000 1.1.1.28
|
||||
+++ programs/Xserver/render/picture.c 28 Nov 2005 18:24:10 -0000
|
||||
@@ -69,9 +69,11 @@
|
||||
Bool
|
||||
AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount)
|
||||
{
|
||||
- PictureScreenPtr ps = GetPictureScreen(pScreen);
|
||||
+ PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||||
unsigned int oldamount;
|
||||
|
||||
+ if (!ps) return TRUE;
|
||||
+
|
||||
/* Round up sizes for proper alignment */
|
||||
amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
--- include/miscstruct.h.orig 2007-11-30 22:14:17.372752750 +0100
|
||||
+++ include/miscstruct.h 2007-11-30 22:14:59.483384500 +0100
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
#include "misc.h"
|
||||
#include <X11/Xprotostr.h>
|
||||
#include "gc.h"
|
||||
-#include <pixman.h>
|
||||
+#include <pixman-1/pixman.h>
|
||||
|
||||
|
||||
@ -1,16 +1,14 @@
|
||||
diff -u -r -N hw/xfree86/common.orig/Makefile.am hw/xfree86/common/Makefile.am
|
||||
--- hw/xfree86/common.orig/Makefile.am 2006-08-06 18:01:51.000000000 +0200
|
||||
+++ hw/xfree86/common/Makefile.am 2006-08-06 18:03:28.000000000 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
--- hw/xfree86/common/Makefile.am.orig 2008-05-21 23:51:52.000000000 +0200
|
||||
+++ hw/xfree86/common/Makefile.am 2008-06-16 17:42:56.000000000 +0200
|
||||
@@ -29,7 +29,7 @@
|
||||
BUILT_SOURCES = xf86DefModeSet.c
|
||||
|
||||
AM_LDFLAGS = -r
|
||||
-libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
|
||||
+libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
|
||||
xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \
|
||||
xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
|
||||
xf86Globals.c xf86Io.c xf86AutoConfig.c \
|
||||
diff -u -r -N hw/xfree86/common.orig/xf86.h hw/xfree86/common/xf86.h
|
||||
xf86Cursor.c xf86DGA.c xf86DPMS.c \
|
||||
xf86DoProbe.c xf86Events.c \
|
||||
xf86Globals.c xf86AutoConfig.c \
|
||||
--- hw/xfree86/common.orig/xf86.h 2006-08-06 18:01:51.000000000 +0200
|
||||
+++ hw/xfree86/common/xf86.h 2006-08-06 18:05:18.000000000 +0200
|
||||
@@ -48,6 +48,7 @@
|
||||
@ -21,7 +19,6 @@ diff -u -r -N hw/xfree86/common.orig/xf86.h hw/xfree86/common/xf86.h
|
||||
extern Bool xf86DoConfigurePass1;
|
||||
extern int xf86ScreenIndex; /* Index into pScreen.devPrivates */
|
||||
extern int xf86CreateRootWindowIndex; /* Index into pScreen.devPrivates */
|
||||
diff -u -r -N hw/xfree86/common.orig/xf86Globals.c hw/xfree86/common/xf86Globals.c
|
||||
--- hw/xfree86/common.orig/xf86Globals.c 2006-08-06 18:01:51.000000000 +0200
|
||||
+++ hw/xfree86/common/xf86Globals.c 2006-08-06 18:05:49.000000000 +0200
|
||||
@@ -188,6 +188,7 @@
|
||||
@ -32,10 +29,9 @@ diff -u -r -N hw/xfree86/common.orig/xf86Globals.c hw/xfree86/common/xf86Globals
|
||||
DriverPtr *xf86DriverList = NULL;
|
||||
int xf86NumDrivers = 0;
|
||||
InputDriverPtr *xf86InputDriverList = NULL;
|
||||
diff -u -r -N hw/xfree86/common.orig/xf86Init.c hw/xfree86/common/xf86Init.c
|
||||
--- hw/xfree86/common.orig/xf86Init.c 2006-08-06 18:01:51.000000000 +0200
|
||||
+++ hw/xfree86/common/xf86Init.c 2006-08-06 18:07:55.000000000 +0200
|
||||
@@ -309,7 +309,7 @@
|
||||
--- hw/xfree86/common/xf86Init.c.orig 2008-05-21 23:51:52.000000000 +0200
|
||||
+++ hw/xfree86/common/xf86Init.c 2008-06-16 17:48:54.000000000 +0200
|
||||
@@ -500,7 +500,7 @@
|
||||
}
|
||||
|
||||
/* Read and parse the config file */
|
||||
@ -44,19 +40,17 @@ diff -u -r -N hw/xfree86/common.orig/xf86Init.c hw/xfree86/common/xf86Init.c
|
||||
switch (xf86HandleConfigFile(FALSE)) {
|
||||
case CONFIG_OK:
|
||||
break;
|
||||
@@ -367,7 +367,10 @@
|
||||
/* Force load mandatory base modules */
|
||||
if (!xf86LoadModules(baseModules, NULL))
|
||||
FatalError("Unable to load required base modules, Exiting...\n");
|
||||
-
|
||||
+
|
||||
@@ -526,6 +526,9 @@
|
||||
LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
|
||||
}
|
||||
|
||||
+ if (xf86DoShowOptions)
|
||||
+ DoShowOptions();
|
||||
+
|
||||
xf86OpenConsole();
|
||||
|
||||
/* Do a general bus probe. This will be a PCI probe for x86 platforms */
|
||||
@@ -1657,6 +1660,15 @@
|
||||
@@ -1680,6 +1683,15 @@
|
||||
xf86AllowMouseOpenFail = TRUE;
|
||||
return 1;
|
||||
}
|
||||
@ -72,7 +66,7 @@ diff -u -r -N hw/xfree86/common.orig/xf86Init.c hw/xfree86/common/xf86Init.c
|
||||
if (!strcmp(argv[i], "-isolateDevice"))
|
||||
{
|
||||
int bus, device, func;
|
||||
@@ -1699,6 +1711,7 @@
|
||||
@@ -1723,6 +1735,7 @@
|
||||
ErrorF("-modulepath paths specify the module search path\n");
|
||||
ErrorF("-logfile file specify a log file name\n");
|
||||
ErrorF("-configure probe for devices and write an "__XCONFIGFILE__"\n");
|
||||
@ -80,7 +74,6 @@ diff -u -r -N hw/xfree86/common.orig/xf86Init.c hw/xfree86/common/xf86Init.c
|
||||
}
|
||||
ErrorF("-config file specify a configuration file, relative to the\n");
|
||||
ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n");
|
||||
diff -u -r -N hw/xfree86/common.orig/xf86Priv.h hw/xfree86/common/xf86Priv.h
|
||||
--- hw/xfree86/common.orig/xf86Priv.h 2006-08-06 18:01:51.000000000 +0200
|
||||
+++ hw/xfree86/common/xf86Priv.h 2006-08-06 18:02:03.000000000 +0200
|
||||
@@ -169,6 +169,7 @@
|
||||
@ -91,7 +84,6 @@ diff -u -r -N hw/xfree86/common.orig/xf86Priv.h hw/xfree86/common/xf86Priv.h
|
||||
|
||||
/* xf86Events.c */
|
||||
|
||||
diff -u -r -N hw/xfree86/common.orig/xf86ShowOpts.c hw/xfree86/common/xf86ShowOpts.c
|
||||
--- hw/xfree86/common.orig/xf86ShowOpts.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ hw/xfree86/common/xf86ShowOpts.c 2006-08-06 18:02:03.000000000 +0200
|
||||
@@ -0,0 +1,129 @@
|
||||
@ -137,7 +129,7 @@ diff -u -r -N hw/xfree86/common.orig/xf86ShowOpts.c hw/xfree86/common/xf86ShowOp
|
||||
+#include "xf86Config.h"
|
||||
+#include "xf86_OSlib.h"
|
||||
+#include "xf86Priv.h"
|
||||
+#include "xf86PciData.h"
|
||||
+/* #include "xf86PciData.h" */
|
||||
+#define IN_XSERVER
|
||||
+#include "xf86Parser.h"
|
||||
+#include "xf86tokens.h"
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
|
||||
index 8c72874..f226b6b 100644
|
||||
--- a/xkb/xkbActions.c
|
||||
+++ b/xkb/xkbActions.c
|
||||
@@ -1031,7 +1031,7 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi,
|
||||
DeviceIntPtr dev;
|
||||
int button;
|
||||
|
||||
- if (dev == inputInfo.keyboard)
|
||||
+ if (xkbi->device == inputInfo.keyboard)
|
||||
return 0;
|
||||
|
||||
if (filter->keycode==0) { /* initial press */
|
||||
@ -257,28 +257,6 @@ diff -pNur xorg-server-1.4.orig/hw/dmx/input/Makefile.am xorg-server-1.4/hw/dmx/
|
||||
$(GLX_DEFS) \
|
||||
@DMXMODULES_CFLAGS@
|
||||
|
||||
diff -pNur xorg-server-1.4.orig/hw/dmx/Makefile.am xorg-server-1.4/hw/dmx/Makefile.am
|
||||
--- xorg-server-1.4.orig/hw/dmx/Makefile.am 2007-08-31 18:28:27.000000000 -0700
|
||||
+++ xorg-server-1.4/hw/dmx/Makefile.am 2007-09-06 16:09:45.000000000 -0700
|
||||
@@ -1,6 +1,6 @@
|
||||
-DIST_SUBDIRS = input config glxProxy examples doc
|
||||
+DIST_SUBDIRS = input vnc config glxProxy examples doc
|
||||
|
||||
-SUBDIRS = input config examples
|
||||
+SUBDIRS = input vnc config examples
|
||||
bin_PROGRAMS = Xdmx
|
||||
|
||||
if XINERAMA
|
||||
@@ -86,7 +86,9 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
|
||||
$(XDMX_LIBS) \
|
||||
$(GLX_LIBS) \
|
||||
input/libdmxinput.a \
|
||||
+ vnc/libdmxvnc.a \
|
||||
config/libdmxconfig.a \
|
||||
+ -ljpeg -lcrypt \
|
||||
@XSERVER_LIBS@ \
|
||||
@DMXMODULES_LIBS@
|
||||
|
||||
diff -pNur xorg-server-1.4.orig/hw/dmx/vnc/Makefile.am xorg-server-1.4/hw/dmx/vnc/Makefile.am
|
||||
--- xorg-server-1.4.orig/hw/dmx/vnc/Makefile.am 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ xorg-server-1.4/hw/dmx/vnc/Makefile.am 2007-09-06 16:09:45.000000000 -0700
|
||||
@ -940,34 +918,6 @@ diff -pNur xorg-server-1.4.orig/hw/dmx/vnc/vncint.h xorg-server-1.4/hw/dmx/vnc/v
|
||||
+
|
||||
+#endif /* _VNCINT_H_ */
|
||||
+
|
||||
diff -pNur xorg-server-1.4.orig/hw/Makefile.am xorg-server-1.4/hw/Makefile.am
|
||||
--- xorg-server-1.4.orig/hw/Makefile.am 2007-08-23 12:04:52.000000000 -0700
|
||||
+++ xorg-server-1.4/hw/Makefile.am 2007-09-06 16:09:45.000000000 -0700
|
||||
@@ -38,6 +38,11 @@ if XPRINT
|
||||
XPRINT_SUBDIRS = xprint
|
||||
endif
|
||||
|
||||
+if VNC
|
||||
+VNC_SUBDIRS = vnc
|
||||
+endif
|
||||
+
|
||||
+# need to add darwin support here
|
||||
if BUILD_DARWIN
|
||||
DARWIN_SUBDIRS = darwin
|
||||
endif
|
||||
@@ -50,10 +55,11 @@ SUBDIRS = \
|
||||
$(XVFB_SUBDIRS) \
|
||||
$(XNEST_SUBDIRS) \
|
||||
$(DMX_SUBDIRS) \
|
||||
+ $(VNC_SUBDIRS) \
|
||||
$(KDRIVE_SUBDIRS) \
|
||||
$(XPRINT_SUBDIRS)
|
||||
|
||||
-DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint
|
||||
+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint vnc
|
||||
|
||||
relink:
|
||||
for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
|
||||
diff -pNur xorg-server-1.4.orig/hw/vnc/auth.c xorg-server-1.4/hw/vnc/auth.c
|
||||
--- xorg-server-1.4.orig/hw/vnc/auth.c 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ xorg-server-1.4/hw/vnc/auth.c 2007-09-06 16:09:45.000000000 -0700
|
||||
@ -22906,35 +22856,6 @@ diff -pNur xorg-server-1.4.orig/hw/xfree86/dixmods/Makefile.am xorg-server-1.4/h
|
||||
libfb_la_LDFLAGS = -avoid-version
|
||||
libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
|
||||
libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
|
||||
diff -pNur xorg-server-1.4.orig/hw/xfree86/Makefile.am xorg-server-1.4/hw/xfree86/Makefile.am
|
||||
--- xorg-server-1.4.orig/hw/xfree86/Makefile.am 2007-08-23 12:04:53.000000000 -0700
|
||||
+++ xorg-server-1.4/hw/xfree86/Makefile.am 2007-09-06 16:09:46.000000000 -0700
|
||||
@@ -4,6 +4,10 @@ if DRI
|
||||
DRI_SUBDIR = dri
|
||||
endif
|
||||
|
||||
+if VNC
|
||||
+VNC_SUBDIR = vnc
|
||||
+endif
|
||||
+
|
||||
if XF86UTILS
|
||||
XF86UTILS_SUBDIR = utils
|
||||
endif
|
||||
@@ -21,12 +25,12 @@ DOC_SUBDIR = doc
|
||||
SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
|
||||
ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \
|
||||
loader scanpci dixmods exa modes \
|
||||
- $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
|
||||
+ $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) $(VNC_SUBDIR)
|
||||
|
||||
DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
|
||||
parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
|
||||
xf8_16bpp xf8_32bpp loader scanpci dixmods dri exa modes \
|
||||
- utils doc
|
||||
+ utils doc vnc
|
||||
|
||||
bin_PROGRAMS = Xorg
|
||||
|
||||
diff -pNur xorg-server-1.4.orig/hw/xfree86/vnc/Makefile.am xorg-server-1.4/hw/xfree86/vnc/Makefile.am
|
||||
--- xorg-server-1.4.orig/hw/xfree86/vnc/Makefile.am 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ xorg-server-1.4/hw/xfree86/vnc/Makefile.am 2007-09-06 16:09:51.000000000 -0700
|
||||
@ -24045,3 +23966,73 @@ diff -pNur xorg-server-1.4.orig/xcliplist/Makefile.am xorg-server-1.4/xcliplist/
|
||||
+if XORG
|
||||
+sdk_HEADERS =
|
||||
+endif
|
||||
--- a/hw/dmx/Makefile.am.orig 2008-04-10 20:57:59.000000000 +0200
|
||||
+++ a/hw/dmx/Makefile.am 2008-06-16 18:29:11.000000000 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
-DIST_SUBDIRS = input config glxProxy examples doc
|
||||
+DIST_SUBDIRS = input vnc config glxProxy examples doc
|
||||
|
||||
-SUBDIRS = input config examples
|
||||
+SUBDIRS = input vnc config examples
|
||||
bin_PROGRAMS = Xdmx
|
||||
|
||||
if XINERAMA
|
||||
@@ -85,7 +85,9 @@
|
||||
@XDMX_LIBS@ \
|
||||
$(GLX_LIBS) \
|
||||
input/libdmxinput.a \
|
||||
+ vnc/libdmxvnc.a \
|
||||
config/libdmxconfig.a \
|
||||
+ -ljpeg -lcrypt \
|
||||
$(XSERVER_LIBS)
|
||||
|
||||
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||||
--- a/hw/Makefile.am.orig 2008-05-21 23:51:51.000000000 +0200
|
||||
+++ a/hw/Makefile.am 2008-06-16 18:33:58.000000000 +0200
|
||||
@@ -34,6 +34,10 @@
|
||||
XQUARTZ_SUBDIRS = xquartz
|
||||
endif
|
||||
|
||||
+if VNC
|
||||
+VNC_SUBDIRS = vnc
|
||||
+endif
|
||||
+
|
||||
SUBDIRS = \
|
||||
$(XORG_SUBDIRS) \
|
||||
$(XGL_SUBDIRS) \
|
||||
@@ -41,6 +45,7 @@
|
||||
$(XVFB_SUBDIRS) \
|
||||
$(XNEST_SUBDIRS) \
|
||||
$(DMX_SUBDIRS) \
|
||||
+ $(VNC_SUBDIRS) \
|
||||
$(KDRIVE_SUBDIRS) \
|
||||
$(XQUARTZ_SUBDIRS) \
|
||||
$(XPRINT_SUBDIRS)
|
||||
--- a/hw/xfree86/Makefile.am.orig 2008-05-21 23:51:52.000000000 +0200
|
||||
+++ a/hw/xfree86/Makefile.am 2008-06-16 18:37:31.000000000 +0200
|
||||
@@ -8,6 +8,10 @@
|
||||
DRI2_SUBDIR = dri2
|
||||
endif
|
||||
|
||||
+if VNC
|
||||
+VNC_SUBDIR = vnc
|
||||
+endif
|
||||
+
|
||||
if XF86UTILS
|
||||
XF86UTILS_SUBDIR = utils
|
||||
endif
|
||||
@@ -25,12 +29,12 @@
|
||||
SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
|
||||
ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \
|
||||
xf8_16bpp loader dixmods exa modes \
|
||||
- $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
|
||||
+ $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) $(VNC_SUBDIR)
|
||||
|
||||
DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
|
||||
parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
|
||||
xf8_16bpp xf8_32bpp loader dixmods dri dri2 exa modes \
|
||||
- utils doc
|
||||
+ utils doc vnc
|
||||
|
||||
bin_PROGRAMS = Xorg
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
|
||||
size 6216638
|
||||
3
xorg-server-1.4.99.905.tar.bz2
Normal file
3
xorg-server-1.4.99.905.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b2e2fdaf83f803157a54e2314a8ae1e8ef5dc3db00e5b6b19f0cfe5da2f2d53
|
||||
size 5631334
|
||||
@ -1,11 +0,0 @@
|
||||
--- cfb/cfbblt.c.orig 2006-07-31 21:44:40.000000000 +0200
|
||||
+++ cfb/cfbblt.c 2006-07-31 21:45:42.000000000 +0200
|
||||
@@ -38,6 +38,8 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xmd.h>
|
||||
#include <X11/Xproto.h>
|
||||
@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 4 22:29:06 CEST 2008 - sndirsch@suse.de
|
||||
|
||||
- xorg-server-1.4.99.905
|
||||
* obsolete patches
|
||||
- XAANoOffscreenPixmaps.diff
|
||||
- bug227111-ddc_screensize.diff
|
||||
- commit-184e571.diff
|
||||
- commit-29e0e18.diff
|
||||
- commit-c6c284e.diff
|
||||
- commit-f7dd0c7.diff
|
||||
- commit-fa19e84.diff
|
||||
- commit-feac075.diff
|
||||
- glx-align.patch
|
||||
- mfb_without_xorg.diff
|
||||
- p_ValidatePci.diff
|
||||
- p_vga-crashfix.diff
|
||||
- xkb_action.diff
|
||||
- xorg-server.diff
|
||||
- xprint.diff
|
||||
- xserver-mode-fuzzy-check.diff
|
||||
* new patches
|
||||
- 64bit-portability-issue.diff
|
||||
- no-return-in-nonvoid-function.diff
|
||||
* adjusted patches
|
||||
- bitmap_always_unscaled.diff
|
||||
- disable-root-xorg_conf.diff
|
||||
- p_ppc_domain_workaround.diff
|
||||
- pixman.diff
|
||||
- ps_showopts.diff
|
||||
- xorg-server-1.4-vnc.patch
|
||||
- bug-197858_dpms.diff
|
||||
- Mesa sources no longer required for xorg-server 1.5
|
||||
- VNC patches + build disabled for now
|
||||
- disabled some IA64 patches for now
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 13 15:31:51 CEST 2008 - sndirsch@suse.de
|
||||
|
||||
|
||||
@ -12,17 +12,18 @@
|
||||
|
||||
|
||||
Name: xorg-x11-server
|
||||
%define dirsuffix 1.4.2
|
||||
%define dirsuffix 1.4.99.905
|
||||
%define fglrx_driver_hack 0
|
||||
%define vnc 1
|
||||
BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
|
||||
### FIXME
|
||||
%define vnc 0
|
||||
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
|
||||
%if %vnc
|
||||
BuildRequires: libjpeg-devel
|
||||
%endif
|
||||
Url: http://xorg.freedesktop.org/
|
||||
%define EXPERIMENTAL 0
|
||||
Version: 7.3
|
||||
Release: 112
|
||||
Release: 114
|
||||
License: X11/MIT
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Group: System/X11/Servers/XF86_4
|
||||
@ -36,7 +37,6 @@ Provides: xorg-x11-server-glx
|
||||
Obsoletes: xorg-x11-server-glx
|
||||
Summary: X.Org Server
|
||||
Source: xorg-server-%{dirsuffix}.tar.bz2
|
||||
Source1: MesaLib-7.0.3.tar.bz2
|
||||
Source3: README.updates
|
||||
Source4: xorgcfg.tar.bz2
|
||||
%if %suse_version > 1010
|
||||
@ -44,17 +44,12 @@ Source5: modprobe.nvidia
|
||||
%endif
|
||||
Source7: xorg-docs-1.4.tar.bz2
|
||||
Source8: xorg.conf.man-070818.tar
|
||||
Source9: ia64Pci.h
|
||||
Patch: 64bit.diff
|
||||
Patch1: fpic.diff
|
||||
Patch2: p_default-module-path.diff
|
||||
Patch3: p_ValidatePci.diff
|
||||
Patch4: xprint.diff
|
||||
Patch5: xorg-server.diff
|
||||
Patch6: pu_fixes.diff
|
||||
Patch7: p_mouse_misc.diff
|
||||
Patch8: p_bug96328.diff
|
||||
Patch9: p_vga-crashfix.diff
|
||||
Patch11: ps_showopts.diff
|
||||
Patch12: p_xf86Mode.diff
|
||||
Patch13: p_xorg_acpi.diff
|
||||
@ -63,7 +58,6 @@ Patch16: p_xnest-ignore-getimage-errors.diff
|
||||
Patch18: p_ia64-console.diff
|
||||
Patch22: disable-root-xorg_conf.diff
|
||||
Patch23: disable-fbblt-opt.diff
|
||||
Patch25: glx-align.patch
|
||||
Patch27: mouse.diff
|
||||
Patch29: xephyr.diff
|
||||
Patch30: p_ppc_domain_workaround.diff
|
||||
@ -78,23 +72,14 @@ Patch40: xorg-server-1.4-vnc-fix.patch
|
||||
Patch43: xorg-server-1.4-vnc-64bit.diff
|
||||
%endif
|
||||
Patch41: loadmod-bug197195.diff
|
||||
Patch42: bug227111-ddc_screensize.diff
|
||||
Patch45: bug-197858_dpms.diff
|
||||
Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch
|
||||
Patch67: xorg-docs.diff
|
||||
Patch69: xserver-mode-fuzzy-check.diff
|
||||
Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
|
||||
Patch77: fbdevhw.diff
|
||||
Patch79: edit_data_sanity_check.diff
|
||||
Patch83: ia64linuxPciInit.diff
|
||||
Patch84: commit-feac075.diff
|
||||
Patch85: commit-29e0e18.diff
|
||||
Patch86: mfb_without_xorg.diff
|
||||
Patch87: commit-c6c284e.diff
|
||||
Patch88: commit-f6401f9.diff
|
||||
Patch89: commit-184e571.diff
|
||||
Patch90: commit-fa19e84.diff
|
||||
Patch91: commit-f7dd0c7.diff
|
||||
Patch93: pixman.diff
|
||||
Patch99: commit-50e80c3.diff
|
||||
Patch101: zap_warning_xserver.diff
|
||||
@ -102,12 +87,12 @@ Patch102: xorg-server-1.4-vnc-memory.diff
|
||||
Patch103: confine_to_shape.diff
|
||||
Patch104: bitmap_always_unscaled.diff
|
||||
Patch106: randr1_1-sig11.diff
|
||||
Patch107: XAANoOffscreenPixmaps.diff
|
||||
Patch108: xkb_action.diff
|
||||
Patch109: events.diff
|
||||
Patch110: xorg-server-1.4-vnc-disable_render.diff
|
||||
Patch111: xorg-server-1.4-vnc-render_sig11.diff
|
||||
Patch112: fix-dpi-values.diff
|
||||
Patch113: no-return-in-nonvoid-function.diff
|
||||
Patch114: 64bit-portability-issue.diff
|
||||
|
||||
%description
|
||||
This package contains the X.Org Server.
|
||||
@ -168,26 +153,13 @@ An X Window System server for Virtual Network Computing (VNC).
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n xorg-server-%{dirsuffix} -b1 -a4 -a7 -a8
|
||||
test -s hw/xfree86/os-support/shared/ia64Pci.h || \
|
||||
cp $RPM_SOURCE_DIR/ia64Pci.h hw/xfree86/os-support/shared/ia64Pci.h
|
||||
# make legal department happy (Bug #204110)
|
||||
test -f ../Mesa-7.0.3/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
|
||||
test -f ../Mesa-7.0.3/progs/ggi/asc-view.c && exit 1
|
||||
# remove wrongly prebuilt files (Bug #328201)
|
||||
mv hw/xfree86/xf1bpp/mfbmodule.c .
|
||||
rm hw/xfree86/xf1bpp/*.c
|
||||
mv mfbmodule.c hw/xfree86/xf1bpp
|
||||
%setup -q -n xorg-server-%{dirsuffix} -a4 -a7 -a8
|
||||
%patch
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7 -p2
|
||||
%patch8 -p0
|
||||
%patch9 -p2
|
||||
%patch11
|
||||
#%patch12 -p2
|
||||
%patch13
|
||||
@ -198,13 +170,13 @@ pushd hw/xfree86/os-support
|
||||
popd
|
||||
%patch22
|
||||
%patch23
|
||||
%patch25 -p1
|
||||
%patch27
|
||||
%patch29
|
||||
### Bug 197572: X.Org PCI/IA64 patches
|
||||
%patch30
|
||||
%patch32 -p1
|
||||
%patch34 -p0
|
||||
### FIXME
|
||||
#%patch34 -p0
|
||||
%patch36 -p0
|
||||
%if %vnc
|
||||
%patch39 -p1
|
||||
@ -217,35 +189,28 @@ popd
|
||||
chmod 755 hw/vnc/symlink-vnc.sh
|
||||
%endif
|
||||
%patch41 -p1
|
||||
%patch42 -p0
|
||||
%patch45 -p0
|
||||
%patch63 -p1
|
||||
### FIXME
|
||||
#%patch63 -p1
|
||||
pushd xorg-docs-*
|
||||
%patch67
|
||||
popd
|
||||
%patch69 -p1
|
||||
%patch72 -p1
|
||||
%patch77
|
||||
%patch79 -p1
|
||||
%patch83
|
||||
%patch84 -p1
|
||||
%patch85 -p1
|
||||
%patch86 -p0
|
||||
%patch87 -p1
|
||||
### FIXME
|
||||
#%patch83
|
||||
%patch88 -p1
|
||||
%patch89 -p1
|
||||
%patch90 -p1
|
||||
%patch91 -p1
|
||||
%patch93
|
||||
%patch99 -p1
|
||||
%patch101 -p1
|
||||
%patch103
|
||||
%patch104 -p1
|
||||
%patch106 -p1
|
||||
%patch107 -p0
|
||||
%patch108 -p1
|
||||
%patch109 -p1
|
||||
%patch112 -p0
|
||||
%patch113 -p0
|
||||
%patch114 -p0
|
||||
|
||||
%build
|
||||
pushd xorg-docs-*
|
||||
@ -255,6 +220,8 @@ autoreconf -fi
|
||||
make
|
||||
popd
|
||||
autoreconf -fi
|
||||
# DRI2 disabled for Xserver 1.5 as libdrm 2.3.1 doesn't have the
|
||||
# drmBO functionality.
|
||||
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
||||
%if %fglrx_driver_hack
|
||||
--with-release-major=7 \
|
||||
@ -295,9 +262,9 @@ autoreconf -fi
|
||||
%ifarch s390 s390x
|
||||
--disable-dri \
|
||||
--disable-xorg \
|
||||
--enable-mfb \
|
||||
%else
|
||||
--enable-dri \
|
||||
--disable-dri2 \
|
||||
--enable-xorg \
|
||||
%endif
|
||||
--enable-dmx \
|
||||
@ -311,7 +278,6 @@ autoreconf -fi
|
||||
--with-log-dir="/var/log" \
|
||||
--with-os-name="openSUSE" \
|
||||
--with-os-vendor="SUSE LINUX" \
|
||||
--with-mesa-source=$RPM_BUILD_DIR/Mesa-7.0.3 \
|
||||
--with-fontdir="/usr/share/fonts" \
|
||||
--with-xkb-path="/usr/share/X11/xkb" \
|
||||
--with-xkb-output="/var/lib/xkb/compiled"
|
||||
@ -365,12 +331,17 @@ install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nv
|
||||
rm $RPM_BUILD_ROOT/mfb.h
|
||||
%endif
|
||||
%endif
|
||||
%if %vnc
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
|
||||
cat > $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name} << EOF
|
||||
## Name: VNC Server
|
||||
## Description: Opens ports for VNC Server
|
||||
TCP="5801 5901"
|
||||
EOF
|
||||
%endif
|
||||
%ifarch s390 s390x
|
||||
rm $RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig/*.pc
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf "$RPM_BUILD_ROOT"
|
||||
@ -469,8 +440,8 @@ exit 0
|
||||
%dir /etc/modprobe.d
|
||||
/etc/modprobe.d/nvidia
|
||||
%endif
|
||||
%ifnarch s390 s390x
|
||||
%dir /usr/%{_lib}/xorg
|
||||
%ifnarch s390 s390x
|
||||
%dir /var/X11R6/bin
|
||||
%endif
|
||||
%dir /var/lib/xkb
|
||||
@ -508,8 +479,6 @@ exit 0
|
||||
/usr/bin/outb
|
||||
/usr/bin/outl
|
||||
/usr/bin/outw
|
||||
/usr/bin/pcitweak
|
||||
/usr/bin/scanpci
|
||||
%endif
|
||||
/usr/bin/vdltodmx
|
||||
/usr/bin/xdmx
|
||||
@ -520,13 +489,14 @@ exit 0
|
||||
/usr/%{_lib}/xorg/modules/
|
||||
%{_mandir}/man4/*
|
||||
%endif
|
||||
/usr/%{_lib}/pkgconfig/*.pc
|
||||
/usr/%{_lib}/xserver/
|
||||
/usr/%{_lib}/xorg/protocol.txt
|
||||
%{_mandir}/man1/*
|
||||
%exclude %{_mandir}/man1/Xdmx.1*
|
||||
%exclude %{_mandir}/man1/Xnest.1*
|
||||
%exclude %{_mandir}/man1/Xvfb.1*
|
||||
%ifnarch s390 s390x
|
||||
%{_mandir}/man5/*
|
||||
%endif
|
||||
%{_mandir}/man7/*
|
||||
%ifnarch s390 s390x
|
||||
/var/X11R6/bin/X
|
||||
@ -548,6 +518,7 @@ exit 0
|
||||
%defattr(-,root,root)
|
||||
/usr/include/xorg/
|
||||
/usr/%{_lib}/*.a
|
||||
/usr/%{_lib}/pkgconfig/*.pc
|
||||
/usr/share/aclocal/*.m4
|
||||
%endif
|
||||
%if %vnc
|
||||
@ -559,6 +530,39 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Jul 05 2008 sndirsch@suse.de
|
||||
- xorg-server-1.4.99.905
|
||||
* obsolete patches
|
||||
- XAANoOffscreenPixmaps.diff
|
||||
- bug227111-ddc_screensize.diff
|
||||
- commit-184e571.diff
|
||||
- commit-29e0e18.diff
|
||||
- commit-c6c284e.diff
|
||||
- commit-f7dd0c7.diff
|
||||
- commit-fa19e84.diff
|
||||
- commit-feac075.diff
|
||||
- glx-align.patch
|
||||
- mfb_without_xorg.diff
|
||||
- p_ValidatePci.diff
|
||||
- p_vga-crashfix.diff
|
||||
- xkb_action.diff
|
||||
- xorg-server.diff
|
||||
- xprint.diff
|
||||
- xserver-mode-fuzzy-check.diff
|
||||
* new patches
|
||||
- 64bit-portability-issue.diff
|
||||
- no-return-in-nonvoid-function.diff
|
||||
* adjusted patches
|
||||
- bitmap_always_unscaled.diff
|
||||
- disable-root-xorg_conf.diff
|
||||
- p_ppc_domain_workaround.diff
|
||||
- pixman.diff
|
||||
- ps_showopts.diff
|
||||
- xorg-server-1.4-vnc.patch
|
||||
- bug-197858_dpms.diff
|
||||
- Mesa sources no longer required for xorg-server 1.5
|
||||
- VNC patches + build disabled for now
|
||||
- disabled some IA64 patches for now
|
||||
* Fri Jun 13 2008 sndirsch@suse.de
|
||||
- xorg-x11-Xvnc: added meta file for SuSEfirewall2 (bnc #398855)
|
||||
* Wed Jun 11 2008 sndirsch@suse.de
|
||||
|
||||
22
xprint.diff
22
xprint.diff
@ -1,22 +0,0 @@
|
||||
diff -u -r hw/xprint/config/C/print/models.orig/CANONC3200-PS/fonts/Makefile.am hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
|
||||
--- hw/xprint/config/C/print/models.orig/CANONC3200-PS/fonts/Makefile.am 2006-07-31 14:23:10.000000000 +0200
|
||||
+++ hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-07-31 14:23:46.000000000 +0200
|
||||
@@ -20,7 +20,6 @@
|
||||
LubalinGraph-Demi.pmf \
|
||||
LubalinGraph-DemiOblique.pmf \
|
||||
NewCentSchlbk-Bold.pmf \
|
||||
- NewCentSchlbk-BoldItal.pmf \
|
||||
NewCentSchlbk-Ital.pmf \
|
||||
NewCentSchlbk-Roman.pmf \
|
||||
Souvenir-Demi.pmf \
|
||||
diff -u -r hw/xprint/config/C/print/models.orig/HPLJ4050-PS/fonts/Makefile.am hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
|
||||
--- hw/xprint/config/C/print/models.orig/HPLJ4050-PS/fonts/Makefile.am 2006-07-31 14:23:10.000000000 +0200
|
||||
+++ hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-07-31 14:24:05.000000000 +0200
|
||||
@@ -20,7 +20,6 @@
|
||||
LubalinGraph-Demi.pmf \
|
||||
LubalinGraph-DemiOblique.pmf \
|
||||
NewCentSchlbk-Bold.pmf \
|
||||
- NewCentSchlbk-BoldItal.pmf \
|
||||
NewCentSchlbk-Ital.pmf \
|
||||
NewCentSchlbk-Roman.pmf \
|
||||
Souvenir-Demi.pmf \
|
||||
@ -1,42 +0,0 @@
|
||||
commit 45cc03726b49f6ad4afe6c3fb4ad65d1051928b4
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Thu Oct 11 18:23:25 2007 +0200
|
||||
|
||||
Make mode checking more tolerant like in pre-RandR times.
|
||||
|
||||
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
|
||||
index f49c292..9981789 100644
|
||||
--- a/hw/xfree86/modes/xf86Modes.c
|
||||
+++ b/hw/xfree86/modes/xf86Modes.c
|
||||
@@ -389,8 +389,8 @@ xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
|
||||
|
||||
bad = TRUE;
|
||||
for (i = 0; i < mon->nHsync; i++) {
|
||||
- if (xf86ModeHSync(mode) >= mon->hsync[i].lo &&
|
||||
- xf86ModeHSync(mode) <= mon->hsync[i].hi)
|
||||
+ if (xf86ModeHSync(mode) >= mon->hsync[i].lo * (1-SYNC_TOLERANCE) &&
|
||||
+ xf86ModeHSync(mode) <= mon->hsync[i].hi * (1+SYNC_TOLERANCE))
|
||||
{
|
||||
bad = FALSE;
|
||||
}
|
||||
@@ -400,8 +400,8 @@ xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
|
||||
|
||||
bad = TRUE;
|
||||
for (i = 0; i < mon->nVrefresh; i++) {
|
||||
- if (xf86ModeVRefresh(mode) >= mon->vrefresh[i].lo &&
|
||||
- xf86ModeVRefresh(mode) <= mon->vrefresh[i].hi)
|
||||
+ if (xf86ModeVRefresh(mode) >= mon->vrefresh[i].lo * (1-SYNC_TOLERANCE) &&
|
||||
+ xf86ModeVRefresh(mode) <= mon->vrefresh[i].hi * (1+SYNC_TOLERANCE))
|
||||
{
|
||||
bad = FALSE;
|
||||
}
|
||||
@@ -434,7 +434,8 @@ xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList,
|
||||
for (mode = modeList; mode != NULL; mode = mode->next) {
|
||||
Bool good = FALSE;
|
||||
for (i = 0; i < n_ranges; i++) {
|
||||
- if (mode->Clock >= min[i] && mode->Clock <= max[i]) {
|
||||
+ if (mode->Clock >= min[i] * (1-SYNC_TOLERANCE) &&
|
||||
+ mode->Clock <= max[i] * (1+SYNC_TOLERANCE)) {
|
||||
good = TRUE;
|
||||
break;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user