rpms/xorg-x11-server/devel .cvsignore, 1.80, 1.81 commitid, 1.38, 1.39 sources, 1.75, 1.76 xorg-x11-server.spec, 1.495, 1.496 xserver-1.6.1-nouveau.patch, 1.2, 1.3

Tue Feb 16 05:59:01 UTC 2010

Author: whot

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

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
	xserver-1.6.1-nouveau.patch 
Log Message:
* Tue Feb 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.901-1.2010208
- Update to today's git master (1.8RC1)
- xserver-1.7.4-reset-sli-pointers.patch: drop, upstream
- Enable udev config, drop hal.
- Require system-setup-keyboard (renamed fedora-setup-keyboard)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81

--- .cvsignore	8 Feb 2010 04:21:18 -0000	1.80
+++ .cvsignore	16 Feb 2010 05:59:00 -0000	1.81
@@ -1 +1 @@
-xorg-server-20100208.tar.xz
+xorg-server-20100215.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- commitid	8 Feb 2010 04:21:18 -0000	1.38
+++ commitid	16 Feb 2010 05:59:00 -0000	1.39
@@ -1 +1 @@
-db687f718f760ba254ab51994769db101dc9ca3a
+84905007702da2c05a4f7446b3fc5ff52be49655


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	8 Feb 2010 04:21:18 -0000	1.75
+++ sources	16 Feb 2010 05:59:01 -0000	1.76
@@ -1 +1 @@
-8af71bca675dcd60af9558de3fd26223  xorg-server-20100208.tar.xz
+5c195ebdbb8ff91e1e5cded32c4750ec  xorg-server-20100215.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- xorg-x11-server.spec	8 Feb 2010 04:21:18 -0000	1.495
+++ xorg-x11-server.spec	16 Feb 2010 05:59:01 -0000	1.496
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20100208
+%define gitdate 20100215
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.7.99.3
-Release:   3.%{gitdate}%{dist}
+Version:   1.7.99.901
+Release:   1.%{gitdate}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -35,6 +35,7 @@ Source2:   commitid
 Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 Source1:   gitignore
 %endif
+Source3:   00-evdev.conf
 
 Source10:   xserver.pamd
 
@@ -76,7 +77,6 @@ Patch6045: xserver-1.7.0-randr-gamma-res
 
 Patch6049: xserver-1.7.1-multilib.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
-Patch6052: xserver-1.7.4-reset-sli-pointers.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -124,7 +124,7 @@ BuildRequires: mesa-libGL-devel >= 7.6-0
 BuildRequires: libdrm-devel >= 2.4.0 kernel-headers
 
 BuildRequires: audit-libs-devel libselinux-devel >= 2.0.79-1
-BuildRequires: hal-devel dbus-devel
+BuildRequires: libudev-devel
 
 # All server subpackages have a virtual provide for the name of the server
 # they deliver.  The Xorg one is versioned, the others are intentionally
@@ -157,7 +157,7 @@ Requires: xorg-x11-drv-fbdev
 Requires: xorg-x11-drv-void xorg-x11-drv-evdev >= 2.1.0-3
 Requires: xorg-x11-server-common >= %{version}-%{release}
 Requires: libdrm >= 2.4.0
-Requires: fedora-setup-keyboard
+Requires: system-setup-keyboard
 # Dropped from F9 for being broken, uninstall it.
 Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8
 # Dropped from F11, use evdev instead
@@ -337,6 +337,7 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--enable-install-libxf86config \
 	--enable-xselinux --enable-record \
+	--enable-config-udev \
 	%{dri_flags} %{?bodhi_flags} \
 	${CONFIGURE}
         
@@ -356,6 +357,9 @@ install -m 0444 hw/xfree86/common/{vesa,
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+
 %endif
 
 # Make the source package
@@ -449,6 +453,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fbdevhw.4*
 %{_mandir}/man4/exa.4*
 %{_mandir}/man5/xorg.conf.5*
+%dir %{_sysconfdir}/xorg.conf.d
+%{_sysconfdir}/xorg.conf.d/00-evdev.conf
 %endif
 
 
@@ -505,6 +511,12 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Feb 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.901-1.2010208
+- Update to today's git master (1.8RC1)
+- xserver-1.7.4-reset-sli-pointers.patch: drop, upstream
+- Enable udev config, drop hal.
+- Require system-setup-keyboard (renamed fedora-setup-keyboard)
+
 * Mon Feb 08 2010 Ben Skeggs <bskeggs at redhat.com> 1.7.99.3-3.20100208
 - Update to today's git master
 

xserver-1.6.1-nouveau.patch:
 glx/glxdri.c                       |    7 +++++--
 glx/glxdri2.c                      |    7 +++++--
 hw/xfree86/common/xf86AutoConfig.c |   19 +++++++++++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

Index: xserver-1.6.1-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.1-nouveau.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.6.1-nouveau.patch	24 Aug 2009 05:05:49 -0000	1.2
+++ xserver-1.6.1-nouveau.patch	16 Feb 2010 05:59:01 -0000	1.3
@@ -1,20 +1,20 @@
-From b3872657c551d884141196cb098f53d3c01d1d3d Mon Sep 17 00:00:00 2001
+From 05c3ac7e882e0f46f908cc165f87d0e81399431d Mon Sep 17 00:00:00 2001
 From: Fedora X Ninjas <x at fedoraproject.org>
-Date: Tue, 23 Jun 2009 13:52:23 +1000
+Date: Tue, 16 Feb 2010 11:38:17 +1000
 Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs
 
 Also, don't treat DRI setup failure as an error for nouveau.
 ---
  glx/glxdri.c                       |    7 +++++--
  glx/glxdri2.c                      |    7 +++++--
- hw/xfree86/common/xf86AutoConfig.c |   27 ++++++++++++++++++++++++++-
- 3 files changed, 36 insertions(+), 5 deletions(-)
+ hw/xfree86/common/xf86AutoConfig.c |   18 +++++++++++++++++-
+ 3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/glx/glxdri.c b/glx/glxdri.c
-index 5fb75a4..45c79c9 100644
+index 21e44d1..30b820c 100644
 --- a/glx/glxdri.c
 +++ b/glx/glxdri.c
-@@ -967,6 +967,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
      const __DRIconfig **driConfigs;
      const __DRIextension **extensions;
      int i;
@@ -22,7 +22,7 @@ index 5fb75a4..45c79c9 100644
  
      if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
  	!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
-@@ -1046,7 +1047,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
      screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
      if (screen->driver == NULL) {
@@ -33,7 +33,7 @@ index 5fb75a4..45c79c9 100644
  		   filename, dlerror());
          goto handle_error;
      }
-@@ -1183,7 +1186,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
      xfree(screen);
  
@@ -43,10 +43,10 @@ index 5fb75a4..45c79c9 100644
      return NULL;
  }
 diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index 529b2df..ff4490b 100644
+index 0f998de..a244809 100644
 --- a/glx/glxdri2.c
 +++ b/glx/glxdri2.c
-@@ -587,6 +587,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
      const __DRIextension **extensions;
      const __DRIconfig **driConfigs;
      int i;
@@ -54,7 +54,7 @@ index 529b2df..ff4490b 100644
  
      screen = xcalloc(1, sizeof *screen);
      if (screen == NULL)
-@@ -613,7 +614,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
      screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
      if (screen->driver == NULL) {
@@ -65,7 +65,7 @@ index 529b2df..ff4490b 100644
  		   filename, dlerror());
          goto handle_error;
      }
-@@ -692,7 +695,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
      xfree(screen);
  
@@ -75,10 +75,10 @@ index 529b2df..ff4490b 100644
      return NULL;
  }
 diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index bc4c80b..d8fa80f 100644
+index 7f4ada8..369101c 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -180,7 +180,23 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -192,7 +192,23 @@ videoPtrToDriverList(struct pci_device *dev,
  	    break;
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
@@ -101,8 +101,8 @@ index bc4c80b..d8fa80f 100644
 +	    }
 +	    break;
  	case 0x1106:		    driverList[0] = "openchrome"; break;
+         case 0x1b36:		    driverList[0] = "qxl"; break;
  	case 0x1163:		    driverList[0] = "rendition"; break;
- 	case 0x5333:
 -- 
-1.6.2.2
+1.6.6.1
 

