diff --git a/.cvsignore b/.cvsignore index bcd5427..eba9535 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20080227.tar.bz2 +xorg-server-20080303.tar.bz2 diff --git a/commitid b/commitid index 28391ac..7a799e1 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -d74b0327e8355546e6b41e8ce684f461d65fa9dc +1bda57a41ea3bb3a624a5e75f421160ac98a0804 diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh index e0389ad..f7e3bc9 100755 --- a/make-git-snapshot.sh +++ b/make-git-snapshot.sh @@ -6,7 +6,7 @@ rm -rf $DIRNAME git clone -n git://git.freedesktop.org/git/xorg/xserver $DIRNAME cd $DIRNAME if [ -z "$1" ]; then - git log | head -1 + git checkout --track -b server-1.5-branch origin/server-1.5-branch else git checkout $1 fi diff --git a/sources b/sources index 445bd24..0cf3828 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -240a7d59f892bdbcd7fb098159e8c7f0 xorg-server-20080227.tar.bz2 +bbe69d049ba5bd8d764787e10a95dfd3 xorg-server-20080303.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index aa47121..914fb18 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080227 +%define gitdate 20080303 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.1 -Release: 0.26.%{?gitdate}%{?dist} +Version: 1.4.99.900 +Release: 0.27.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -36,10 +36,6 @@ Source2: commitid Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 %endif -Patch10: xserver-1.4.99-selinux-fix.patch -# general bug fixes -Patch19: xserver-1.3.0-xnest-exposures.patch - # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch Patch101: xserver-1.4.99-dont-backfill-bg-none.patch @@ -53,8 +49,6 @@ Patch1005: xserver-1.4.99-builtin-fonts.patch Patch1010: xserver-1.3.0-no-prerelease-warning.patch Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch -Patch2004: xserver-1.3.0-honor-displaysize.patch -Patch2007: xserver-1.3.0-randr12-config-hack.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch # Trivial things to maybe merge upstream at next rebase @@ -272,7 +266,7 @@ Xserver source code needed to build VNC server (Xvnc) %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %if 0%{gitdate} -git checkout -b fedora-%{version}-%{release} +git checkout -b fedora # make it something you can push to. sed -i 's/git/&+ssh/' .git/config %else @@ -510,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 03 2008 Adam Jackson 1.4.99.900-0.27.20080303 +- Switch to 1.5 branch and rebase. + * Thu Feb 28 2008 Jeremy Katz - 1.4.99.1-0.26 - Pull in another SELinux fix from upstream diff --git a/xserver-1.3.0-honor-displaysize.patch b/xserver-1.3.0-honor-displaysize.patch deleted file mode 100644 index 2dd4977..0000000 --- a/xserver-1.3.0-honor-displaysize.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Adam Jackson -Date: Sun, 28 Oct 2007 09:37:52 +0100 -Subject: [PATCH] Honor the Monitor section's DisplaySize directive. - ---- -diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c ---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da 2007-09-26 17:04:02.000000000 +1000 -+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c 2007-09-26 17:04:27.000000000 +1000 -@@ -401,8 +401,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr - - Monitor->DDC = DDC; - -- Monitor->widthmm = 10 * DDC->features.hsize; -- Monitor->heightmm = 10 * DDC->features.vsize; -+ if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) { -+ Monitor->widthmm = 10 * DDC->features.hsize; -+ Monitor->heightmm = 10 * DDC->features.vsize; -+ } - - /* If this is a digital display, then we can use reduced blanking */ - if (DDC->features.input_type) diff --git a/xserver-1.3.0-randr12-config-hack.patch b/xserver-1.3.0-randr12-config-hack.patch deleted file mode 100644 index eb1a012..0000000 --- a/xserver-1.3.0-randr12-config-hack.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Adam Jackson -Date: Sun, 28 Oct 2007 09:37:52 +0100 -Subject: [PATCH] Use the global Modes list when determining preferred mode. - ---- -diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c ---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.da 2007-09-26 17:12:44.000000000 +1000 -+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c 2007-09-26 17:14:44.000000000 +1000 -@@ -1214,6 +1214,23 @@ xf86SortModes (DisplayModePtr input) - return output; - } - -+static char * -+preferredMode(ScrnInfoPtr pScrn, xf86OutputPtr output) -+{ -+ char *preferred_mode = NULL; -+ -+ /* Check for a configured preference for a particular mode */ -+ preferred_mode = xf86GetOptValString (output->options, -+ OPTION_PREFERRED_MODE); -+ if (preferred_mode) -+ return preferred_mode; -+ -+ if (pScrn->display->modes && *pScrn->display->modes) -+ preferred_mode = *pScrn->display->modes; -+ -+ return preferred_mode; -+} -+ - _X_EXPORT void - xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) - { -@@ -1395,8 +1412,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, - output->probed_modes = xf86SortModes (output->probed_modes); - - /* Check for a configured preference for a particular mode */ -- preferred_mode = xf86GetOptValString (output->options, -- OPTION_PREFERRED_MODE); -+ preferred_mode = preferredMode(scrn, output); - - if (preferred_mode) - { diff --git a/xserver-1.3.0-xnest-exposures.patch b/xserver-1.3.0-xnest-exposures.patch deleted file mode 100644 index 75dd477..0000000 --- a/xserver-1.3.0-xnest-exposures.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Adam Jackson -Date: Sun, 28 Oct 2007 09:37:52 +0100 -Subject: [PATCH] Fix exposure generation in Xnest - ---- ---- xorg-server-1.2.99.905/hw/xnest/Events.c.jx 2007-01-31 19:55:51.000000000 -0500 -+++ xorg-server-1.2.99.905/hw/xnest/Events.c 2007-04-09 18:42:51.000000000 -0400 -@@ -85,7 +85,7 @@ - while (XCheckIfEvent(xnestDisplay, &X, xnestExposurePredicate, NULL)) { - pWin = xnestWindowPtr(X.xexpose.window); - -- if (pWin) { -+ if (pWin && X.xexpose.width && X.xexpose.height) { - Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + X.xexpose.x; - Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + X.xexpose.y; - Box.x2 = Box.x1 + X.xexpose.width; -@@ -93,7 +93,7 @@ - - REGION_INIT(pWin->drawable.pScreen, &Rgn, &Box, 1); - -- miWindowExposures(pWin, &Rgn, NullRegion); -+ miSendExposures(pWin, &Rgn, Box.x2, Box.y2); - } - } - } diff --git a/xserver-1.4.99-selinux-fix.patch b/xserver-1.4.99-selinux-fix.patch deleted file mode 100644 index f789cfb..0000000 --- a/xserver-1.4.99-selinux-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Eamon Walsh -Date: Thu, 28 Feb 2008 03:29:15 +0000 (-0500) -Subject: xselinux: Don't throw BadAccess if DixUnknownAccess is passed in to a hook. -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=e40cc5305bec656108077ab13fcc8e6e82b3707a - -xselinux: Don't throw BadAccess if DixUnknownAccess is passed in to a hook. - -The avc will still appear, however, so that the callsite can be fixed. ---- - ---- a/Xext/xselinux.c -+++ b/Xext/xselinux.c -@@ -312,6 +312,8 @@ SELinuxDoCheck(SELinuxSubjectRec *subj, - - if (avc_has_perm(subj->sid, obj->sid, class, mode, &subj->aeref, - auditdata) < 0) { -+ if (mode == DixUnknownAccess) -+ return Success; /* DixUnknownAccess requests OK ... for now */ - if (errno == EACCES) - return BadAccess; - ErrorF("ServerPerm: unexpected error %d\n", errno);