rpms/xorg-x11-server/F-11 xserver-1.6.1-hush-warning.patch, NONE, 1.1 xserver-1.6.1-proc-cmdline.patch, NONE, 1.1 .cvsignore, 1.58, 1.59 import.log, 1.6, 1.7 sources, 1.53, 1.54 xorg-x11-server.spec, 1.446, 1.447 xserver-1.6.0-primary.patch, 1.3, 1.4 xvfb-run.sh, 1.2, 1.3 xserver-1.6.0-xinerama-crashes.patch, 1.1, NONE xserver-1.6.1-activate-device.patch, 1.1, NONE

Mon May 18 18:40:49 UTC 2009

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29109/F-11

Modified Files:
	.cvsignore import.log sources xorg-x11-server.spec 
	xserver-1.6.0-primary.patch xvfb-run.sh 
Added Files:
	xserver-1.6.1-hush-warning.patch 
	xserver-1.6.1-proc-cmdline.patch 
Removed Files:
	xserver-1.6.0-xinerama-crashes.patch 
	xserver-1.6.1-activate-device.patch 
Log Message:
1.6.1.901


xserver-1.6.1-hush-warning.patch:

--- NEW FILE xserver-1.6.1-hush-warning.patch ---
>From 7768cd35b501f4b932aa7965598f4ae9400adddb Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 18 May 2009 14:30:54 -0400
Subject: [PATCH] Silence prerelease warning

---
 hw/xfree86/common/xf86Init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 8db96f9..48c22c2 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -135,7 +135,7 @@ static Bool formatsDone = FALSE;
 static void
 xf86PrintBanner(void)
 {
-#if PRE_RELEASE
+#if 0
   ErrorF("\n"
     "This is a pre-release version of the X server from " XVENDORNAME ".\n"
     "It is not supported in any way.\n"
-- 
1.6.2.2


xserver-1.6.1-proc-cmdline.patch:

--- NEW FILE xserver-1.6.1-proc-cmdline.patch ---
>From 794214c9da2b17c3291ec53b178a035a1f117430 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	14 Apr 2009 20:55:05 -0000	1.58
+++ .cvsignore	18 May 2009 18:40:18 -0000	1.59
@@ -1 +1 @@
-xorg-server-1.6.1.tar.bz2
+xorg-server-1.6.1.901.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	14 Apr 2009 20:55:05 -0000	1.6
+++ import.log	18 May 2009 18:40:18 -0000	1.7
@@ -4,3 +4,4 @@ xorg-x11-server-1_5_2-1_fc10:HEAD:xorg-x
 xorg-x11-server-1_5_3-1_fc10:HEAD:xorg-x11-server-1.5.3-1.fc10.src.rpm:1225918317
 xorg-x11-server-1_6_0-1_fc11:HEAD:xorg-x11-server-1.6.0-1.fc11.src.rpm:1235594175
 xorg-x11-server-1_6_1-1_fc11:HEAD:xorg-x11-server-1.6.1-1.fc11.src.rpm:1239742477
+xorg-x11-server-1_6_1_901-1_fc11:F-11:xorg-x11-server-1.6.1.901-1.fc11.src.rpm:1242671995


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	14 Apr 2009 20:55:05 -0000	1.53
+++ sources	18 May 2009 18:40:18 -0000	1.54
@@ -1 +1 @@
-ed0878bf32a24d4948c3b8a122a39eff  xorg-server-1.6.1.tar.bz2
+e6cba1f07006143daa95ce3f11d999b2  xorg-server-1.6.1.901.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -p -r1.446 -r1.447
--- xorg-x11-server.spec	11 May 2009 00:47:22 -0000	1.446
+++ xorg-x11-server.spec	18 May 2009 18:40:18 -0000	1.447
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.1
-Release:   14%{?dist}
+Version:   1.6.1.901
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -52,6 +52,7 @@ Patch103:  xserver-1.5.0-bg-none-root.pa
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
 Patch1003:  xserver-1.4.99-pic-libxf86config.patch
+Patch1004:  xserver-1.6.1-hush-warning.patch
 
 Patch2013:  xserver-1.6.1-document-fontpath-correctly.patch
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
@@ -82,9 +83,6 @@ Patch6012: xserver-1.5.99.902-sod-off-po
 # don't do selinux if we're not told to
 Patch6013: xserver-1.6.0-selinux-less.patch
 
-# selinux performance hack
-#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
 
@@ -94,8 +92,6 @@ Patch6016: xserver-1.6.1-nouveau.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
 Patch6027: xserver-1.6.0-displayfd.patch
@@ -108,13 +104,13 @@ Patch6031: xserver-1.6.1-exa-avoid-swapp
 Patch6032: xserver-1.6.1-randr-gamma.patch
 
 # Nominated for 1.6.2
-Patch6033: xserver-1.6.1-activate-device.patch
 Patch6034: xserver-1.6.1-exa-create-pixmap2.patch
 Patch6035: xserver-1.6.1-avoid-malloc-for-logging.patch
 
 Patch6040: xserver-1.6.1-vt-switch.patch
 # from upstream, nominated for 1.6.2 (#499792)
 Patch6041: xserver-1.6.1-synaptics.patch
+Patch6042: xserver-1.6.1-proc-cmdline.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -418,22 +414,6 @@ xargs tar cf - | (cd %{inst_srcdir} && t
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with_hw_servers}
-%pre Xorg
-{
-    pushd /etc/X11
-
-    [ -e xorg.conf ] || return 0
-
-    sed -i 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
-    sed -i 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
-    sed -i 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
-    sed -i 's#^\s*RgbPath.*$##gi' xorg.conf
-
-    popd
-} &> /dev/null || :
-%endif
-
 %files common
 %defattr(-,root,root,-)
 %{_mandir}/man1/Xserver.1*
@@ -548,6 +528,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 18 2009 Adam Jackson <ajax at redhat.com> 1.6.1.901-1
+- Rebase to 1.6.2 pre-release
+- xserver-1.6.1-hush-warning.patch: Silence the prerelease warning spew.
+- xserver-1.6.0-xinerama-crashes.patch: merged
+- xserver-1.6.1-activate-device.patch: merged
+- xserver-1.6.1-proc-cmdline.patch: Print /proc/cmdline in the log
+- xserver-1.6.0-primary.patch: Don't include prehistoric PCI devices in the
+  candidate list for primary video. (#500057)
+- Drop the %%pre scriptlet from the Xorg subpackage, it's been there since
+  FC5, if you haven't upgraded by now you're quite doomed.
+
 * Mon May 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.1-14
 - xserver-1.6.1-synaptics.patch: Don't synthesize a mouse section if
   unreferenced synaptics devices are found in the xorg.conf (#499792)

xserver-1.6.0-primary.patch:

Index: xserver-1.6.0-primary.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xserver-1.6.0-primary.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.6.0-primary.patch	6 Mar 2009 18:02:40 -0000	1.3
+++ xserver-1.6.0-primary.patch	18 May 2009 18:40:18 -0000	1.4
@@ -1,30 +1,32 @@
-From 69e53f2493c142ef5569af01ce52565be5b2976e Mon Sep 17 00:00:00 2001
+From b0f7839b34d4110dd08d523c01dc1d4b4c74cfb6 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Tue, 3 Mar 2009 10:58:33 -0500
 Subject: [PATCH] Primary video device hack
 
 ---
- hw/xfree86/common/xf86pciBus.c |   60 ++++++++++++++++++++++++++++++++--------
- 1 files changed, 48 insertions(+), 12 deletions(-)
+ hw/xfree86/common/xf86pciBus.c |   62 +++++++++++++++++++++++++++++++---------
+ 1 files changed, 48 insertions(+), 14 deletions(-)
 
 diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 467a0c3..0d2d01c 100644
+index 467a0c3..18f104f 100644
 --- a/hw/xfree86/common/xf86pciBus.c
 +++ b/hw/xfree86/common/xf86pciBus.c
-@@ -60,11 +60,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL;	/* PCI probe for video hw *
+@@ -58,13 +58,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL;	/* PCI probe for video hw *
+ 
+ 
  /* PCI classes that get included in xf86PciVideoInfo */
- #define PCIINFOCLASSES(c) \
-     ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \
+-#define PCIINFOCLASSES(c) \
+-    ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \
 -      || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \
 -      || ((((c) & 0x00ffff00) \
 -	   == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \
 -      || ((((c) & 0x00ffff00) \
 -	   == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) )
-+      || (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) )
++#define PCIINFOCLASSES(c) (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16))
  
  /*
   * PCI classes that have messages printed always.  The others are only
-@@ -341,6 +337,39 @@ restorePciBusState(BusAccPtr ptr)
+@@ -341,6 +335,39 @@ restorePciBusState(BusAccPtr ptr)
  }
  #undef MASKBITS
  
@@ -64,7 +66,7 @@ index 467a0c3..0d2d01c 100644
  
  /*
   * xf86Bus.c interface
-@@ -375,24 +404,31 @@ xf86PciProbe(void)
+@@ -375,24 +402,31 @@ xf86PciProbe(void)
  	}
      }
  
@@ -104,5 +106,5 @@ index 467a0c3..0d2d01c 100644
  	    }
  	}
 -- 
-1.6.1.3
+1.6.2.2
 




--- xserver-1.6.0-xinerama-crashes.patch DELETED ---


--- xserver-1.6.1-activate-device.patch DELETED ---


