rpms/xorg-x11-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

* Thu Jun 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99.1.20090618

Browse Source 
- Today's git snapshot.
- disable Xdmx - it's broken upstream
- Removing patches merged upstream or obsolete.
  xserver-1.4.99-endian.patch - obsolete with autoconf 2.63-1 (#449944)
  xserver-1.5.99.902-sod-off-poulsbo.patch - upstream
  xserver-1.6.0-selinux-less.patch - upstream
  xserver-1.5.99.902-vnc.patch - upstream
  xserver-1.6.0-restore-zap.patch - upstream
  xserver-1.6.0-xinerama-cursors.patch - upstream
  xserver-1.6.0-xinerama-crashes.patch - obsolete, server 1.6 only
  xserver-1.6.1-xkbsendmap.patch - upstream
  xserver-1.6.0-randr-xinerama-crash.patch - upstream
  xserver-1.6.1-avoid-malloc-for-logging.patch - upstream
  xserver-1.6.1-exa-avoid-swapped-out.patch - upstream
  xserver-1.6.1-exa-create-pixmap2.patch -  upstream
  xserver-1.6.1-fix-glx-drawable.patch - upstream
  xserver-1.6.1-randr-gamma.patch - upstream
  xserver-1.6.1-vt-switch.patch - obsolete
  xserver-1.6.1-pea-quirk.patch - will be upstream
This commit is contained in:
Peter Hutterer 2009-06-19 07:03:32 +00:00
parent 18de5fa9bb
commit 520bba9947
9 changed files with 188 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
xorg-server-1.6.1.tar.bz2 xorg-server-20090618.tar.bz2

17
make-git-snapshot.sh Executable file
View File

@ -0,0 +1,17 @@
#!/bin/sh
DIRNAME=xorg-server-$( date +%Y%m%d )
rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/xorg/xserver $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
git log | head -1
else
git checkout $1
fi
git log | head -1 | awk '{ print $2 }' > ../commitid
git repack -a -d
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME

2
sources
View File

@ -1 +1 @@
ed0878bf32a24d4948c3b8a122a39eff xorg-server-1.6.1.tar.bz2 ca0f369109b6f9bb62eca60fd5a2302f xorg-server-20090618.tar.bz2

107
xorg-x11-server.spec
View File

@ -14,12 +14,12 @@
# Fix rhpxl to no longer need vesamodes/extramodes # Fix rhpxl to no longer need vesamodes/extramodes
%define pkgname xorg-server %define pkgname xorg-server
#define gitdate 20090112 %define gitdate 20090618
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.6.1 Version: 1.6.99
Release: 1%{?dist} Release: 1.%{gitdate}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -59,16 +59,13 @@ Patch2014: xserver-1.5.0-projector-fb-size.patch
# Trivial things to never merge upstream ever: # Trivial things to never merge upstream ever:
# This really could be done prettier. # This really could be done prettier.
Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5002: xserver-1.4.99-ssh-isnt-local.patch
Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
# Workaround RH bug #449944
Patch5011: xserver-1.4.99-endian.patch
# force mode debugging on for randr 1.2 drivers # force mode debugging on for randr 1.2 drivers
Patch6002: xserver-1.5.1-mode-debug.patch Patch6002: xserver-1.5.1-mode-debug.patch
Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch # FIXME
#Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
# cf. bug 482924 # cf. bug 482924
Patch6010: xserver-1.5.99.902-selinux-debugging.patch Patch6010: xserver-1.5.99.902-selinux-debugging.patch
@ -76,33 +73,21 @@ Patch6010: xserver-1.5.99.902-selinux-debugging.patch
# don't build the (broken) acpi code # don't build the (broken) acpi code
Patch6011: xserver-1.6.0-less-acpi-brokenness.patch Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
# don't try intel on poulsbo
Patch6012: xserver-1.5.99.902-sod-off-poulsbo.patch
# don't do selinux if we're not told to
Patch6013: xserver-1.6.0-selinux-less.patch
# selinux performance hack # selinux performance hack
#Patch6014: xserver-1.6.0-selinux-nlfd.patch #Patch6014: xserver-1.6.0-selinux-nlfd.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=20087
Patch6015: xserver-1.5.99.902-vnc.patch
# Make autoconfiguration chose nouveau driver for NVIDIA GPUs # Make autoconfiguration chose nouveau driver for NVIDIA GPUs
Patch6016: xserver-1.5.99.902-nouveau.patch Patch6016: xserver-1.5.99.902-nouveau.patch
Patch6022: xserver-1.6.0-primary.patch Patch6022: xserver-1.6.0-primary.patch
Patch6024: xserver-1.6.0-xinerama-cursors.patch
# http://bugs.freedesktop.org/show_bug.cgi?id=20557
Patch6026: xserver-1.6.0-xinerama-crashes.patch
# ajax needs to upstream this # ajax needs to upstream this
Patch6027: xserver-1.6.0-displayfd.patch Patch6027: xserver-1.6.0-displayfd.patch
Patch6028: xserver-1.6.0-restore-zap.patch
Patch6029: xserver-1.6.0-no-i810.patch Patch6029: xserver-1.6.0-no-i810.patch
Patch6042: xserver-1.6.1-proc-cmdline.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
%define sdkdir %{_includedir}/xorg %define sdkdir %{_includedir}/xorg
@ -120,7 +105,8 @@ Patch6029: xserver-1.6.0-no-i810.patch
%endif %endif
%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev %define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx %define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
# FIXME: dmx is broken, no --enable-dmx for you
BuildRequires: git-core BuildRequires: git-core
BuildRequires: automake autoconf libtool pkgconfig BuildRequires: automake autoconf libtool pkgconfig
@ -132,7 +118,7 @@ BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1
BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
BuildRequires: libX11-devel libXext-devel BuildRequires: libX11-devel libXext-devel
BuildRequires: libXinerama-devel BuildRequires: libXinerama-devel libXi-devel
# DMX config utils buildreqs. # DMX config utils buildreqs.
BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
@ -312,8 +298,12 @@ Xserver source code needed to build VNC server (Xvnc)
%if 0%{?gitdate} %if 0%{?gitdate}
git checkout -b fedora git checkout -b fedora
sed -i 's/git/&+ssh/' .git/config sed -i 's/git/&+ssh/' .git/config
if [ -z "$GIT_COMMITTER_NAME" ]; then
git config user.email "x@fedoraproject.org"
git config user.name "Fedora X Ninjas"
fi
%else %else
git init-db git init
if [ -z "$GIT_COMMITTER_NAME" ]; then if [ -z "$GIT_COMMITTER_NAME" ]; then
git config user.email "x@fedoraproject.org" git config user.email "x@fedoraproject.org"
git config user.name "Fedora X Ninjas" git config user.name "Fedora X Ninjas"
@ -353,7 +343,7 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
--enable-xselinux --enable-record \ --enable-xselinux --enable-record \
%{dri_flags} \ %{dri_flags} \
${CONFIGURE} ${CONFIGURE}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -377,7 +367,7 @@ mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
cp cpprules.in %{inst_srcdir} cp cpprules.in %{inst_srcdir}
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
cp xkb/README.compiled %{inst_srcdir}/xkb cp xkb/README.compiled %{inst_srcdir}/xkb
cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86 cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run
@ -483,24 +473,24 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/Xnest.1* %{_mandir}/man1/Xnest.1*
%files Xdmx #%files Xdmx
%defattr(-,root,root,-) #%defattr(-,root,root,-)
%{_bindir}/Xdmx #%{_bindir}/Xdmx
%{_bindir}/dmxaddinput #%{_bindir}/dmxaddinput
%{_bindir}/dmxaddscreen #%{_bindir}/dmxaddscreen
%{_bindir}/dmxreconfig #%{_bindir}/dmxreconfig
%{_bindir}/dmxresize #%{_bindir}/dmxresize
%{_bindir}/dmxrminput #%{_bindir}/dmxrminput
%{_bindir}/dmxrmscreen #%{_bindir}/dmxrmscreen
%{_bindir}/dmxtodmx #%{_bindir}/dmxtodmx
%{_bindir}/dmxwininfo #%{_bindir}/dmxwininfo
%{_bindir}/vdltodmx #%{_bindir}/vdltodmx
%{_bindir}/xdmx #%{_bindir}/xdmx
%{_bindir}/xdmxconfig #%{_bindir}/xdmxconfig
%{_mandir}/man1/Xdmx.1* #%{_mandir}/man1/Xdmx.1*
%{_mandir}/man1/dmxtodmx.1* #%{_mandir}/man1/dmxtodmx.1*
%{_mandir}/man1/vdltodmx.1* #%{_mandir}/man1/vdltodmx.1*
%{_mandir}/man1/xdmxconfig.1* #%{_mandir}/man1/xdmxconfig.1*
%files Xvfb %files Xvfb
@ -519,7 +509,11 @@ rm -rf $RPM_BUILD_ROOT
%if %{with_hw_servers} %if %{with_hw_servers}
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libxf86config.a # FIXME ajax? please?
#%{_libdir}/libxf86config.a
%{_libdir}/libxf86config.so
%{_libdir}/libxf86config.so.0
%{_libdir}/libxf86config.so.0.0.0
%{_libdir}/pkgconfig/xorg-server.pc %{_libdir}/pkgconfig/xorg-server.pc
%dir %{_includedir}/xorg %dir %{_includedir}/xorg
%{sdkdir}/*.h %{sdkdir}/*.h
@ -533,6 +527,27 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Jun 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99.1.20090618
- Today's git snapshot.
- disable Xdmx - it's broken upstream
- Removing patches merged upstream or obsolete.
xserver-1.4.99-endian.patch - obsolete with autoconf 2.63-1 (#449944)
xserver-1.5.99.902-sod-off-poulsbo.patch - upstream
xserver-1.6.0-selinux-less.patch - upstream
xserver-1.5.99.902-vnc.patch - upstream
xserver-1.6.0-restore-zap.patch - upstream
xserver-1.6.0-xinerama-cursors.patch - upstream
xserver-1.6.0-xinerama-crashes.patch - obsolete, server 1.6 only
xserver-1.6.1-xkbsendmap.patch - upstream
xserver-1.6.0-randr-xinerama-crash.patch - upstream
xserver-1.6.1-avoid-malloc-for-logging.patch - upstream
xserver-1.6.1-exa-avoid-swapped-out.patch - upstream
xserver-1.6.1-exa-create-pixmap2.patch - upstream
xserver-1.6.1-fix-glx-drawable.patch - upstream
xserver-1.6.1-randr-gamma.patch - upstream
xserver-1.6.1-vt-switch.patch - obsolete
xserver-1.6.1-pea-quirk.patch - will be upstream
* Tue Apr 14 2009 Adam Jackson <ajax@redhat.com> 1.6.1-1 * Tue Apr 14 2009 Adam Jackson <ajax@redhat.com> 1.6.1-1
- xserver 1.6.1 - xserver 1.6.1

68
xserver-1.5.0-bg-none-root.patch
View File

@ -1,22 +1,22 @@
From a3e15680da24cb8259f6a83dee0c930dab024290 Mon Sep 17 00:00:00 2001 From 3b9461737f1a0711a2c5a8916628386c359d9203 Mon Sep 17 00:00:00 2001
From: Kristian <krh@redhat.com> From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Fri, 15 Aug 2008 15:15:14 +1000 Date: Thu, 18 Jun 2009 13:38:58 +1000
Subject: [PATCH] Add nr for background=none root Subject: [PATCH] Add nr for background=none root
--- ---
dix/globals.c | 1 + dix/globals.c | 1 +
dix/window.c | 22 ++++++++++++---------- dix/window.c | 12 +++++++-----
hw/xfree86/common/xf86Init.c | 11 +++++++++++ hw/xfree86/common/xf86Init.c | 11 +++++++++++
hw/xfree86/common/xf86str.h | 5 ++++- hw/xfree86/common/xf86str.h | 5 ++++-
include/opaque.h | 1 + include/opaque.h | 1 +
os/utils.c | 3 +++ os/utils.c | 3 +++
6 files changed, 32 insertions(+), 11 deletions(-) 6 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/dix/globals.c b/dix/globals.c diff --git a/dix/globals.c b/dix/globals.c
index 973dc43..dbd76bb 100644 index c24a94f..907a5e8 100644
--- a/dix/globals.c --- a/dix/globals.c
+++ b/dix/globals.c +++ b/dix/globals.c
@@ -141,6 +141,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in @@ -124,6 +124,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
CursorPtr rootCursor; CursorPtr rootCursor;
Bool party_like_its_1989 = FALSE; Bool party_like_its_1989 = FALSE;
Bool whiteRoot = FALSE; Bool whiteRoot = FALSE;
@ -25,14 +25,13 @@ index 973dc43..dbd76bb 100644
int cursorScreenDevPriv[MAXSCREENS]; int cursorScreenDevPriv[MAXSCREENS];
diff --git a/dix/window.c b/dix/window.c diff --git a/dix/window.c b/dix/window.c
index c31fa87..8bb178d 100644 index 99b594b..aefc282 100644
--- a/dix/window.c --- a/dix/window.c
+++ b/dix/window.c +++ b/dix/window.c
@@ -482,23 +482,24 @@ InitRootWindow(WindowPtr pWin) @@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
pWin->cursorIsNone = FALSE;
pWin->optional->cursor = rootCursor; pWin->optional->cursor = rootCursor;
rootCursor->refcnt++; rootCursor->refcnt++;
-
+ pWin->backingStore = defaultBackingStore; + pWin->backingStore = defaultBackingStore;
+ pWin->forcedBS = (defaultBackingStore != NotUseful); + pWin->forcedBS = (defaultBackingStore != NotUseful);
@ -41,7 +40,7 @@ index c31fa87..8bb178d 100644
backFlag |= CWBackPixmap; backFlag |= CWBackPixmap;
+ pScreen->ChangeWindowAttributes(pWin, backFlag); + pScreen->ChangeWindowAttributes(pWin, backFlag);
+ } else if (bgNoneRoot) { + } else if (bgNoneRoot) {
+ /* nothing, handled in xf86CreateRootWindow */ + /* nothing, handled in xf86CreateRootWindow */
} else { } else {
if (whiteRoot) if (whiteRoot)
pWin->background.pixel = pScreen->whitePixel; pWin->background.pixel = pScreen->whitePixel;
@ -60,10 +59,10 @@ index c31fa87..8bb178d 100644
MapWindow(pWin, serverClient); MapWindow(pWin, serverClient);
} }
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 236c00b..083a6ac 100644 index c4e5898..97bf48a 100644
--- a/hw/xfree86/common/xf86Init.c --- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c
@@ -79,6 +79,7 @@ @@ -77,6 +77,7 @@
#ifdef RENDER #ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif #endif
@ -71,7 +70,7 @@ index 236c00b..083a6ac 100644
#include "globals.h" #include "globals.h"
@@ -328,6 +329,7 @@ xf86CreateRootWindow(WindowPtr pWin) @@ -312,6 +313,7 @@ xf86CreateRootWindow(WindowPtr pWin)
int ret = TRUE; int ret = TRUE;
int err = Success; int err = Success;
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -79,7 +78,7 @@ index 236c00b..083a6ac 100644
RootWinPropPtr pProp; RootWinPropPtr pProp;
CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
@@ -381,6 +383,15 @@ xf86CreateRootWindow(WindowPtr pWin) @@ -363,6 +365,15 @@ xf86CreateRootWindow(WindowPtr pWin)
} }
} }
@ -92,14 +91,14 @@ index 236c00b..083a6ac 100644
+ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore); + pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore);
+ } + }
+ +
#ifdef DEBUG DebugF("xf86CreateRootWindow() returns %d\n", ret);
ErrorF("xf86CreateRootWindow() returns %d\n", ret); return (ret);
#endif }
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 904c369..8c38f69 100644 index 3b1346f..b82f168 100644
--- a/hw/xfree86/common/xf86str.h --- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h
@@ -531,7 +531,7 @@ typedef struct _confdrirec { @@ -516,7 +516,7 @@ typedef struct _confdrirec {
} confDRIRec, *confDRIPtr; } confDRIRec, *confDRIPtr;
/* These values should be adjusted when new fields are added to ScrnInfoRec */ /* These values should be adjusted when new fields are added to ScrnInfoRec */
@ -108,33 +107,33 @@ index 904c369..8c38f69 100644
#define NUM_RESERVED_POINTERS 15 #define NUM_RESERVED_POINTERS 15
#define NUM_RESERVED_FUNCS 11 #define NUM_RESERVED_FUNCS 11
@@ -959,6 +959,9 @@ typedef struct _ScrnInfoRec { @@ -944,6 +944,9 @@ typedef struct _ScrnInfoRec {
ClockRangesPtr clockRanges; ClockRangesPtr clockRanges;
int adjustFlags; int adjustFlags;
+ /* -nr support */ + /* -nr support */
+ int canDoBGNoneRoot; + int canDoBGNoneRoot;
+ +
/* /*
* These can be used when the minor ABI version is incremented. * These can be used when the minor ABI version is incremented.
* The NUM_* parameters must be reduced appropriately to keep the * The NUM_* parameters must be reduced appropriately to keep the
diff --git a/include/opaque.h b/include/opaque.h diff --git a/include/opaque.h b/include/opaque.h
index 07a0715..be1577b 100644 index b3c7c70..fcc8c95 100644
--- a/include/opaque.h --- a/include/opaque.h
+++ b/include/opaque.h +++ b/include/opaque.h
@@ -71,6 +71,7 @@ extern Bool defeatAccessControl; @@ -71,6 +71,7 @@ extern _X_EXPORT Bool defeatAccessControl;
extern long maxBigRequestSize; extern _X_EXPORT long maxBigRequestSize;
extern Bool party_like_its_1989; extern _X_EXPORT Bool party_like_its_1989;
extern Bool whiteRoot; extern _X_EXPORT Bool whiteRoot;
+extern Bool bgNoneRoot; +extern _X_EXPORT Bool bgNoneRoot;
extern Bool CoreDump; extern _X_EXPORT Bool CoreDump;
diff --git a/os/utils.c b/os/utils.c diff --git a/os/utils.c b/os/utils.c
index b100949..c41b45b 100644 index 00abd63..7bfdf8b 100644
--- a/os/utils.c --- a/os/utils.c
+++ b/os/utils.c +++ b/os/utils.c
@@ -515,6 +515,7 @@ void UseMsg(void) @@ -514,6 +514,7 @@ void UseMsg(void)
#endif #endif
ErrorF("-nolisten string don't listen on protocol\n"); ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n"); ErrorF("-noreset don't reset after last client exists\n");
@ -142,7 +141,7 @@ index b100949..c41b45b 100644
ErrorF("-reset reset after last client exists\n"); ErrorF("-reset reset after last client exists\n");
ErrorF("-p # screen-saver pattern duration (minutes)\n"); ErrorF("-p # screen-saver pattern duration (minutes)\n");
ErrorF("-pn accept failure to listen on all ports\n"); ErrorF("-pn accept failure to listen on all ports\n");
@@ -859,6 +860,8 @@ ProcessCommandLine(int argc, char *argv[]) @@ -861,6 +862,8 @@ ProcessCommandLine(int argc, char *argv[])
defaultBackingStore = WhenMapped; defaultBackingStore = WhenMapped;
else if ( strcmp( argv[i], "-wr") == 0) else if ( strcmp( argv[i], "-wr") == 0)
whiteRoot = TRUE; whiteRoot = TRUE;
@ -151,3 +150,6 @@ index b100949..c41b45b 100644
else if ( strcmp( argv[i], "-maxbigreqsize") == 0) { else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
if(++i < argc) { if(++i < argc) {
long reqSizeArg = atol(argv[i]); long reqSizeArg = atol(argv[i]);
--
1.6.3.rc1.2.g0164.dirty

12
xserver-1.5.99.902-nouveau.patch
View File

@ -1,6 +1,6 @@
From cc8ff24ba47acbe13872176086b6d75943508e61 Mon Sep 17 00:00:00 2001 From 16590f427347f68f7fbee5492833b3feade00c18 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org> From: Fedora X Ninjas <x@fedoraproject.org>
Date: Mon, 16 Feb 2009 15:50:14 +1000 Date: Thu, 18 Jun 2009 13:45:57 +1000
Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs
--- ---
@ -8,13 +8,13 @@ Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs
1 files changed, 13 insertions(+), 1 deletions(-) 1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 19c06c8..853d661 100644 index ada1ca5..abcedde 100644
--- a/hw/xfree86/common/xf86AutoConfig.c --- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -181,7 +181,19 @@ videoPtrToDriverList(struct pci_device *dev, @@ -181,7 +181,19 @@ videoPtrToDriverList(struct pci_device *dev,
break;
case 0x102b: driverList[0] = "mga"; break; case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break; case 0x10c8: driverList[0] = "neomagic"; break;
case 0x105d: driverList[0] = "i128"; break;
- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; - case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
+ case 0x10de: + case 0x10de:
+ switch (dev->device_id & 0xfff0) { + switch (dev->device_id & 0xfff0) {
@ -29,9 +29,9 @@ index 19c06c8..853d661 100644
+ } + }
+ break; + break;
+ case 0x12d2: driverList[0] = "nv"; break; + case 0x12d2: driverList[0] = "nv"; break;
case 0x1106: driverList[0] = "openchrome"; break;
case 0x1163: driverList[0] = "rendition"; break; case 0x1163: driverList[0] = "rendition"; break;
case 0x5333: case 0x5333:
switch (dev->device_id)
-- --
1.6.1.3 1.6.3.rc1.2.g0164.dirty

50
xserver-1.6.0-displayfd.patch
View File

@ -1,6 +1,6 @@
From ac43dac0a18778081ea784c98391f0333981ca13 Mon Sep 17 00:00:00 2001 From 1766352059d0db67bff3f7dd0820563a30f54858 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com> From: Adam Jackson <ajax@redhat.com>
Date: Mon, 6 Apr 2009 15:44:05 -0400 Date: Thu, 18 Jun 2009 16:56:41 +1000
Subject: [PATCH] displayfd hack Subject: [PATCH] displayfd hack
--- ---
@ -11,31 +11,31 @@ Subject: [PATCH] displayfd hack
4 files changed, 62 insertions(+), 23 deletions(-) 4 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/dix/globals.c b/dix/globals.c diff --git a/dix/globals.c b/dix/globals.c
index dbd76bb..749bf9b 100644 index 907a5e8..c1e64d3 100644
--- a/dix/globals.c --- a/dix/globals.c
+++ b/dix/globals.c +++ b/dix/globals.c
@@ -152,6 +152,7 @@ _X_EXPORT int defaultColorVisualClass = -1; @@ -135,6 +135,7 @@ int defaultColorVisualClass = -1;
_X_EXPORT int monitorResolution = 0; int monitorResolution = 0;
_X_EXPORT char *display; char *display;
+int displayfd; +int displayfd;
char *ConnectionInfo; char *ConnectionInfo;
CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
diff --git a/include/opaque.h b/include/opaque.h diff --git a/include/opaque.h b/include/opaque.h
index be1577b..2ae6680 100644 index fcc8c95..2a08e2d 100644
--- a/include/opaque.h --- a/include/opaque.h
+++ b/include/opaque.h +++ b/include/opaque.h
@@ -50,6 +50,7 @@ extern int ScreenSaverAllowExposures; @@ -50,6 +50,7 @@ extern _X_EXPORT int ScreenSaverAllowExposures;
extern int defaultScreenSaverBlanking; extern _X_EXPORT int defaultScreenSaverBlanking;
extern int defaultScreenSaverAllowExposures; extern _X_EXPORT int defaultScreenSaverAllowExposures;
extern char *display; extern _X_EXPORT char *display;
+extern int displayfd; +extern _X_EXPORT int displayfd;
extern int defaultBackingStore; extern _X_EXPORT int defaultBackingStore;
extern Bool disableBackingStore; extern _X_EXPORT Bool disableBackingStore;
diff --git a/os/connection.c b/os/connection.c diff --git a/os/connection.c b/os/connection.c
index 8f1f73e..4351117 100644 index 0c72b67..05d95c4 100644
--- a/os/connection.c --- a/os/connection.c
+++ b/os/connection.c +++ b/os/connection.c
@@ -146,6 +146,7 @@ Bool NewOutputPending; /* not yet attempted to write some new output */ @@ -146,6 +146,7 @@ Bool NewOutputPending; /* not yet attempted to write some new output */
@ -43,10 +43,10 @@ index 8f1f73e..4351117 100644
static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */ static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
+static char dynamic_display[7]; +static char dynamic_display[7];
Bool PartialNetwork; /* continue even if unable to bind all addrs */ Bool PartialNetwork; /* continue even if unable to bind all addrs */
static Pid_t ParentProcess; static Pid_t ParentProcess;
@@ -367,9 +368,23 @@ NotifyParentProcess(void) @@ -357,9 +358,23 @@ NotifyParentProcess(void)
kill (ParentProcess, SIGUSR1); kill (ParentProcess, SIGUSR1);
} }
} }
@ -70,7 +70,7 @@ index 8f1f73e..4351117 100644
/***************** /*****************
* CreateWellKnownSockets * CreateWellKnownSockets
* At initialization, create the sockets to listen on for new clients. * At initialization, create the sockets to listen on for new clients.
@@ -380,7 +395,6 @@ CreateWellKnownSockets(void) @@ -370,7 +385,6 @@ CreateWellKnownSockets(void)
{ {
int i; int i;
int partial; int partial;
@ -78,7 +78,7 @@ index 8f1f73e..4351117 100644
FD_ZERO(&AllSockets); FD_ZERO(&AllSockets);
FD_ZERO(&AllClients); FD_ZERO(&AllClients);
@@ -395,32 +409,44 @@ CreateWellKnownSockets(void) @@ -385,32 +399,44 @@ CreateWellKnownSockets(void)
FD_ZERO (&WellKnownConnections); FD_ZERO (&WellKnownConnections);
@ -104,7 +104,7 @@ index 8f1f73e..4351117 100644
+ Bool found = 0; + Bool found = 0;
+ for (i = 0; i < 65535 - 1024; i++) + for (i = 0; i < 65535 - 1024; i++)
{ {
- ListenTransFds = (int *) xalloc (ListenTransCount * sizeof (int)); - ListenTransFds = xalloc (ListenTransCount * sizeof (int));
- -
- for (i = 0; i < ListenTransCount; i++) - for (i = 0; i < ListenTransCount; i++)
+ if (!TryCreateSocket(i, &partial) && !partial) + if (!TryCreateSocket(i, &partial) && !partial)
@ -135,7 +135,7 @@ index 8f1f73e..4351117 100644
+ for (i = 0; i < ListenTransCount; i++) + for (i = 0; i < ListenTransCount; i++)
+ { + {
+ int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]); + int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]);
+ +
+ ListenTransFds[i] = fd; + ListenTransFds[i] = fd;
+ FD_SET (fd, &WellKnownConnections); + FD_SET (fd, &WellKnownConnections);
+ +
@ -146,10 +146,10 @@ index 8f1f73e..4351117 100644
} }
diff --git a/os/utils.c b/os/utils.c diff --git a/os/utils.c b/os/utils.c
index c41b45b..2372588 100644 index 7bfdf8b..37a93b1 100644
--- a/os/utils.c --- a/os/utils.c
+++ b/os/utils.c +++ b/os/utils.c
@@ -674,6 +674,17 @@ ProcessCommandLine(int argc, char *argv[]) @@ -678,6 +678,17 @@ ProcessCommandLine(int argc, char *argv[])
else else
UseMsg(); UseMsg();
} }
@ -166,7 +166,7 @@ index c41b45b..2372588 100644
+ } + }
#ifdef DPMSExtension #ifdef DPMSExtension
else if ( strcmp( argv[i], "dpms") == 0) else if ( strcmp( argv[i], "dpms") == 0)
DPMSEnabledSwitch = TRUE; /* ignored for compatibility */ ;
-- --
1.6.2 1.6.3.rc1.2.g0164.dirty

12
xserver-1.6.0-no-i810.patch
View File

@ -1,6 +1,6 @@
From be743d919d85a74133d714d4e5137416de02bfb7 Mon Sep 17 00:00:00 2001 From 4cfe8e8e8342fe61113b0395d099d8ddb4ffb53e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com> From: Adam Jackson <ajax@redhat.com>
Date: Thu, 9 Apr 2009 10:38:51 -0400 Date: Thu, 18 Jun 2009 13:49:28 +1000
Subject: [PATCH] config: Remove i810 from the autoload list, we don't ship it. Subject: [PATCH] config: Remove i810 from the autoload list, we don't ship it.
--- ---
@ -8,11 +8,11 @@ Subject: [PATCH] config: Remove i810 from the autoload list, we don't ship it.
1 files changed, 0 insertions(+), 1 deletions(-) 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 853d661..2e69a31 100644 index abcedde..4ee5af6 100644
--- a/hw/xfree86/common/xf86AutoConfig.c --- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -175,7 +175,6 @@ videoPtrToDriverList(struct pci_device *dev, @@ -176,7 +176,6 @@ videoPtrToDriverList(struct pci_device *dev,
break; /* you got powervr in my intel! */ break; /* "hooray" for poulsbo */
} else { } else {
driverList[0] = "intel"; driverList[0] = "intel";
- driverList[1] = "i810"; - driverList[1] = "i810";
@ -20,5 +20,5 @@ index 853d661..2e69a31 100644
break; break;
case 0x102b: driverList[0] = "mga"; break; case 0x102b: driverList[0] = "mga"; break;
-- --
1.6.2 1.6.3.rc1.2.g0164.dirty

36
xserver-1.6.1-proc-cmdline.patch Normal file
View File

@ -0,0 +1,36 @@
From 794214c9da2b17c3291ec53b178a035a1f117430 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 7 May 2009 17:18:31 -0400
Subject: [PATCH] Dump /proc/cmdline in the log file too.
---
hw/xfree86/common/xf86Init.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2493526..7c0937f 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -193,6 +193,19 @@ xf86PrintBanner(void)
if (uname(&name) >= 0) {
ErrorF("Current Operating System: %s %s %s %s %s\n",
name.sysname, name.nodename, name.release, name.version, name.machine);
+ do {
+ char buf[80];
+ int fd = open("/proc/cmdline", O_RDONLY);
+ if (fd != -1) {
+ ErrorF("Kernel command line: ");
+ memset(buf, 0, 80);
+ while (read(fd, buf, 80) > 0) {
+ ErrorF("%.80s", buf);
+ memset(buf, 0, 80);
+ }
+ close(fd);
+ }
+ } while (0);
}
}
#endif
--
1.6.2.2