pool/xorg-x11-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=1

Browse Source
This commit is contained in:
OBS User unknown 2006-12-18 14:48:26 +00:00 committed by Git OBS Bridge
commit 4322339484
46 changed files with 2821 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

23
64bit.diff Normal file
View File

@ -0,0 +1,23 @@
--- hw/xfree86/common.orig/xf86Events.c 2006-06-27 10:16:25.000000000 +0000
+++ hw/xfree86/common/xf86Events.c 2006-06-27 10:43:01.000000000 +0000
@@ -1292,8 +1292,8 @@
size_t size, i;
char **strings;
ErrorF("\nBacktrace:\n");
- size = backtrace(array, 32);
- strings = backtrace_symbols(array, size);
+ size = (size_t) backtrace(array, 32);
+ strings = (char **) backtrace_symbols(array, size);
for (i = 0; i < size; i++)
ErrorF("%d: %s\n", i, strings[i]);
free(strings);
--- hw/xfree86/dri/drimodule.c.orig 2006-12-08 20:54:05.218730315 +0100
+++ hw/xfree86/dri/drimodule.c 2006-12-08 20:54:46.246132159 +0100
@@ -88,6 +88,6 @@
drmSetServerInfo(&DRIDRMServerInfo);
/* Need a non-NULL return value to indicate success */
- return 1;
+ return (pointer) 1;
}

10
Mesa-6.5.2.diff Normal file
View File

@ -0,0 +1,10 @@
--- GL/mesa/main/Makefile.am.orig 2006-12-03 03:20:15.697973056 +0100
+++ GL/mesa/main/Makefile.am 2006-12-03 03:20:35.293300149 +0100
@@ -60,6 +60,7 @@
light.c \
lines.c \
matrix.c \
+ mipmap.c \
mm.c \
occlude.c \
pixel.c \

3
Mesa-6.5.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9bd2f940b3461574076fa1b6161430b8ed1d9d451d183411f40edfc6ce4034bd
size 5950038

8
README.updates Normal file
View File

@ -0,0 +1,8 @@
Xserver module update mechanism
-------------------------------
If any corresponding Xserver module is found below
"/usr/lib/xorg/modules/updates/" ("/usr/lib64/xorg/modules/updates/"
on biarch 32/64 bit platforms) it will be favored over the one in
"/usr/lib/xorg/modules/" ("/usr/lib64/xorg/modules/" on biarch 32/64
bit platforms).

12
acpi_events.diff Normal file
View File

@ -0,0 +1,12 @@
diff -urp xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c ../xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c
--- xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c 2006-10-12 00:42:19.000000000 +0200
+++ ../xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c 2006-11-20 11:50:46.000000000 +0100
@@ -180,7 +180,7 @@ lnxAPMOpen(void)
close(pfd);
xf86PMGetEventFromOs = lnxPMGetEventFromOs;
xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
- APMihPtr = xf86AddInputHandler(fd,xf86HandlePMEvents,NULL);
+ APMihPtr = xf86AddGeneralHandler(fd,xf86HandlePMEvents,NULL);
xf86MsgVerb(X_INFO,3,"Open APM successful\n");
return lnxCloseAPM;
}

11
cfb8-undefined.diff Normal file
View File

@ -0,0 +1,11 @@
--- cfb/cfbteblt8.c.orig 2006-10-17 12:06:18.000000000 +0200
+++ cfb/cfbteblt8.c 2006-10-17 12:08:18.000000000 +0200
@@ -301,7 +301,7 @@
#define StorePixels(o,p) dst[o] = p
#define Loop dst += widthDst;
#else
-#define StorePixels(o,p) *dst++ = (p)
+#define StorePixels(o,p) do { *dst = (p); dst++; } while (0)
#define Loop dst += widthLeft;
#endif

11
disable-aiglx.diff Normal file
View File

@ -0,0 +1,11 @@
--- ./hw/xfree86/common/xf86Config.c.orig 2006-08-12 11:45:01.000000000 +0200
+++ ./hw/xfree86/common/xf86Config.c 2006-08-12 11:45:29.000000000 +0200
@@ -1017,7 +1017,7 @@
else
xf86Info.estimateSizesAggressively = 0;
- xf86Info.aiglx = TRUE;
+ xf86Info.aiglx = FALSE;
xf86Info.aiglxFrom = X_DEFAULT;
if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
xf86Info.aiglx = value;

22
disable-fbblt-opt.diff Normal file
View File

@ -0,0 +1,22 @@
--- fb/fbblt.c.orig 2006-09-13 15:01:32.000000000 +0200
+++ fb/fbblt.c 2006-09-13 15:05:14.000000000 +0200
@@ -78,6 +78,11 @@ fbBlt (FbBits *srcLine,
}
#endif
+/*
+ * Disable optimization (introduced by ajax) due to a general vesa
+ * driver crash later in memcpy
+*/
+#if 0
if (alu == GXcopy && pm == FB_ALLONES && !reverse &&
!(srcX & 7) && !(dstX & 7) && !(width & 7)) {
int i;
@@ -99,6 +104,7 @@ fbBlt (FbBits *srcLine,
return;
}
+#endif
FbInitializeMergeRop(alu, pm);
destInvarient = FbDestInvarientMergeRop();

102
disable-root-xorg_conf.diff Normal file
View File

@ -0,0 +1,102 @@
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:
.B $XORGCONFIG
.IB /etc/X11/ $XORGCONFIG
.IB __projectroot__/etc/X11/ $XORGCONFIG
-.BI $HOME /__xconfigfile__
.I /etc/X11/__xconfigfile__-4
.I /etc/X11/__xconfigfile__
.I /etc/__xconfigfile__
@@ -85,10 +84,7 @@ is the path specified with the
command line option (which may be absolute or relative),
.B $XORGCONFIG
is the path specified by that
-environment variable (absolute or relative),
-.B $HOME
-is the path specified by that environment variable (usually the home
-directory), and
+environment variable (absolute or relative), and
.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," \
@@ -126,7 +125,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," \

11
fpic.diff Normal file
View File

@ -0,0 +1,11 @@
--- hw/xfree86/parser/Makefile.am.orig 2006-06-30 21:15:50.231016743 +0200
+++ hw/xfree86/parser/Makefile.am 2006-06-30 21:16:12.207190774 +0200
@@ -23,7 +23,7 @@
DRI.c \
Extensions.c
-AM_CFLAGS = $(XORG_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) -fPIC
EXTRA_DIST = \
Configint.h \

57
glx-align.patch Normal file
View File

@ -0,0 +1,57 @@
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 @@
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
-DNO_LIBCWRAPPER \
- @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

32
libdrm.diff Normal file
View File

@ -0,0 +1,32 @@
--- hw/xfree86/common/xf86Helper.c.orig 2006-12-13 16:21:35.000000000 +0100
+++ hw/xfree86/common/xf86Helper.c 2006-12-13 18:23:53.000000000 +0100
@@ -2386,22 +2386,29 @@
_X_EXPORT pointer
xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
{
pointer ret;
int errmaj = 0, errmin = 0;
ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL,
&errmaj, &errmin);
if (!ret)
LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
+
+ /* "drm" module has been merged into "dri" module, but some drivers
+ are still trying to load it explictely and fail if it doesn't exist :-( */
+ if (!ret && !strcmp(name,"drm")) {
+ ret = (pointer) -1;
+ }
+
return ret;
}
/*
* xf86LoadOneModule loads a single module.
*/
_X_EXPORT pointer
xf86LoadOneModule(char *name, pointer opt)
{
int errmaj, errmin;
char *Name;

1
modprobe.nvidia Normal file
View File

@ -0,0 +1 @@
options nvidia NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=33 NVreg_DeviceFileMode=0660

13
mouse.diff Normal file
View File

@ -0,0 +1,13 @@
--- hw/xfree86/common/xf86Configure.c.orig 2006-10-14 10:24:36.000000000 +0000
+++ hw/xfree86/common/xf86Configure.c 2006-10-14 10:23:39.000000000 +0000
@@ -88,8 +88,8 @@
static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
static char *DFLT_MOUSE_PROTO = "auto";
#elif defined(linux)
-static char DFLT_MOUSE_DEV[] = "/dev/input/mice";
-static char DFLT_MOUSE_PROTO[] = "auto";
+static char* DFLT_MOUSE_DEV = "/dev/input/mice";
+static char* DFLT_MOUSE_PROTO = "auto";
#else
static char *DFLT_MOUSE_DEV = "/dev/mouse";
static char *DFLT_MOUSE_PROTO = "auto";

13
p_ValidatePci.diff Normal file
View File

@ -0,0 +1,13 @@
--- 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);

48
p_bug159532.diff Normal file
View File

@ -0,0 +1,48 @@
Index: programs/Xserver/fb/fbcompose.c
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/fb/fbcompose.c,v
retrieving revision 1.1.1.16
diff -u -r1.1.1.16 programs/Xserver/fb/fbcompose.c
--- programs/Xserver/fb/fbcompose.c 23 Jan 2006 11:13:59 -0000 1.1.1.16
+++ programs/Xserver/fb/fbcompose.c 20 Mar 2006 16:56:50 -0000
@@ -2610,6 +2610,7 @@
fetchPixelProc fetch = fetchPixelProcForPicture(pict);
miIndexedPtr indexed = (miIndexedPtr) pict->pFormat->index.devPrivate;
+ if (!fetch) return;
fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
bits += yoff*stride + (xoff*bpp >> FB_SHIFT);
@@ -2627,6 +2628,8 @@
int bpp;
int xoff, yoff;
fetchProc fetch = fetchProcForPicture(pict);
+ if (!fetch)
+ return;
miIndexedPtr indexed = (miIndexedPtr) pict->pFormat->index.devPrivate;
fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
@@ -2871,6 +2874,7 @@
fetch = fetchPixelProcForPicture(pict);
+ if (!fetch) return;
fbGetDrawable(pict->pDrawable, bits, stride, bpp, xoff, yoff);
x += xoff;
y += yoff;
@@ -3340,6 +3344,7 @@
int bpp;
int xoff, yoff;
storeProc store = storeProcForPicture(pict);
+ if (!store) return;
miIndexedPtr indexed = (miIndexedPtr) pict->pFormat->index.devPrivate;
fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
@@ -3369,6 +3374,7 @@
store = storeProcForPicture(pict);
astore = storeProcForPicture(pict->alphaMap);
+ if (!store || !astore) return;
aindexed = (miIndexedPtr) pict->alphaMap->pFormat->index.devPrivate;
ax = x;

67
p_bug96328.diff Normal file
View File

@ -0,0 +1,67 @@
Index: xf86Configure.c
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v
retrieving revision 1.1.1.43.10.1
diff -u -r1.1.1.43.10.1 xf86Configure.c
--- programs/Xserver/hw/xfree86/common/xf86Configure.c 28 Jan 2005 16:21:08 -0000 1.1.1.43.10.1
+++ programs/Xserver/hw/xfree86/common/xf86Configure.c 3 Aug 2005 14:54:46 -0000
@@ -267,34 +267,36 @@
/* Crude mechanism to auto-detect mouse (os dependent) */
{
- int fd;
-#if 0 && defined linux
- /* Our autodetection code can do a better job */
- int len;
- char path[32];
-
- if ((len = readlink(DFLT_MOUSE_DEV, path, sizeof(path) - 1)) > 0) {
- path[len] = '\0';
- if (strstr(path, "psaux") != NULL)
- DFLT_MOUSE_PROTO = "PS/2";
- }
-#endif
+ int fd = -1;
+
#ifdef WSCONS_SUPPORT
- fd = open("/dev/wsmouse", 0);
- if (fd > 0) {
- DFLT_MOUSE_DEV = "/dev/wsmouse";
- DFLT_MOUSE_PROTO = "wsmouse";
- close(fd);
- } else {
- ErrorF("cannot open /dev/wsmouse\n");
+ if (fd == -1) {
+ fd = open("/dev/wsmouse", 0);
+ if (fd != -1) {
+ DFLT_MOUSE_DEV = "/dev/wsmouse";
+ DFLT_MOUSE_PROTO = "wsmouse";
+ close(fd);
+ } else {
+ ErrorF("cannot open /dev/wsmouse\n");
+ }
}
#endif
#ifndef __SCO__
- fd = open(DFLT_MOUSE_DEV, 0);
- if (fd != -1) {
- foundMouse = TRUE;
- close(fd);
+ if (fd == -1) {
+ fd = open(DFLT_MOUSE_DEV, 0);
+# ifdef linux
+ if (fd == -1) {
+ char *name = "/dev/input/mice";
+ fd = open(name, 0);
+ if (fd != -1)
+ DFLT_MOUSE_DEV = name;
+ }
+# endif
+ if (fd != -1) {
+ foundMouse = TRUE;
+ close(fd);
+ }
}
#else
foundMouse = TRUE;

35
p_default-module-path.diff Normal file
View File

@ -0,0 +1,35 @@
diff -u -r hw/xfree86.orig/common/xf86Globals.c hw/xfree86/common/xf86Globals.c
--- hw/xfree86.orig/common/xf86Globals.c 2006-07-05 12:37:32.000000000 +0200
+++ hw/xfree86/common/xf86Globals.c 2006-07-05 14:59:51.000000000 +0200
@@ -176,7 +176,7 @@
};
const char *xf86ConfigFile = NULL;
const char *xf86InputDeviceList = NULL;
-const char *xf86ModulePath = DEFAULT_MODULE_PATH;
+const char *xf86ModulePath = "/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules";
MessageType xf86ModPathFrom = X_DEFAULT;
const char *xf86LogFile = DEFAULT_LOGPREFIX;
MessageType xf86LogFileFrom = X_DEFAULT;
diff -u -r hw/xfree86.orig/loader/loader.c hw/xfree86/loader/loader.c
--- hw/xfree86.orig/loader/loader.c 2006-07-05 12:37:33.000000000 +0200
+++ hw/xfree86/loader/loader.c 2006-07-05 15:00:41.000000000 +0200
@@ -410,7 +410,7 @@
*/
{
int errmaj, errmin, wasLoaded; /* place holders */
- char *xcrtpath = DEFAULT_MODULE_PATH "/libcrt.a";
+ char *xcrtpath = "/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules" "/libcrt.a";
char *uwcrtpath = "/usr/ccs/lib/libcrt.a";
char *path;
struct stat st;
--- hw/xfree86/common/xf86Init.c.orig 2006-12-03 17:35:17.412779270 +0100
+++ hw/xfree86/common/xf86Init.c 2006-12-03 17:37:29.048826467 +0100
@@ -1876,7 +1876,7 @@
static void
xf86PrintDefaultModulePath(void)
{
- ErrorF("%s\n", DEFAULT_MODULE_PATH);
+ ErrorF("/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules\n");
}
static void

23
p_enable-altrix.diff Normal file
View File

@ -0,0 +1,23 @@
diff -urp ../xorg-server-1.1.99.3.pre-enable-altrix/hw/xfree86/os-support/linux/lnx_ia64.c ./hw/xfree86/os-support/linux/lnx_ia64.c
--- ../xorg-server-1.1.99.3.pre-enable-altrix/hw/xfree86/os-support/linux/lnx_ia64.c 2006-07-20 22:27:48.000000000 +0200
+++ ./hw/xfree86/os-support/linux/lnx_ia64.c 2006-10-09 15:53:48.000000000 +0200
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include "ia64Pci.h"
+#include "shared/ia64Pci.h"
#include "Pci.h"
#if defined OS_PROBE_PCI_CHIPSET
diff -urp ../xorg-server-1.1.99.3.pre-enable-altrix/hw/xfree86/os-support/shared/ia64Pci.h ./hw/xfree86/os-support/shared/ia64Pci.h
--- ../xorg-server-1.1.99.3.pre-enable-altrix/hw/xfree86/os-support/shared/ia64Pci.h 2006-07-20 22:27:48.000000000 +0200
+++ ./hw/xfree86/os-support/shared/ia64Pci.h 2006-10-09 15:53:25.000000000 +0200
@@ -40,6 +40,7 @@ typedef enum {
ALTIX_CHIPSET
} IA64Chipset;
+#define OS_PROBE_PCI_CHIPSET OS_PROBE_PCI_CHIPSET_do
# ifdef OS_PROBE_PCI_CHIPSET
extern IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags);
# endif

78
p_ia64-console.diff Normal file
View File

@ -0,0 +1,78 @@
Index: linux/lnx_init.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v
retrieving revision 1.9
diff -u -r1.9 lnx_init.c
--- linux/lnx_init.c 26 Aug 2005 07:35:55 -0000 1.9
+++ linux/lnx_init.c 29 Jun 2006 09:33:05 -0000
@@ -243,9 +243,6 @@
if (!ShareVTs)
{
-#if defined(DO_OS_FONTRESTORE)
- lnx_savefont();
-#endif
/*
* now get the VT
*/
@@ -256,7 +253,9 @@
if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
strerror(errno));
-
+#if defined(DO_OS_FONTRESTORE)
+ lnx_savefont();
+#endif
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
strerror(errno));
@@ -345,6 +344,11 @@
if (VTSwitch)
{
+#if defined(DO_OS_FONTRESTORE)
+ if (xf86Info.vtno == vtno) /* check if we are active */
+ lnx_restorefont();
+ lnx_freefontdata();
+#endif
/*
* Perform a switch back to the active VT when we were started
*/
@@ -355,11 +359,6 @@
activeVT = -1;
}
-#if defined(DO_OS_FONTRESTORE)
- if (xf86Info.vtno == vtno) /* check if we are active */
- lnx_restorefont();
- lnx_freefontdata();
-#endif
}
close(xf86Info.consoleFd); /* make the vt-manager happy */
Index: shared/VTsw_usl.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v
retrieving revision 1.5
diff -u -r1.5 VTsw_usl.c
--- shared/VTsw_usl.c 3 Jul 2005 07:01:35 -0000 1.5
+++ shared/VTsw_usl.c 29 Jun 2006 09:33:05 -0000
@@ -64,15 +64,15 @@
xf86VTSwitchAway()
{
xf86Info.vtRequestsPending = FALSE;
+#ifdef OSSWITCHAWAY
+ OSSWITCHAWAY;
+#endif
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
{
return(FALSE);
}
else
{
-#ifdef OSSWITCHAWAY
- OSSWITCHAWAY;
-#endif
return(TRUE);
}
}

19
p_initialize-pci-tag.diff Normal file
View File

@ -0,0 +1,19 @@
Index: linux.c
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v
retrieving revision 1.1.1.30
diff -u -r1.1.1.30 linux.c
--- linux.c 13 Sep 2005 10:31:31 -0000 1.1.1.30
+++ linux.c 27 Jun 2006 14:25:58 -0000
@@ -158,6 +158,11 @@
pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec));
pInt->scrnIndex = screen;
pInt->entityIndex = entityIndex;
+ {
+ pciVideoPtr pvp = xf86GetPciInfoForEntity(entityIndex);
+ if (pvp) pInt->Tag = ((pciConfigPtr)(pvp->thisCard))->tag;
+ }
+
if (!xf86Int10ExecSetup(pInt))
goto error0;
pInt->mem = &linuxMem;

50
p_mouse_misc.diff Normal file
View File

@ -0,0 +1,50 @@
Index: programs/Xserver/hw/xfree86/common/xf86MiscExt.c
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v
retrieving revision 1.1.1.15
diff -u -r1.1.1.15 xf86MiscExt.c
--- programs/Xserver/hw/xfree86/common/xf86MiscExt.c 6 Jul 2004 15:12:40 -0000 1.1.1.15
+++ programs/Xserver/hw/xfree86/common/xf86MiscExt.c 17 Mar 2005 18:39:52 -0000
@@ -166,6 +166,11 @@
*devname = xf86FindOptionValue(pInfo->options, "Device");
pMse = pInfo->private;
+ if (pMse->magic != MOUSE_MAGIC
+ || pMse->size != sizeof(*pMse))
+ return FALSE;
+
+
mseptr->type = MapMseProtoToMisc(pMse->protocolID);
mseptr->baudrate = pMse->baudRate;
mseptr->samplerate = pMse->sampleRate;
@@ -533,6 +538,11 @@
pInfo = mse->private;
pMse = pInfo->private;
+
+ if (pMse->magic != MOUSE_MAGIC
+ || pMse->size != sizeof(*pMse))
+ return MISC_RET_NOMODULE;
+
oldflags = pMse->mouseFlags;
newProtocol = MapMseMiscToProto(mse->type);
Index: programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h,v
retrieving revision 1.1.1.21
diff -u -r1.1.1.21 xf86OSmouse.h
--- programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 1 Nov 2004 16:46:39 -0000 1.1.1.21
+++ programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 17 Mar 2005 18:39:52 -0000
@@ -204,7 +204,11 @@
int dx, int dy, int dz, int dw);
typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo);
+#define MOUSE_MAGIC 15031995
+
typedef struct _MouseDevRec {
+ unsigned long magic;
+ int size;
PtrCtrlProcPtr Ctrl;
PostMseEventProc PostEvent;
MouseCommonOptProc CommonOptions;

238
p_pci-ce-x.diff Normal file
View File

@ -0,0 +1,238 @@
diff -urp ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/altixPCI.c ./hw/xfree86/os-support/bus/altixPCI.c
--- ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/altixPCI.c 2006-08-22 15:35:31.000000000 +0200
+++ ./hw/xfree86/os-support/bus/altixPCI.c 2006-08-24 16:16:52.000000000 +0200
@@ -11,75 +11,6 @@
#include "xf86.h"
#include "Pci.h"
-/*
- * get_dev_on_bus - Return the first device we find on segnum, busnum
- *
- * Walk all the PCI devices and return the first one found on segnum, busnum.
- * There may be a better way to do this in some xf86* function I don't know
- * about.
- */
-static pciDevice *get_dev_on_bus(unsigned int segnum, unsigned int busnum)
-{
- pciDevice **pdev = xf86scanpci(0);
- int i;
-
- for (i = 0; pdev[i] != NULL; i++)
- if (PCI_DOM_FROM_TAG(pdev[i]->tag) == segnum &&
- pdev[i]->busnum == busnum)
- return pdev[i];
- /* Should never get here... */
- ErrorF("No PCI device found on %04x:%02x??", segnum, busnum);
- return NULL;
-}
-
-/*
- * get_bridge_info - fill in the bridge info for bus_info based on pdev
- *
- * Find the parent bus for pdev if it exists, otherwise assume pdev *is*
- * the parent bus. We need this on Altix because our bridges are transparent.
- */
-static void get_bridge_info(pciBusInfo_t *bus_info, pciDevice *pdev)
-{
- unsigned int parent_segnum, segnum = PCI_DOM_FROM_TAG(pdev->tag);
- unsigned int parent_busnum, parent_nodombus, busnum = pdev->busnum;
- unsigned int nodombus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(pdev->tag));
- char bridge_path[] = "/sys/class/pci_bus/0000:00/bridge";
- char bridge_target[] = "../../../devices/pci0000:00";
-
- /* Path to this device's bridge */
- sprintf(bridge_path, "/sys/class/pci_bus/%04x:%02x/bridge", segnum,
- nodombus);
-
- if (readlink(bridge_path, bridge_target, strlen(bridge_target)) < 0) {
- perror("failed to dereference bridge link");
- ErrorF("failed to dereference bridge link, aborting\n");
- exit(-1);
- }
-
- sscanf(bridge_target, "../../../devices/pci%04x:%02x", &parent_segnum,
- &parent_nodombus);
-
- parent_busnum = PCI_MAKE_BUS(parent_segnum, parent_nodombus);
-
- /*
- * If there's no bridge or the bridge points to the device, use
- * pdev as the bridge
- */
- if (segnum == parent_segnum && busnum == parent_busnum) {
- bus_info->bridge = pdev;
- bus_info->secondary = FALSE;
- bus_info->primary_bus = busnum;
- } else {
- bus_info->bridge = get_dev_on_bus(parent_segnum,
- parent_busnum);
- bus_info->secondary = TRUE;
- bus_info->primary_bus = parent_busnum;
- }
- pdev->businfo = bus_info;
- pdev->pci_base_class = PCI_CLASS_DISPLAY;
- pdev->pci_sub_class = PCI_SUBCLASS_PREHISTORIC_VGA;
-}
-
void xf86PreScanAltix(void)
{
/* Nothing to see here... */
@@ -88,36 +19,65 @@ void xf86PreScanAltix(void)
void xf86PostScanAltix(void)
{
pciConfigPtr *pdev;
- pciBusInfo_t *bus_info;
- int prevBusNum, curBusNum, idx;
+ int idx, free_idx;
/*
- * Altix PCI bridges are invisible to userspace, so we make each device
- * look like it's its own bridge unless it actually has a parent (as in
- * the case of PCI to PCI bridges).
+ * Some altix pci chipsets do not expose themselves as host
+ * bridges.
+ *
+ * Walk the devices looking for buses for which there is not a
+ * corresponding pciDevice entry (ie. pciBusInfo[]->bridge is NULL).
+ *
+ * It is assumed that this indicates a root bridge for which we will
+ * construct a fake pci host bridge device.
*/
- bus_info = pciBusInfo[0];
+
pdev = xf86scanpci(0);
- prevBusNum = curBusNum = pdev[0]->busnum;
- bus_info = pciBusInfo[curBusNum];
- bus_info->bridge = pdev[0];
- bus_info->secondary = FALSE;
- bus_info->primary_bus = curBusNum;
-
- /* Walk all the PCI devices, assigning their bridge info */
- for (idx = 0; pdev[idx] != NULL; idx++) {
- if (pdev[idx]->busnum == prevBusNum)
- continue; /* Already fixed up this bus */
+ for (idx = 0; pdev[idx] != NULL; idx++)
+ ;
- curBusNum = pdev[idx]->busnum;
- bus_info = pciBusInfo[curBusNum];
+ free_idx = idx;
+
+ for (idx = 0; idx < free_idx; idx++) {
+ pciConfigPtr dev, fakedev;
+ pciBusInfo_t *businfo;
+
+ dev = pdev[idx];
+ businfo = pciBusInfo[dev->busnum];
+
+ if (! businfo) {
+ /* device has no bus ... should this be an error? */
+ continue;
+ }
+
+ if (businfo->bridge) {
+ /* bus has a device ... no need for fixup */
+ continue;
+ }
+
+ if (free_idx >= MAX_PCI_DEVICES)
+ FatalError("SN: No room for fake root bridge device\n");
/*
- * Fill in bus_info for pdev. The bridge field will either
- * be pdev[idx] or a device on the parent bus.
+ * Construct a fake device and stick it at the end of the
+ * pdev array. Make it look like a host bridge.
*/
- get_bridge_info(bus_info, pdev[idx]);
- prevBusNum = curBusNum;
+ fakedev = xnfcalloc(1, sizeof(pciDevice));
+ fakedev->tag = PCI_MAKE_TAG(dev->busnum, 0, 0);;
+ fakedev->busnum = dev->busnum;
+ fakedev->devnum = 0;
+ fakedev->funcnum = 0;
+ fakedev->fakeDevice = 1;
+ /* should figure out a better DEVID */
+ fakedev->pci_device_vendor = DEVID(VENDOR_GENERIC, CHIP_VGA);
+ fakedev->pci_base_class = PCI_CLASS_BRIDGE;
+
+ businfo->secondary = 0;
+ businfo->primary_bus = dev->busnum;
+ businfo->bridge = fakedev;
+
+ fakedev->businfo = businfo;
+
+ pdev[free_idx++] = fakedev;
}
- return;
}
diff -urp ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/linuxPci.c ./hw/xfree86/os-support/bus/linuxPci.c
--- ../xorg-server-1.1.99.3.old/hw/xfree86/os-support/bus/linuxPci.c 2006-08-22 17:47:35.000000000 +0200
+++ ./hw/xfree86/os-support/bus/linuxPci.c 2006-08-24 16:16:52.000000000 +0200
@@ -653,7 +653,7 @@ linuxOpenLegacy(PCITAG Tag, char *name)
return fd;
}
- pBusInfo = pciBusInfo[bus];
+ pBusInfo = pciBusInfo[PCI_BUS_FROM_TAG(Tag)];
if (!pBusInfo || (bridge == pBusInfo->bridge) ||
!(bridge = pBusInfo->bridge)) {
xfree(path);
@@ -685,7 +685,7 @@ xf86MapDomainMemory(int ScreenNum, int F
* We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs
* legacy_mem interface is unavailable.
*/
- if (Base > 1024*1024)
+ if (Base >= 1024*1024)
return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
PCIIOC_MMAP_IS_MEM);
@@ -773,8 +773,8 @@ xf86ReadDomainMemory(PCITAG Tag, ADDRESS
bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag));
dev = PCI_DEV_FROM_TAG(Tag);
func = PCI_FUNC_FROM_TAG(Tag);
- sprintf(file, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/rom",
- dom, bus, dom, bus, dev, func);
+ sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom",
+ dom, bus, dev, func);
/*
* If the caller wants the ROM and the sysfs rom interface exists,
@@ -1072,7 +1072,37 @@ ia64linuxPciFindNext(void)
}
if (sscanf(entry->d_name, "%02x . %01x", &dev, &func) == 2) {
+ CARD32 tmp;
+
pciDeviceTag = PCI_MAKE_TAG(PCI_MAKE_BUS(domain, bus), dev, func);
+
+ /*
+ * Check if the device is a pci-pci bridge. If so, make sure the
+ * primary_bus and secondary fields are set correctly.
+ */
+ tmp = pciReadLong(pciDeviceTag, PCI_CLASS_REG);
+ if ((PCI_CLASS_EXTRACT(tmp) == PCI_CLASS_BRIDGE) &&
+ (PCI_SUBCLASS_EXTRACT(tmp) == PCI_SUBCLASS_BRIDGE_PCI)) {
+
+ int sec_bus;
+ CARD32 bridge_reg;
+
+ bridge_reg = pciReadLong(pciDeviceTag, PCI_PCI_BRIDGE_BUS_REG);
+ sec_bus = PCI_SECONDARY_BUS_EXTRACT(bridge_reg, pciDeviceTag);
+
+ if (sec_bus < pciMaxBusNum) {
+ if (!pciBusInfo[sec_bus]) {
+ pciBusInfo[sec_bus] = xnfalloc(sizeof(pciBusInfo_t));
+ *pciBusInfo[sec_bus] = *pciBusInfo[0];
+ }
+
+ pciBusInfo[sec_bus]->primary_bus = PCI_MAKE_BUS(domain, bus);
+ pciBusInfo[sec_bus]->secondary = TRUE;
+ if (pciNumBuses <= sec_bus)
+ pciNumBuses = sec_bus + 1;
+ }
+ }
+
devid = pciReadLong(pciDeviceTag, PCI_ID_REG);
if ((devid & pciDevidMask) == pciDevid)
/* Yes - Return it. Otherwise, next device */

11
p_pci-domain.diff Normal file
View File

@ -0,0 +1,11 @@
--- hw/xfree86/os-support/bus/xf86Pci.h.p_pci-domain.diff 2006-11-13 19:59:23.000000000 +0100
+++ hw/xfree86/os-support/bus/xf86Pci.h 2006-11-14 05:39:22.000000000 +0100
@@ -767,6 +767,8 @@
ADDRESS pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr);
PCITAG pciTag(int busnum, int devnum, int funcnum);
PCITAG pciDomTag(int domnum, int busnum, int devnum, int funcnum);
+void pciInfoFromTag(PCITAG tag, int *domainnum,
+ int *busnum, int *devnum, int *funcnum);
int pciGetBaseSize(PCITAG tag, int indx, Bool destructive, Bool *min);
CARD32 pciCheckForBrokenBase(PCITAG tag,int basereg);
pointer xf86MapPciMem(int ScreenNum, int Flags, PCITAG Tag,

11
p_pci-off-by-one.diff Normal file
View File

@ -0,0 +1,11 @@
--- hw/xfree86/os-support/bus/linuxPci.c.orig 2006-11-20 22:04:35.000000000 +0100
+++ hw/xfree86/os-support/bus/linuxPci.c 2006-11-20 22:06:08.000000000 +0100
@@ -547,7 +547,7 @@
pPCI = xf86GetPciHostConfigFromTag(Tag);
if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum)))
- return result;
+ return result + 1;
if (!pPCI || pPCI->fakeDevice)
return 1; /* Domain 0 is reserved */

13
p_ppc_domain_workaround.diff Normal file
View File

@ -0,0 +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)
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);

36
p_vga-crashfix.diff Normal file
View File

@ -0,0 +1,36 @@
Index: programs/Xserver/miext/cw/cw.c
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/miext/cw/cw.c,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 cw.c
--- programs/Xserver/miext/cw/cw.c 25 Nov 2005 10:05:47 -0000 1.1.1.5
+++ programs/Xserver/miext/cw/cw.c 28 Nov 2005 18:24:10 -0000
@@ -659,7 +659,7 @@
SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap);
#ifdef RENDER
- if (GetPictureScreen (pScreen))
+ if (GetPictureScreenIfSet (pScreen))
cwInitializeRender(pScreen);
#endif
}
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);

11
p_xf86Mode.diff Normal file
View File

@ -0,0 +1,11 @@
--- programs/Xserver/hw/xfree86/common/xf86Mode.c.orig 2005-11-30 11:35:17.000000000 +0100
+++ programs/Xserver/hw/xfree86/common/xf86Mode.c 2006-01-30 15:25:48.000000000 +0100
@@ -765,7 +765,7 @@
}
if (mon_range) {
/* mode->Clock in kHz, DDC in MHz */
- if (mon_range->max_clock < 2550 &&
+ if (mon_range->max_clock != 0 && mon_range->max_clock < 2550 &&
mode->Clock / 1000.0 > mon_range->max_clock) {
xf86Msg(X_WARNING,
"(%s,%s) mode clock %gMHz exceeds DDC maximum %dMHz\n",

16
p_xkills_wrong_client.diff Normal file
View File

@ -0,0 +1,16 @@
Index: programs/Xserver/os/connection.c
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/os/connection.c,v
retrieving revision 1.1.1.35
diff -u -r1.1.1.35 connection.c
--- programs/Xserver/os/connection.c 13 Sep 2005 10:31:37 -0000 1.1.1.35
+++ programs/Xserver/os/connection.c 1 Mar 2006 11:00:20 -0000
@@ -1134,7 +1134,7 @@
FD_ZERO(&tmask);
FD_SET(curclient, &tmask);
r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
- if (r < 0)
+ if (r < 0 && (errno == EBADF))
CloseDownClient(clients[ConnectionTranslation[curclient]]);
mask &= ~((fd_mask)1 << curoff);
}

35
p_xnest-ignore-getimage-errors.diff Normal file
View File

@ -0,0 +1,35 @@
Index: programs/Xserver/hw/xnest/GCOps.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xnest/GCOps.c,v
retrieving revision 1.6
diff -u -p -r1.6 GCOps.c
--- programs/Xserver/hw/xnest/GCOps.c 14 Jul 2005 03:36:43 -0000 1.6
+++ programs/Xserver/hw/xnest/GCOps.c 7 Jun 2006 13:40:01 -0000
@@ -96,6 +96,13 @@ xnestPutImage(DrawablePtr pDrawable, GCP
}
}
+static int
+xnestIgnoreErrorHandler (Display *display,
+ XErrorEvent *event)
+{
+ return False; /* return value is ignored */
+}
+
void
xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
unsigned int format, unsigned long planeMask,
@@ -103,9 +110,13 @@ xnestGetImage(DrawablePtr pDrawable, int
{
XImage *ximage;
int length;
+ int (*old_handler)(Display*, XErrorEvent*);
+ /* we may get BadMatch error when xnest window is minimized */
+ old_handler = XSetErrorHandler (xnestIgnoreErrorHandler);
ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable),
x, y, w, h, planeMask, format);
+ XSetErrorHandler (old_handler);
if (ximage) {
length = ximage->bytes_per_line * ximage->height;

122
p_xorg_acpi.diff Normal file
View File

@ -0,0 +1,122 @@
diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_acpi.c hw/xfree86/os-support/linux/lnx_acpi.c
--- hw/xfree86/os-support/linux.orig/lnx_acpi.c 2006-08-07 17:57:13.000000000 +0200
+++ hw/xfree86/os-support/linux/lnx_acpi.c 2006-08-07 17:57:20.000000000 +0200
@@ -32,8 +32,10 @@
#define ACPI_VIDEO_HEAD_INVALID (~0u - 1)
#define ACPI_VIDEO_HEAD_END (~0u)
+static PMClose doLnxACPIOpen(void);
static void lnxCloseACPI(void);
static pointer ACPIihPtr = NULL;
+static OsTimerPtr acpiTimer = NULL;
PMClose lnxACPIOpen(void);
/* in milliseconds */
@@ -52,6 +54,22 @@ lnxACPIReopen(OsTimerPtr timer, CARD32 t
#define LINE_LENGTH 80
+static CARD32
+lnxACPICheckTimer(OsTimerPtr timer, CARD32 now, pointer arg)
+{
+#if DEBUG
+ ErrorF("ACPI: trying to reopen\n");
+#endif
+ if (doLnxACPIOpen()) {
+#if DEBUG
+ ErrorF("ACPI: successfully reopened\n");
+#endif
+ acpiTimer = NULL;
+ return 0;
+ }
+ return 5000;
+}
+
static int
lnxACPIGetEventFromOs(int fd, pmEvent *events, int num)
{
@@ -132,16 +150,13 @@ lnxACPIConfirmEventToOs(int fd, pmEvent
}
}
-PMClose
-lnxACPIOpen(void)
+static PMClose
+doLnxACPIOpen(void)
{
int fd;
struct sockaddr_un addr;
int r = -1;
-#ifdef DEBUG
- ErrorF("ACPI: OSPMOpen called\n");
-#endif
if (ACPIihPtr || !xf86Info.pmFlag)
return NULL;
@@ -169,6 +184,27 @@ lnxACPIOpen(void)
return lnxCloseACPI;
}
+PMClose
+lnxACPIPoll(void)
+{
+ TimerSet(NULL, 0, 5000, lnxACPICheckTimer, NULL);
+ return lnxCloseACPI;
+}
+
+PMClose
+lnxACPIOpen(void)
+{
+ PMClose ret;
+#ifdef DEBUG
+ ErrorF("ACPI: OSPMOpen called\n");
+#endif
+ if (!(ret = doLnxACPIOpen()))
+ xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET,
+ strerror(errno));
+
+ return ret;
+}
+
static void
lnxCloseACPI(void)
{
@@ -182,5 +218,11 @@ lnxCloseACPI(void)
shutdown(fd, 2);
close(fd);
ACPIihPtr = NULL;
+ xf86PMGetEventFromOs = NULL;
+ xf86PMConfirmEventToOs = NULL;
+ if (acpiTimer) {
+ TimerCancel(acpiTimer);
+ acpiTimer = NULL;
+ }
}
}
diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_apm.c hw/xfree86/os-support/linux/lnx_apm.c
--- hw/xfree86/os-support/linux.orig/lnx_apm.c 2006-08-07 17:57:13.000000000 +0200
+++ hw/xfree86/os-support/linux/lnx_apm.c 2006-08-07 17:58:08.000000000 +0200
@@ -12,6 +12,7 @@
#ifdef HAVE_ACPI
extern PMClose lnxACPIOpen(void);
+extern PMClose lnxACPIPoll(void);
#endif
#ifdef HAVE_APM
@@ -150,6 +151,14 @@ xf86OSPMOpen(void)
ret = lnxAPMOpen();
#endif
+#ifdef HAVE_ACPI
+ /* if we can neither open ACPI nor APM poll for an ACPI service to
+ become available */
+
+ if (!ret && !xf86acpiDisableFlag)
+ ret = lnxACPIPoll();
+#endif
+
return ret;
}

14
p_xorg_rom_read.diff Normal file
View File

@ -0,0 +1,14 @@
--- xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c.orig 2005-12-21 18:53:54.000000000 -0700
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2005-12-21 19:01:28.000000000 -0700
@@ -791,8 +791,10 @@
write(fd, "1", 2);
lseek(fd, 0, SEEK_SET);
+ len = min(Len, st.st_size);
+
/* copy the ROM until we hit Len, EOF or read error */
- for (i = 0; i < Len && read(fd, Buf, 1) > 0; Buf++, i++)
+ for (; len && (size = read(fd, Buf, len)) > 0 ; Buf+=size, len-=size)
;
write(fd, "0", 2);

226
ps_showopts.diff Normal file
View File

@ -0,0 +1,226 @@
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 @@
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
--- 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 @@
/* General parameters */
extern int xf86DoConfigure;
+extern int xf86DoShowOptions;
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 @@
Bool xf86ProbeFailed = FALSE;
Bool xf86DoProbe = FALSE;
Bool xf86DoConfigure = FALSE;
+Bool xf86DoShowOptions = FALSE;
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 @@
}
/* Read and parse the config file */
- if (!xf86DoProbe && !xf86DoConfigure) {
+ if (!xf86DoProbe && !xf86DoConfigure && !xf86DoShowOptions) {
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");
-
+
+ if (xf86DoShowOptions)
+ DoShowOptions();
+
xf86OpenConsole();
/* Do a general bus probe. This will be a PCI probe for x86 platforms */
@@ -1657,6 +1660,15 @@
xf86AllowMouseOpenFail = TRUE;
return 1;
}
+ if (!strcmp(argv[i], "-showopts"))
+ {
+ if (getuid() != 0 && geteuid() == 0) {
+ ErrorF("The '-showopts' option can only be used by root.\n");
+ exit(1);
+ }
+ xf86DoShowOptions = TRUE;
+ return 1;
+ }
if (!strcmp(argv[i], "-isolateDevice"))
{
int bus, device, func;
@@ -1699,6 +1711,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");
+ ErrorF("-showopts print available options for all installed drivers\n");
}
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 @@
/* xf86DoProbe.c */
void DoProbe(void);
void DoConfigure(void);
+void DoShowOptions(void);
/* 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 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86ShopwOpts.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */
+/*
+ * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose. It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Marcus Schaefer, ms@suse.de
+ *
+ */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include "os.h"
+#ifdef XFree86LOADER
+#include "loaderProcs.h"
+#endif
+#include "xf86.h"
+#include "xf86Config.h"
+#include "xf86_OSlib.h"
+#include "xf86Priv.h"
+#include "xf86PciData.h"
+#define IN_XSERVER
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+#include "vbe.h"
+#include "xf86DDC.h"
+#if defined(__sparc__) && !defined(__OpenBSD__)
+#include "xf86Bus.h"
+#include "xf86Sbus.h"
+#endif
+#include "globals.h"
+
+static const char*
+optionTypeToSting(OptionValueType type)
+{
+ switch (type) {
+ case OPTV_NONE:
+ return "";
+ case OPTV_INTEGER:
+ return "<int>";
+ case OPTV_STRING:
+ return "<str>";
+ case OPTV_ANYSTR:
+ return "<str>";
+ case OPTV_REAL:
+ return "<real>";
+ case OPTV_BOOLEAN:
+ return "<bool>";
+ case OPTV_FREQ:
+ return "<freq>";
+ default:
+ return "<undef>";
+ }
+}
+
+void DoShowOptions (void) {
+ int i = 0;
+ char **vlist = 0;
+ char *pSymbol = 0;
+ XF86ModuleData *initData = 0;
+ if (! (vlist = xf86DriverlistFromCompile())) {
+ ErrorF("Missing output drivers\n");
+ goto bail;
+ }
+ xf86LoadModules (vlist,0);
+ xfree (vlist);
+ for (i = 0; i < xf86NumDrivers; i++) {
+ if (xf86DriverList[i]->AvailableOptions) {
+ OptionInfoPtr pOption = (OptionInfoPtr)(*xf86DriverList[i]->AvailableOptions)(0,0);
+ if (! pOption) {
+ ErrorF ("(EE) Couldn't read option table for %s driver\n",
+ xf86DriverList[i]->driverName
+ );
+ continue;
+ }
+ pSymbol = xalloc (
+ strlen(xf86DriverList[i]->driverName) + strlen("ModuleData") + 1
+ );
+ strcpy (pSymbol, xf86DriverList[i]->driverName);
+ strcat (pSymbol, "ModuleData");
+ initData = LoaderSymbol (pSymbol);
+ if (initData) {
+ XF86ModuleVersionInfo *vers = initData->vers;
+ ErrorF ("Driver[%d]:%s[%s] {\n",
+ i,xf86DriverList[i]->driverName,vers->vendor
+ );
+ OptionInfoPtr p;
+ for (p = pOption; p->name != NULL; p++) {
+ const char *opttype = optionTypeToSting(p->type);
+ char *optname = xalloc(strlen(p->name) + 2 + 1);
+ if (!optname) {
+ continue;
+ }
+ sprintf(optname, "%s", p->name);
+ ErrorF ("\t%s:%s\n", optname,opttype);
+ }
+ ErrorF ("}\n");
+ }
+ }
+ }
+ bail:
+ OsCleanup (TRUE);
+ AbortDDX ();
+ fflush (stderr);
+ exit (0);
+}

20
pu_fixes.diff Normal file
View File

@ -0,0 +1,20 @@
diff -u -r -N ../xc.old/programs/Xserver/hw/xfree86/xaa/xaaImage.c ./programs/Xserver/hw/xfree86/xaa/xaaImage.c
--- ../xc.old/programs/Xserver/hw/xfree86/xaa/xaaImage.c 2003-10-27 16:30:43.000000000 +0100
+++ hw/xfree86/xaa/xaaImage.c 2003-10-27 16:32:18.000000000 +0100
@@ -236,12 +236,16 @@
(*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, bpp, depth);
(*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft);
+#if 0
if(beCareful) {
/* in cases with bad alignment we have to be careful not
to read beyond the end of the source */
if(((x * Bpp) + (dwords << 2)) > srcwidth) h--;
else beCareful = FALSE;
}
+#endif
+ if (beCareful)
+ h--;
if(dwords > infoRec->ImageWriteRange) {
while(h--) {

0
ready Normal file
View File

11
symlink-mesa.sh.diff Normal file
View File

@ -0,0 +1,11 @@
--- /suse/sndirsch/pkgs/openSUSE/xorg7/xorg-x11-server/xorg-server-1.1.99.3/GL/symlink-mesa.sh 2006-07-20 22:27:47.000000000 +0200
+++ GL/symlink-mesa.sh 2006-08-26 11:40:23.000000000 +0200
@@ -468,7 +468,7 @@
action slang_core_gc.h
action slang_fragment_builtin_gc.h
action slang_shader_syn.h
- action slang_version_syn.h
+ action slang_pp_version_syn.h
action slang_vertex_builtin_gc.h
}

25
xephyr.diff Normal file
View File

@ -0,0 +1,25 @@
--- hw/kdrive/Makefile.am.orig 2006-10-23 16:23:04.000000000 +0200
+++ hw/kdrive/Makefile.am 2006-10-23 16:23:34.000000000 +0200
@@ -1,10 +1,9 @@
if KDRIVEVESA
-VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
- smi via
+VESA_SUBDIRS =
endif
if KDRIVEFBDEV
-FBDEV_SUBDIRS = fbdev
+FBDEV_SUBDIRS =
endif
if XSDLSERVER
@@ -21,8 +20,7 @@
$(XSDL_SUBDIRS) \
$(FBDEV_SUBDIRS) \
$(VESA_SUBDIRS) \
- $(XEPHYR_SUBDIRS) \
- fake
+ $(XEPHYR_SUBDIRS)
DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
smi via fbdev sdl ephyr src linux fake sis300

39
xorg-server-1.1.99.901-GetDrawableAttributes.patch Normal file
View File

@ -0,0 +1,39 @@
--- xorg-server-9999/GL/glx/indirect_table.c.orig 2006-10-12 16:02:06.000000000 +0800
+++ xorg-server-9999/GL/glx/indirect_table.c 2006-10-12 16:15:35.000000000 +0800
@@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di
/*****************************************************************/
/* tree depth = 13 */
-static const int_fast16_t VendorPriv_dispatch_tree[155] = {
+static const int_fast16_t VendorPriv_dispatch_tree[159] = {
/* [0] -> opcode range [0, 131072], node depth 1 */
2,
5,
@@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis
/* [152] -> opcode range [65536, 65552], node depth 13 */
1,
LEAF(88),
+ 156,
EMPTY_LEAF,
+ /* [156] -> opcode range [65544, 65552], node depth 13 */
+ 1,
+ LEAF(96),
+ EMPTY_LEAF,
};
-static const void *VendorPriv_function_table[96][2] = {
+static const void *VendorPriv_function_table[99][2] = {
/* [ 0] = 0 */ {NULL, NULL},
/* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
/* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
@@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t
/* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
/* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
/* [ 95] = 65543 */ {NULL, NULL},
+ /* [ 96] = 65544 */ {NULL, NULL},
+ /* [ 97] = 65545 */ {NULL, NULL},
+ /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
};
const struct __glXDispatchInfo VendorPriv_dispatch_info = {

3
xorg-server-1.1.99.903.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da42f8b8118bbe6afe8b920c986835bff05923f38bd7adc96534fa7788c25cde
size 5980396

11
xorg-server.diff Normal file
View File

@ -0,0 +1,11 @@
--- 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>

503
xorg-x11-server.changes Normal file
View File

@ -0,0 +1,503 @@
-------------------------------------------------------------------
Wed Dec 13 18:26:05 CET 2006 - sndirsch@suse.de
- libdrm.diff:
* no longer fail when some driver tries to load "drm" module
-------------------------------------------------------------------
Tue Dec 12 05:37:31 CET 2006 - sndirsch@suse.de
- xorg-server-1.1.99.901-GetDrawableAttributes.patch:
* hopefully fixes AIGLX issues (X.Org Bug #8991)
-------------------------------------------------------------------
Fri Dec 8 20:56:59 CET 2006 - sndirsch@suse.de
- another 64bit warning fix
-------------------------------------------------------------------
Sat Dec 2 22:35:59 CET 2006 - sndirsch@suse.de
- X.Org 7.2RC3 release
* Add a -showDefaultModulePath option.
* Add a -showDefaultLibPath option.
* Add DIX_CFLAGS to util builds.
* Fix release date, and tag 1.1.99.903
* make X server use system libdrm - this requires libdrm >= 2.3.0
* DRI: call drmSetServerInfo() before drmOpen().
* add extern to struct definition
* fixup configure.ac problems with DRI_SOURCES and LBX_SOURCES
* bump to 1.1.99.903
* remove CID support (bug #5553)
* dri: setup libdrm hooks as early as possible.
* Bug #8868: Remove drm from SUBDIRS now that the directory is gone.
* Fix typo before the last commit.
* Fix GL context destruction with AIGLX.
* On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
* ffs: handle 0 argument (bug #8968)
* Bug #9023: Only check mice for "mouse" or "void" if identifier
is != NULL. Fix potential NULL pointer access in timer code.
- updated Mesa sources to 6.5.2
-------------------------------------------------------------------
Tue Nov 28 15:45:20 CET 2006 - sndirsch@suse.de
- xserver-timers.diff:
* fix null pointer reference in timer code (Bug #223718)
-------------------------------------------------------------------
Mon Nov 20 21:59:38 CET 2006 - sndirsch@suse.de
- p_pci-off-by-one.diff:
* readded off by one fix, which has been dropped by accident
(Bug #197190)
-------------------------------------------------------------------
Mon Nov 20 12:35:34 CET 2006 - sndirsch@suse.de
- acpi_events.diff:
* distinguish between general and input devices also for APM
(Bug #197858)
-------------------------------------------------------------------
Tue Nov 14 22:56:16 CET 2006 - sndirsch@suse.de
- removed /etc/X11/Xsession.d/92xprint-xpserverlist (Bug #220733)
-------------------------------------------------------------------
Tue Nov 14 16:31:28 CET 2006 - sndirsch@suse.de
- mouse-fix.diff:
* prevent driver from crashing when something different than
"mouse" or "void" is specified; only check mice for "mouse"
or "void" if identifier is != NULL. (X.Org Bug #9023)
-------------------------------------------------------------------
Tue Nov 14 05:13:29 CET 2006 - sndirsch@suse.de
- X.Org 7.2RC2 release
- adjusted p_enable-altrix.diff, p_pci-domain.diff
- obsoletes p_pci-ia64.diff, xorg-xserver-ia64-int10.diff
p_pci-legacy-mmap.diff
- Changes in RC2 since RC1
Aaron Plattner:
Fix standard VESA modes.
Adam Jackson:
Bug #6786: Use separate defines for server's Fixes support level.
'make dist' fixes.
Fix distcheck.
Include a forgotten ia64 header in the distball. Builds on ia64 now.
configure.ac bump.
Alan Coopersmith:
Make sure xorgcfg files are included even when dist made with
--disable-xorgcfg
Use getisax() instead of asm code to determine available x86 ISA
extensions on Solaris
Pre-release message should tell users to check git, not CVS, for updates
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
Bug #1997: AUDIT messages should contain uid for local accesses
If getpeerucred() is available, include pid & zoneid in audit messages
too
Make _POSIX_C_SOURCE hack work with Solaris headers
Alan Hourihane:
Small modification to blocking signals when switching modes.
Bjorn Helgaas:
Do not map full 0-1MB legacy range
Bram Verweij:
xfree86/linux acpi: fix tokenising
Daniel Stone:
GetTimeInMillis: spuport monotonic clock
WaitForSomething: allow time to rewind
Revert "WaitForSomething: allow time to rewind"
Revert "GetTimeInMillis: spuport monotonic clock"
add 'general socket' handler, port ACPI to use it
WaitForSomething: allow time to rewind
WaitForSomething: only rewind when delta is more than 250ms
GetTimeInMillis: spuport monotonic clock
GetTimeInMillis: simplify monotonic test
GetTimeInMillis: use correct units for clock_gettime
os: fix sun extensions test
Eamon Walsh:
Bug #8875: Security extension causes Xorg to core dump on server reset
whitespace adjust
More work on Bug #8875: revert previous fix and try using client
argument
Bug #8937: Extension setup functions not called on server resets
Egbert Eich:
Fixing mach64 driver bailing out on ia64
Make int10 fully domain aware.
Erik Andren:
remove XFree86 changelogs (bug #7262)
Joshua Baergen:
Create xorg.conf.example (Gentoo bug #138623).
Laurence Withers:
CreateColormap: fix return value (bug #7083)
Matthias Hopf:
Build with -D_PC on ix86 only.
Added missing domain stripping in already domain aware code.
Added linux 2.6 compatible domain aware device scanning code.
Fixing domain support for ia64
Add domain support to linuxPciOpenFile().
Fix device path in altixPCI.c to be domain aware.
Fix obviously wrong boundary checks + cleanup unused vars.
Matthieu Herrb:
kill GNU-make'ism.
Handle building in a separate objdir
Michel Dänzer:
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
Fix test for Option "IgnoreABI".
Myron Stowe:
xfree86: re-enable chipset-specific drivers for Linux/ia64
Rich Coe:
CheckConnections: don't close down the server client (bug #7876)
-------------------------------------------------------------------
Thu Nov 9 14:47:08 CET 2006 - sndirsch@suse.de
- p_ppc_domain_workaround.diff:
* ugly workaround for still missing domain support on ppc
(Bug #202133)
-------------------------------------------------------------------
Sat Nov 4 17:10:59 CET 2006 - sndirsch@suse.de
- updated to snapshot of xserver-1.2-branch (soon to be released
as X.Org 7.2RC2)
* Make sure xorgcfg files are included even when dist made with
--disable-xorgcfg
* Small modification to blocking signals when switching modes.
* Use getisax() instead of asm code to determine available x86
ISA extensions on Solaris
* Pre-release message should tell users to check git, not CVS,
for updates
* Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
* Create xorg.conf.example (Gentoo bug #138623).
* Fix test for Option "IgnoreABI".
This option has plenty of potential for wasting the time of bug
triagers without pretending it's always on.
* kill GNU-make'ism.
* Handle building in a separate objdir
* Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
* Bug #1997: AUDIT messages should contain uid for local accesses
* If getpeerucred() is available, include pid & zoneid in audit messages too
-------------------------------------------------------------------
Wed Nov 1 11:48:09 CET 2006 - sndirsch@suse.de
- added /etc/modprobe.d/nvidia
-------------------------------------------------------------------
Wed Oct 25 14:07:58 CEST 2006 - sndirsch@suse.de
- xorg-xserver-ia64-int10.diff:
* build int10 module with _PC only on %ix86 (Bug #197190)
-------------------------------------------------------------------
Mon Oct 23 15:44:05 CEST 2006 - sndirsch@suse.de
- added build of Xephyr; useful for debugging KDE apps (coolo)
-------------------------------------------------------------------
Tue Oct 17 12:30:13 CEST 2006 - sndirsch@suse.de
- cfb8-undefined.diff:
* fixes warning for undefined behaviour
-------------------------------------------------------------------
Tue Oct 17 06:55:19 CEST 2006 - aj@suse.de
- Own /etc/X11/Xsession.d directory.
-------------------------------------------------------------------
Mon Oct 16 22:07:55 CEST 2006 - aj@suse.de
- Use /etc/X11/Xsession.d.
-------------------------------------------------------------------
Sat Oct 14 06:32:52 CEST 2006 - sndirsch@suse.de
- updated to X.Org 7.2RC1
-------------------------------------------------------------------
Fri Oct 13 13:52:23 CEST 2006 - sndirsch@suse.de
- only disable AIGLX by default on SUSE <= 10.1 (Bug #197093)
- no longer fake release version for fglrx driver (Bug #198125)
-------------------------------------------------------------------
Mon Oct 9 20:21:46 CEST 2006 - sndirsch@suse.de
- glx-align.patch:
* reenabled -D__GLX_ALIGN64 on affected plaforms (X.Org Bug #8392)
- Fixes to p_pci-domain.diff (Bug #197572)
* internal domain number of by one (was supposed to be a cleanup,
but other code dependet on this semantics)
* fixed another long-standing of-by-1 error
- p_enable-altrix.diff (Bug #197572)
* This additional patch enables the build of the altrix detection
routines, which have apparently not been included in Xorg 7.1
yet. This patch needs a autoreconf -fi after application.
-------------------------------------------------------------------
Mon Sep 18 15:56:41 CEST 2006 - sndirsch@suse.de
- updated to Mesa 6.5.1
-------------------------------------------------------------------
Wed Sep 13 15:11:44 CEST 2006 - sndirsch@suse.de
- disable-fbblt-opt.diff:
* Disable optimization (introduced by ajax) due to a general vesa
driver crash later in memcpy (Bug #204324)
-------------------------------------------------------------------
Sat Sep 9 10:37:00 CEST 2006 - sndirsch@suse.de
- removed two source files with imcompatible license from Mesa
tarball (Bug #204110)
- added a check to specfile to make sure that these will not be
reintroduced with the next Mesa update again (Bug #204110)
-------------------------------------------------------------------
Fri Sep 1 23:38:13 CEST 2006 - sndirsch@suse.de
- moved xf86Parser.h,xf86Optrec.h back to /usr/include/xorg, since
SaX2 build issues have finally been resolved by making use of
"-iquote /usr/include/xorg -I."
-------------------------------------------------------------------
Thu Aug 31 10:29:10 CEST 2006 - sndirsch@suse.de
- disable-root-xorg_conf.diff:
* no longer consider to read /root/xorg.conf
-------------------------------------------------------------------
Tue Aug 29 17:52:01 CEST 2006 - sndirsch@suse.de
- only require xorg-x11-fonts-core ('fixed' + 'cursor' fonts)
-------------------------------------------------------------------
Mon Aug 28 13:12:06 CEST 2006 - sndirsch@suse.de
- fake release version for fglrx driver again, since using
IgnoreABI does not help (the check for the ABI version is in the
binary-only fglrx driver)
-------------------------------------------------------------------
Sun Aug 27 08:34:23 CEST 2006 - sndirsch@suse.de
- added Requires: xorg-x11-driver-{input,video} (Bug #202080)
-------------------------------------------------------------------
Fri Aug 25 16:54:00 CEST 2006 - sndirsch@suse.de
- ignore-abi.diff:
* adds IgnoreABI option for xorg.conf (same as -ignoreABI)
- remove .la files
- no longer fake release version for fglrx driver; use the new
IgnoreABI option instead!
-------------------------------------------------------------------
Fri Aug 25 11:11:04 CEST 2006 - sndirsch@suse.de
- PCI/IA64 Patches (Bug #197572):
* apply new p_pci-domain.diff (mhopf)
* apply new p_pci-ce-x.diff (mhopf)
-------------------------------------------------------------------
Thu Aug 24 16:59:21 CEST 2006 - sndirsch@suse.de
- PCI/IA64 Patches (Bug #197572):
* removed p_mappciBIOS_complete.diff (already applied upstream)
* apply p_pci-ia64.diff
* apply p_pci-legacy-mmap.diff only for IA64 (as before)
* disabled for now:
- p_pci-domain.diff: still issues with it
- p_pci-ce-x.diff: sits on top of p_pci-domain.diff
-------------------------------------------------------------------
Sun Aug 20 11:36:57 CEST 2006 - sndirsch@suse.de
- added PCI/IA64 patches, but disabled them for now (Bug #197572)
- remove comp. symlinks in /usr/X11R6/bin for openSUSE >= 10.2
-------------------------------------------------------------------
Fri Aug 18 13:05:07 CEST 2006 - sndirsch@suse.de
- fixed build for s390/s390x, e.g. use configure options
--disable-install-libxf86config
--disable-aiglx
--disable-dri
--disable-xorg
- changed os-name to "openSUSE" instead of "Linux" before
- fake release version for fglrx driver :-(
-------------------------------------------------------------------
Thu Aug 17 22:02:10 CEST 2006 - sndirsch@suse.de
- xinerama-sig11.diff:
* prevents Xserver Sig11 with broken Xinerama config (Bug #135002)
-------------------------------------------------------------------
Tue Aug 15 16:19:29 CEST 2006 - sndirsch@suse.de
- moved /usr/%_lib/pkgconfig/xorg-server.pc to xorg-x11-server
- added pkgconfig to Requires of xorg-x11-server
-------------------------------------------------------------------
Sat Aug 12 11:47:02 CEST 2006 - sndirsch@suse.de
- disable-aiglx.diff:
* disabled AIGLX by default (related to Bug #197093); enable it
with 'Option "AIGLX" "true"' in ServerFlags section of xorg.conf
-------------------------------------------------------------------
Wed Aug 9 16:25:09 CEST 2006 - sndirsch@suse.de
- enabled build of aiglx
-------------------------------------------------------------------
Wed Aug 9 10:51:31 CEST 2006 - sndirsch@suse.de
- patch font path also in xorg.conf when set to /usr/lib/X11/fonts/
or /usr/X11/lib/X11/fonts
-------------------------------------------------------------------
Tue Aug 8 15:11:07 CEST 2006 - sndirsch@suse.de
- patch xorg.conf in %post:
* radeonold/radeon10b driver --> radeon driver
-------------------------------------------------------------------
Mon Aug 7 19:26:36 CEST 2006 - sndirsch@suse.de
- added "Requires: xorg-x11-fonts" to prevent issues like
"could not open default font 'fixed'" for any Xserver
-------------------------------------------------------------------
Mon Aug 7 17:42:43 CEST 2006 - sndirsch@suse.de
- make sure that symlinks
/usr/bin/X --> /var/X11R6/bin/X
/var/X11R6/bin/X --> /usr/bin/Xorg
are packaged.
- p_xorg_acpi.diff:
* fixed for archs which don't have HAVE_ACPI defined, e.g. ppc
-------------------------------------------------------------------
Mon Aug 7 11:02:11 CEST 2006 - sndirsch@suse.de
- p_xf86Mode.diff:
* removes wrong warning (Bug #139510)
- p_xorg_acpi.diff:
* reconnect to acpid when acpid has been killed (Bug #148384)
- p_xkills_wrong_client.diff:
* This patch has unveiled two other problems. One is rather
serious as there seems to be a non-zero possibility that the
Xserver closes the wrong connection and this closes the wrong
client when it looks for stale sockets of clients that have
disappeared (eich, Bug #150869)
- p_bug159532.diff:
* X Clients can intentionally or unintenionally crash X11 by
using composite on depth 4 pixmaps. This patch fixes this.
(Bug #159532)
- p_xnest-ignore-getimage-errors.diff:
* ignores the X error on GetImage in Xnest (Bug #174228,
X.Org Bug #4411)
- p_initialize-pci-tag.diff:
* initialize PCI tag correctly, which is used by an IA64 specific
patch (see Bug #147261 for details); fixes Xserver crashes with
fglrx driver - and possibly other drivers like vesa - during
initial startup (!), VT switch and startup of second Xserver
(SLED10 Blocker Bugs #180535, #170991, #158806)
- p_ia64-console.diff:
* fixes MCA after start of second Xserver (Bug #177011)
-------------------------------------------------------------------
Sat Aug 5 22:48:38 CEST 2006 - sndirsch@suse.de
- p_mouse_misc.diff:
* fix X server crashes with synaptics driver (Bug #61702)
- pu_fixes.diff
* Fixes not yet in the official version
- p_bug96328.diff:
* fallback mouse device checking
- p_vga-crashfix.diff:
* fixes vga driver crash (#133989)
- p_xorg_rom_read.diff
* read rom in big chunks instead of byte-at-a-time (Bug #140811)
- ps_showopts.diff
* Xserver "-showopts" option to print available driver options
(Bug #137374)
-------------------------------------------------------------------
Sat Aug 5 10:15:01 CEST 2006 - sndirsch@suse.de
- add /var/X11R6/bin directory for now (Bug #197188)
-------------------------------------------------------------------
Wed Aug 2 16:12:46 CEST 2006 - sndirsch@suse.de
- fix setup line
-------------------------------------------------------------------
Mon Jul 31 22:02:22 CEST 2006 - sndirsch@suse.de
- fixed fatal compiler warnings
-------------------------------------------------------------------
Mon Jul 31 18:04:12 CEST 2006 - sndirsch@suse.de
- always (and only) patch xorg.conf if necessary
-------------------------------------------------------------------
Mon Jul 31 15:54:33 CEST 2006 - sndirsch@suse.de
- update to xorg-server release 1.1.99.3
-------------------------------------------------------------------
Fri Jul 28 14:45:29 CEST 2006 - sndirsch@suse.de
- use "-fno-strict-aliasing"
-------------------------------------------------------------------
Thu Jul 27 11:49:41 CEST 2006 - sndirsch@suse.de
- use $RPM_OPT_FLAGS
- remove existing /usr/include/X11 symlink in %pre
-------------------------------------------------------------------
Wed Jul 26 17:49:31 CEST 2006 - sndirsch@suse.de
- install xf86Parser.h,xf86Optrec.h to /usr/include instead of
/usr/include/xorg, so it is no longer necessary to specify
"-I/usr/include/xorg" which resulted in including a wrong
"shadow.h" (by X.Org) when building SaX2 (strange build error)
-------------------------------------------------------------------
Tue Jul 25 10:47:24 CEST 2006 - sndirsch@suse.de
- added permissions files
-------------------------------------------------------------------
Tue Jul 25 09:15:46 CEST 2006 - sndirsch@suse.de
- add compatibility symlink /usr/X11R6/bin/Xorg
-------------------------------------------------------------------
Fri Jul 21 16:30:04 CEST 2006 - sndirsch@suse.de
- p_ValidatePci.diff:
* no longer call ValidatePci() to fix i810 driver issues
(Bug #191987)
-------------------------------------------------------------------
Fri Jul 21 00:04:37 CEST 2006 - sndirsch@suse.de
- fixed build
-------------------------------------------------------------------
Tue Jun 27 10:10:31 CEST 2006 - sndirsch@suse.de
- created package

778
xorg-x11-server.spec Normal file
View File

@ -0,0 +1,778 @@
#
# spec file for package xorg-x11-server (Version 7.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: xorg-x11-server
%define dirsuffix 1.1.99.903
%define fglrx_driver_hack 0
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
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
Release: 31
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Requires: pkgconfig xorg-x11-fonts-core
%ifnarch s390 s390x
Requires: xorg-x11-driver-input xorg-x11-driver-video
%endif
Provides: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx
Obsoletes: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx
Summary: X.Org Server
Source: xorg-server-%{dirsuffix}.tar.bz2
Source1: Mesa-6.5.2.tar.bz2
Source3: README.updates
Source4: xorgcfg.tar.bz2
%if %suse_version > 1010
Source5: modprobe.nvidia
%endif
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
Patch10: p_xorg_rom_read.diff
Patch11: ps_showopts.diff
Patch12: p_xf86Mode.diff
Patch13: p_xorg_acpi.diff
Patch14: p_xkills_wrong_client.diff
Patch15: p_bug159532.diff
Patch16: p_xnest-ignore-getimage-errors.diff
Patch17: p_initialize-pci-tag.diff
Patch18: p_ia64-console.diff
Patch19: disable-aiglx.diff
Patch22: disable-root-xorg_conf.diff
Patch23: disable-fbblt-opt.diff
Patch24: symlink-mesa.sh.diff
Patch25: glx-align.patch
Patch26: p_enable-altrix.diff
Patch27: mouse.diff
Patch28: cfb8-undefined.diff
Patch29: xephyr.diff
Patch30: p_ppc_domain_workaround.diff
Patch32: acpi_events.diff
Patch33: p_pci-off-by-one.diff
Patch34: Mesa-6.5.2.diff
Patch35: xorg-server-1.1.99.901-GetDrawableAttributes.patch
Patch36: libdrm.diff
Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff
%description
This package contains the X.Org Server.
%ifnarch s390 s390x
%package sdk
Summary: X.Org Server SDK.
Group: System/Libraries
Provides: xorg-x11-sdk
Obsoletes: xorg-x11-sdk
Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-devel freetype2-devel fontconfig-devel libdrm-devel glitz-devel xorg-x11-server
Autoreqprov: on
%description sdk
This package contains the X.Org Server SDK.
%endif
%prep
%setup -q -n xorg-server-%{dirsuffix} -b1 -a4
# make legal department happy (Bug #204110)
test -f ../Mesa/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
test -f ../Mesa/progs/ggi/asc-view.c && exit 1
%patch
%patch1
sed 's/LIBDIR/%{_lib}/g' %{PATCH2} | patch -p0
%patch3
%patch4
%patch5
%patch6
%patch7 -p2
%patch8 -p2
%patch9 -p2
%patch10 -p3
%patch11
#%patch12 -p2
%patch13
%patch14 -p2
%patch15 -p2
%patch16 -p2
pushd hw/xfree86/os-support/linux/int10
%patch17
popd
pushd hw/xfree86/os-support
%patch18
popd
%if %suse_version <= 1010
%patch19
%endif
%patch22
%patch23
#%patch24
%patch25 -p1
%patch26
%patch27
%patch28
%patch29
### Bug 197572: X.Org PCI/IA64 patches
%patch334 -p0 -b .p_pci-domain.diff
%patch357 -p0 -b .p_pci-ce-x.diff
%patch30
%patch32 -p1
%patch33 -p0
%patch34 -p0
%patch35 -p1
%patch36 -p0
%build
autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
%if %fglrx_driver_hack
--with-release-major=7 \
--with-release-minor=1 \
--with-release-patch=0 \
--with-release-snap=0 \
--with-release-date="%(date)" \
--with-release-version=7.1.0.0 \
%endif
--prefix=/usr \
--sysconfdir=/etc \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
--enable-builddocs \
%ifarch s390 s390x
--disable-install-libxf86config \
%else
--enable-install-libxf86config \
%endif
%ifarch %EXPERIMENTAL
--enable-glx-tls \
--enable-multibuffer \
%endif
%ifarch s390 s390x
--disable-aiglx \
%else
--enable-aiglx \
%endif
--enable-lbx \
--enable-xdmcp \
--enable-xdm-auth-1 \
%ifarch s390 s390x
--disable-dri \
--disable-xorg \
%else
--enable-dri \
--enable-xorg \
%endif
--enable-dmx \
--enable-xnest \
--enable-kdrive \
--enable-xephyr \
--disable-xsdl \
--enable-xprint \
--disable-kbd_mode \
--with-log-dir="/var/log" \
--with-os-name="openSUSE" \
--with-os-vendor="SUSE LINUX" \
--with-mesa-source=$RPM_BUILD_DIR/Mesa \
--with-fontdir="/usr/share/fonts" \
--with-xkb-path="/usr/share/X11/xkb" \
--with-xkb-output="/var/lib/xkb/compiled"
make
make -C hw/kdrive
%install
make install DESTDIR=$RPM_BUILD_ROOT
make -C hw/kdrive install DESTDIR=$RPM_BUILD_ROOT
%ifnarch s390 s390x
# remove .la files
find $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/ -name "*.la" | \
xargs rm
install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
$RPM_BUILD_ROOT/usr/include/xorg
# add compatibility symlinks for SUSE <= 10.1
%if %suse_version <= 1010
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
ln -snf ../../bin/X $RPM_BUILD_ROOT/usr/X11R6/bin/X
ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg
%endif
chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg
mkdir -p $RPM_BUILD_ROOT/var/X11R6/bin
ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/X11R6/bin/X
ln -snf ../../var/X11R6/bin/X $RPM_BUILD_ROOT/usr/bin/X
mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates
mkdir -p $RPM_BUILD_ROOT/etc/permissions.d
cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.easy << EOF
/usr/bin/Xorg root:root 4711
EOF
cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.paranoid << EOF
/usr/bin/Xorg root:root 0711
EOF
cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.easy << EOF
/usr/bin/Xorg root:root 0711
EOF
%else
rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
%endif
%if %suse_version > 1010
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia
%endif
rm $RPM_BUILD_ROOT/etc/X11/Xsession.d/92xprint-xpserverlist
rmdir $RPM_BUILD_ROOT/etc/X11/Xsession.d
%clean
rm -rf "$RPM_BUILD_ROOT"
%ifnarch s390 s390x
%verifyscript
%verify_permissions -e /usr/bin/Xorg
%endif
%pre
test -L usr/lib/X11 && rm usr/lib/X11
rm -rf etc/X11/xserver/
exit 0
%post
%ifnarch s390 s390x
%run_permissions
rm -f var/log/XFree86.*.log*
# SaX2 writes xorg.conf since SuSE 9.3
# - create backup of XF86Config
# - copy XF86Config to xorg.conf
# - set XF86Config symlink to xorg.conf
pushd etc/X11 &> /dev/null
# get rid of symlinks
for file in xorg.conf XF86Config; do
if [ -L $file ]; then
symlink=$file
while test -L $symlink; do
tmp=$(readlink $symlink)
rm -f $symlink
symlink=$tmp
done
mv $symlink $file
fi
done
if [ ! -f xorg.conf -a -f XF86Config ]; then
cp XF86Config xorg.conf
fi
if [ -f xorg.conf ]; then
#test -f XF86Config && old XF86Config
ln -snf xorg.conf XF86Config
fi
popd &> /dev/null
if [ -f etc/X11/xorg.conf ]; then
# keyboard driver specification seems to be case-sensitive now :-(
# SLES9 SPx --> SLES10: i915 --> i810 driver
# SuSE 9.3 --> SuSE 10.0: xgi --> sis driver
# SuSE 9.3 --> SuSE 10.0: cz_qwerty,us --> cz(qwerty,basic) keyboard map
# SuSE 9.3 --> SuSE 10.0: sk_qwerty,us --> sk(qwerty,basic) keyboard map
# SuSE 9.3 --> SuSE 10.0: el --> gr keyboard map
# SuSE 10.0 --> SuSE 10.1: r128 --> ati driver
# SuSE 9.0 --> SuSE 9.1: /dev/mouse --> /dev/input/mice (Bug #172260)
# SuSE 10.1 --> SuSE 10.2: X11 fonts have moved to /usr/share/fonts
# SuSE 10.1 --> SuSE 10.2: radeonold/radeon10b --> radeon
if grep -q -e \"[kK]eyboard\" \
-e \"i915\" \
-e \"xgi\" \
-e \"r128\" \
-e \"radeonold\" \
-e \"radeon10b\" \
-e \"/dev/mouse\" \
-e /usr/X11R6/lib/X11/fonts/ \
-e /usr/X11/lib/X11/fonts/ \
-e /usr/lib/X11/fonts/ \
-e _qwerty \
-e \"el\" \
etc/X11/xorg.conf; then
sed -i.post_xorg-x11-server \
-e 's/\"[kK]eyboard\"/\"kbd\"/g' \
-e 's/\"i915\"/\"i810\"/g' \
-e 's/\"xgi\"/\"sis\"/g' \
-e 's/\"r128\"/\"ati\"/g' \
-e 's/\"radeonold\"/\"radeon\"/g' \
-e 's/\"radeon10b\"/\"radeon\"/g' \
-e 's+/dev/mouse+/dev/input/mice+g' \
-e 's+/usr/X11R6/lib/X11/fonts/+/usr/share/fonts/+g' \
-e 's+/usr/X11/lib/X11/fonts/+/usr/share/fonts/+g' \
-e 's+/usr/lib/X11/fonts/+/usr/share/fonts/+g' \
-e '
/\"XkbLayout\".*\".*_qwerty,us\"/{
h
g
a\
Option\t"XkbVariant" "qwerty,basic"
}
' \
-e s/_qwerty//g \
-e s/\"el\"/\"gr\"/g \
etc/X11/xorg.conf
fi
fi
%endif
# Installation of init script seems to be disabled by default
# Create symbolic run level links for xprint start script
if false; then
%{fillup_and_insserv -p xprint}
fi
exit 0
%preun
# Installation of init script seems to be disabled by default
if false; then
%stop_on_removal xprint
fi
exit 0
%postun
# installation of init script seems to be disabled by default
# Rearrange run level symlinks after removing the xprint init script
if false; then
%{insserv_cleanup}
fi
exit 0
%ifnarch s390 s390x
%pre sdk
test -L usr/include/X11 && rm usr/include/X11
exit 0
%endif
%files
%defattr(-,root,root)
%if %suse_version > 1010
%dir /etc/modprobe.d
/etc/modprobe.d/nvidia
%endif
%ifnarch s390 s390x
%dir /usr/%{_lib}/xorg
%dir /var/X11R6/bin
%endif
%dir /var/lib/xkb
%dir /var/lib/xkb/compiled
%ifnarch s390 s390x
/etc/permissions.d/%name.*
%if %suse_version <= 1010
/usr/X11R6/bin/X
/usr/X11R6/bin/Xorg
%endif
/usr/bin/X
%endif
/usr/bin/Xdmx
/usr/bin/Xephyr
/usr/bin/Xnest
%ifnarch s390 s390x
%verify(not mode) /usr/bin/Xorg
%endif
/usr/bin/Xprt
/usr/bin/Xvfb
%ifnarch s390 s390x
/usr/bin/cvt
%endif
/usr/bin/dmxaddinput
/usr/bin/dmxaddscreen
/usr/bin/dmxreconfig
/usr/bin/dmxresize
/usr/bin/dmxrminput
/usr/bin/dmxrmscreen
/usr/bin/dmxtodmx
/usr/bin/dmxwininfo
%ifnarch s390 s390x
/usr/bin/gtf
/usr/bin/inb
/usr/bin/inl
/usr/bin/inw
/usr/bin/ioport
/usr/bin/outb
/usr/bin/outl
/usr/bin/outw
/usr/bin/pcitweak
/usr/bin/scanpci
%endif
/usr/bin/vdltodmx
/usr/bin/xdmx
/usr/bin/xdmxconfig
%ifnarch s390 s390x
/usr/bin/xorgcfg
/usr/bin/xorgconfig
/usr/include/X11/bitmaps/
/usr/include/X11/pixmaps/
%endif
/usr/%{_lib}/X11/*
/usr/%{_lib}/pkgconfig/*.pc
%ifnarch s390 s390x
/usr/%{_lib}/xorg/modules/
%endif
/usr/%{_lib}/xserver/
%ifnarch s390 s390x
/usr/share/X11/
%endif
%{_mandir}/man1/*
%ifnarch s390 s390x
%{_mandir}/man4/*
%{_mandir}/man5/*
/var/X11R6/bin/X
%endif
/var/lib/xkb/compiled/README.compiled
%ifnarch s390 s390x
%files sdk
%defattr(-,root,root)
/usr/include/xorg/
/usr/%{_lib}/*.a
/usr/share/aclocal/*.m4
%endif
%changelog -n xorg-x11-server
* Wed Dec 13 2006 - sndirsch@suse.de
- libdrm.diff:
* no longer fail when some driver tries to load "drm" module
* Tue Dec 12 2006 - sndirsch@suse.de
- xorg-server-1.1.99.901-GetDrawableAttributes.patch:
* hopefully fixes AIGLX issues (X.Org Bug #8991)
* Fri Dec 08 2006 - sndirsch@suse.de
- another 64bit warning fix
* Sat Dec 02 2006 - sndirsch@suse.de
- X.Org 7.2RC3 release
* Add a -showDefaultModulePath option.
* Add a -showDefaultLibPath option.
* Add DIX_CFLAGS to util builds.
* Fix release date, and tag 1.1.99.903
* make X server use system libdrm - this requires libdrm >= 2.3.0
* DRI: call drmSetServerInfo() before drmOpen().
* add extern to struct definition
* fixup configure.ac problems with DRI_SOURCES and LBX_SOURCES
* bump to 1.1.99.903
* remove CID support (bug #5553)
* dri: setup libdrm hooks as early as possible.
* Bug #8868: Remove drm from SUBDIRS now that the directory is gone.
* Fix typo before the last commit.
* Fix GL context destruction with AIGLX.
* On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
* ffs: handle 0 argument (bug #8968)
* Bug #9023: Only check mice for "mouse" or "void" if identifier
is != NULL. Fix potential NULL pointer access in timer code.
- updated Mesa sources to 6.5.2
* Tue Nov 28 2006 - sndirsch@suse.de
- xserver-timers.diff:
* fix null pointer reference in timer code (Bug #223718)
* Mon Nov 20 2006 - sndirsch@suse.de
- p_pci-off-by-one.diff:
* readded off by one fix, which has been dropped by accident
(Bug #197190)
* Mon Nov 20 2006 - sndirsch@suse.de
- acpi_events.diff:
* distinguish between general and input devices also for APM
(Bug #197858)
* Tue Nov 14 2006 - sndirsch@suse.de
- removed /etc/X11/Xsession.d/92xprint-xpserverlist (Bug #220733)
* Tue Nov 14 2006 - sndirsch@suse.de
- mouse-fix.diff:
* prevent driver from crashing when something different than
"mouse" or "void" is specified; only check mice for "mouse"
or "void" if identifier is != NULL. (X.Org Bug #9023)
* Tue Nov 14 2006 - sndirsch@suse.de
- X.Org 7.2RC2 release
- adjusted p_enable-altrix.diff, p_pci-domain.diff
- obsoletes p_pci-ia64.diff, xorg-xserver-ia64-int10.diff
p_pci-legacy-mmap.diff
- Changes in RC2 since RC1
Aaron Plattner:
Fix standard VESA modes.
Adam Jackson:
Bug #6786: Use separate defines for server's Fixes support level.
'make dist' fixes.
Fix distcheck.
Include a forgotten ia64 header in the distball. Builds on ia64 now.
configure.ac bump.
Alan Coopersmith:
Make sure xorgcfg files are included even when dist made with
--disable-xorgcfg
Use getisax() instead of asm code to determine available x86 ISA
extensions on Solaris
Pre-release message should tell users to check git, not CVS, for updates
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
Bug #1997: AUDIT messages should contain uid for local accesses
If getpeerucred() is available, include pid & zoneid in audit messages
too
Make _POSIX_C_SOURCE hack work with Solaris headers
Alan Hourihane:
Small modification to blocking signals when switching modes.
Bjorn Helgaas:
Do not map full 0-1MB legacy range
Bram Verweij:
xfree86/linux acpi: fix tokenising
Daniel Stone:
GetTimeInMillis: spuport monotonic clock
WaitForSomething: allow time to rewind
Revert "WaitForSomething: allow time to rewind"
Revert "GetTimeInMillis: spuport monotonic clock"
add 'general socket' handler, port ACPI to use it
WaitForSomething: allow time to rewind
WaitForSomething: only rewind when delta is more than 250ms
GetTimeInMillis: spuport monotonic clock
GetTimeInMillis: simplify monotonic test
GetTimeInMillis: use correct units for clock_gettime
os: fix sun extensions test
Eamon Walsh:
Bug #8875: Security extension causes Xorg to core dump on server reset
whitespace adjust
More work on Bug #8875: revert previous fix and try using client
argument
Bug #8937: Extension setup functions not called on server resets
Egbert Eich:
Fixing mach64 driver bailing out on ia64
Make int10 fully domain aware.
Erik Andren:
remove XFree86 changelogs (bug #7262)
Joshua Baergen:
Create xorg.conf.example (Gentoo bug #138623).
Laurence Withers:
CreateColormap: fix return value (bug #7083)
Matthias Hopf:
Build with -D_PC on ix86 only.
Added missing domain stripping in already domain aware code.
Added linux 2.6 compatible domain aware device scanning code.
Fixing domain support for ia64
Add domain support to linuxPciOpenFile().
Fix device path in altixPCI.c to be domain aware.
Fix obviously wrong boundary checks + cleanup unused vars.
Matthieu Herrb:
kill GNU-make'ism.
Handle building in a separate objdir
Michel Dänzer:
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
Fix test for Option "IgnoreABI".
Myron Stowe:
xfree86: re-enable chipset-specific drivers for Linux/ia64
Rich Coe:
CheckConnections: don't close down the server client (bug #7876)
* Thu Nov 09 2006 - sndirsch@suse.de
- p_ppc_domain_workaround.diff:
* ugly workaround for still missing domain support on ppc
(Bug #202133)
* Sat Nov 04 2006 - sndirsch@suse.de
- updated to snapshot of xserver-1.2-branch (soon to be released
as X.Org 7.2RC2)
* Make sure xorgcfg files are included even when dist made with
--disable-xorgcfg
* Small modification to blocking signals when switching modes.
* Use getisax() instead of asm code to determine available x86
ISA extensions on Solaris
* Pre-release message should tell users to check git, not CVS,
for updates
* Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
* Create xorg.conf.example (Gentoo bug #138623).
* Fix test for Option "IgnoreABI".
This option has plenty of potential for wasting the time of bug
triagers without pretending it's always on.
* kill GNU-make'ism.
* Handle building in a separate objdir
* Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
* Bug #1997: AUDIT messages should contain uid for local accesses
* If getpeerucred() is available, include pid & zoneid in audit messages too
* Wed Nov 01 2006 - sndirsch@suse.de
- added /etc/modprobe.d/nvidia
* Wed Oct 25 2006 - sndirsch@suse.de
- xorg-xserver-ia64-int10.diff:
* build int10 module with _PC only on %%ix86 (Bug #197190)
* Mon Oct 23 2006 - sndirsch@suse.de
- added build of Xephyr; useful for debugging KDE apps (coolo)
* Tue Oct 17 2006 - sndirsch@suse.de
- cfb8-undefined.diff:
* fixes warning for undefined behaviour
* Tue Oct 17 2006 - aj@suse.de
- Own /etc/X11/Xsession.d directory.
* Mon Oct 16 2006 - aj@suse.de
- Use /etc/X11/Xsession.d.
* Sat Oct 14 2006 - sndirsch@suse.de
- updated to X.Org 7.2RC1
* Fri Oct 13 2006 - sndirsch@suse.de
- only disable AIGLX by default on SUSE <= 10.1 (Bug #197093)
- no longer fake release version for fglrx driver (Bug #198125)
* Mon Oct 09 2006 - sndirsch@suse.de
- glx-align.patch:
* reenabled -D__GLX_ALIGN64 on affected plaforms (X.Org Bug #8392)
- Fixes to p_pci-domain.diff (Bug #197572)
* internal domain number of by one (was supposed to be a cleanup,
but other code dependet on this semantics)
* fixed another long-standing of-by-1 error
- p_enable-altrix.diff (Bug #197572)
* This additional patch enables the build of the altrix detection
routines, which have apparently not been included in Xorg 7.1
yet. This patch needs a autoreconf -fi after application.
* Mon Sep 18 2006 - sndirsch@suse.de
- updated to Mesa 6.5.1
* Wed Sep 13 2006 - sndirsch@suse.de
- disable-fbblt-opt.diff:
* Disable optimization (introduced by ajax) due to a general vesa
driver crash later in memcpy (Bug #204324)
* Sat Sep 09 2006 - sndirsch@suse.de
- removed two source files with imcompatible license from Mesa
tarball (Bug #204110)
- added a check to specfile to make sure that these will not be
reintroduced with the next Mesa update again (Bug #204110)
* Fri Sep 01 2006 - sndirsch@suse.de
- moved xf86Parser.h,xf86Optrec.h back to /usr/include/xorg, since
SaX2 build issues have finally been resolved by making use of
"-iquote /usr/include/xorg -I."
* Thu Aug 31 2006 - sndirsch@suse.de
- disable-root-xorg_conf.diff:
* no longer consider to read /root/xorg.conf
* Tue Aug 29 2006 - sndirsch@suse.de
- only require xorg-x11-fonts-core ('fixed' + 'cursor' fonts)
* Mon Aug 28 2006 - sndirsch@suse.de
- fake release version for fglrx driver again, since using
IgnoreABI does not help (the check for the ABI version is in the
binary-only fglrx driver)
* Sun Aug 27 2006 - sndirsch@suse.de
- added Requires: xorg-x11-driver-{input,video} (Bug #202080)
* Fri Aug 25 2006 - sndirsch@suse.de
- ignore-abi.diff:
* adds IgnoreABI option for xorg.conf (same as -ignoreABI)
- remove .la files
- no longer fake release version for fglrx driver; use the new
IgnoreABI option instead!
* Fri Aug 25 2006 - sndirsch@suse.de
- PCI/IA64 Patches (Bug #197572):
* apply new p_pci-domain.diff (mhopf)
* apply new p_pci-ce-x.diff (mhopf)
* Thu Aug 24 2006 - sndirsch@suse.de
- PCI/IA64 Patches (Bug #197572):
* removed p_mappciBIOS_complete.diff (already applied upstream)
* apply p_pci-ia64.diff
* apply p_pci-legacy-mmap.diff only for IA64 (as before)
* disabled for now:
- p_pci-domain.diff: still issues with it
- p_pci-ce-x.diff: sits on top of p_pci-domain.diff
* Sun Aug 20 2006 - sndirsch@suse.de
- added PCI/IA64 patches, but disabled them for now (Bug #197572)
- remove comp. symlinks in /usr/X11R6/bin for openSUSE >= 10.2
* Fri Aug 18 2006 - sndirsch@suse.de
- fixed build for s390/s390x, e.g. use configure options
--disable-install-libxf86config
--disable-aiglx
--disable-dri
--disable-xorg
- changed os-name to "openSUSE" instead of "Linux" before
- fake release version for fglrx driver :-(
* Thu Aug 17 2006 - sndirsch@suse.de
- xinerama-sig11.diff:
* prevents Xserver Sig11 with broken Xinerama config (Bug #135002)
* Tue Aug 15 2006 - sndirsch@suse.de
- moved /usr/%%_lib/pkgconfig/xorg-server.pc to xorg-x11-server
- added pkgconfig to Requires of xorg-x11-server
* Sat Aug 12 2006 - sndirsch@suse.de
- disable-aiglx.diff:
* disabled AIGLX by default (related to Bug #197093); enable it
with 'Option "AIGLX" "true"' in ServerFlags section of xorg.conf
* Wed Aug 09 2006 - sndirsch@suse.de
- enabled build of aiglx
* Wed Aug 09 2006 - sndirsch@suse.de
- patch font path also in xorg.conf when set to /usr/lib/X11/fonts/
or /usr/X11/lib/X11/fonts
* Tue Aug 08 2006 - sndirsch@suse.de
- patch xorg.conf in %%post:
* radeonold/radeon10b driver --> radeon driver
* Mon Aug 07 2006 - sndirsch@suse.de
- added "Requires: xorg-x11-fonts" to prevent issues like
"could not open default font 'fixed'" for any Xserver
* Mon Aug 07 2006 - sndirsch@suse.de
- make sure that symlinks
/usr/bin/X --> /var/X11R6/bin/X
/var/X11R6/bin/X --> /usr/bin/Xorg
are packaged.
- p_xorg_acpi.diff:
* fixed for archs which don't have HAVE_ACPI defined, e.g. ppc
* Mon Aug 07 2006 - sndirsch@suse.de
- p_xf86Mode.diff:
* removes wrong warning (Bug #139510)
- p_xorg_acpi.diff:
* reconnect to acpid when acpid has been killed (Bug #148384)
- p_xkills_wrong_client.diff:
* This patch has unveiled two other problems. One is rather
serious as there seems to be a non-zero possibility that the
Xserver closes the wrong connection and this closes the wrong
client when it looks for stale sockets of clients that have
disappeared (eich, Bug #150869)
- p_bug159532.diff:
* X Clients can intentionally or unintenionally crash X11 by
using composite on depth 4 pixmaps. This patch fixes this.
(Bug #159532)
- p_xnest-ignore-getimage-errors.diff:
* ignores the X error on GetImage in Xnest (Bug #174228,
X.Org Bug #4411)
- p_initialize-pci-tag.diff:
* initialize PCI tag correctly, which is used by an IA64 specific
patch (see Bug #147261 for details); fixes Xserver crashes with
fglrx driver - and possibly other drivers like vesa - during
initial startup (!), VT switch and startup of second Xserver
(SLED10 Blocker Bugs #180535, #170991, #158806)
- p_ia64-console.diff:
* fixes MCA after start of second Xserver (Bug #177011)
* Sat Aug 05 2006 - sndirsch@suse.de
- p_mouse_misc.diff:
* fix X server crashes with synaptics driver (Bug #61702)
- pu_fixes.diff
* Fixes not yet in the official version
- p_bug96328.diff:
* fallback mouse device checking
- p_vga-crashfix.diff:
* fixes vga driver crash (#133989)
- p_xorg_rom_read.diff
* read rom in big chunks instead of byte-at-a-time (Bug #140811)
- ps_showopts.diff
* Xserver "-showopts" option to print available driver options
(Bug #137374)
* Sat Aug 05 2006 - sndirsch@suse.de
- add /var/X11R6/bin directory for now (Bug #197188)
* Wed Aug 02 2006 - sndirsch@suse.de
- fix setup line
* Mon Jul 31 2006 - sndirsch@suse.de
- fixed fatal compiler warnings
* Mon Jul 31 2006 - sndirsch@suse.de
- always (and only) patch xorg.conf if necessary
* Mon Jul 31 2006 - sndirsch@suse.de
- update to xorg-server release 1.1.99.3
* Fri Jul 28 2006 - sndirsch@suse.de
- use "-fno-strict-aliasing"
* Thu Jul 27 2006 - sndirsch@suse.de
- use $RPM_OPT_FLAGS
- remove existing /usr/include/X11 symlink in %%pre
* Wed Jul 26 2006 - sndirsch@suse.de
- install xf86Parser.h,xf86Optrec.h to /usr/include instead of
/usr/include/xorg, so it is no longer necessary to specify
"-I/usr/include/xorg" which resulted in including a wrong
"shadow.h" (by X.Org) when building SaX2 (strange build error)
* Tue Jul 25 2006 - sndirsch@suse.de
- added permissions files
* Tue Jul 25 2006 - sndirsch@suse.de
- add compatibility symlink /usr/X11R6/bin/Xorg
* Fri Jul 21 2006 - sndirsch@suse.de
- p_ValidatePci.diff:
* no longer call ValidatePci() to fix i810 driver issues
(Bug #191987)
* Fri Jul 21 2006 - sndirsch@suse.de
- fixed build
* Tue Jun 27 2006 - sndirsch@suse.de
- created package

BIN
xorgcfg.tar.bz2 (Stored with Git LFS) Normal file
View File

Binary file not shown.

22
xprint.diff Normal file
View File

@ -0,0 +1,22 @@
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 \
NewCenturySchlbk-Bold.pmf \
- NewCenturySchlbk-BoldItalic.pmf \
NewCenturySchlbk-Italic.pmf \
NewCenturySchlbk-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 \
NewCenturySchlbk-Bold.pmf \
- NewCenturySchlbk-BoldItalic.pmf \
NewCenturySchlbk-Italic.pmf \
NewCenturySchlbk-Roman.pmf \
Souvenir-Demi.pmf \