[xorg-x11-server] server 1.12.99.902

[Dave Airlie]

commit 598252427efe6026a240b5e56f615492084a26c1
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 18 03:35:25 2012 -0400

    server 1.12.99.902

 .gitignore                              |    1 +
 commitid                                |    2 +-
 sources                                 |    2 +-
 xorg-x11-server.spec                    |   21 +--
 xserver-1.12-modesetting-fallback.patch |   32 -----
 xserver-1.12.2-xorg-touch-test.patch    |   13 +-
 xserver-1.6.0-displayfd.patch           |  203 -------------------------------
 xserver-fix-pci-slot-claims.patch       |  143 ----------------------
 8 files changed, 17 insertions(+), 400 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 995843a..9645991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-1.12.1.tar.bz2
 /xorg-server-1.12.2.tar.bz2
 /xorg-server-1.12.3.tar.bz2
+/xorg-server-20120717.tar.xz
diff --git a/commitid b/commitid
index 2c5bd89..220e259 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-d53235af85d50774c68347720ce132daf9a5bc49
+77de2994774e7be24a0bad521180628feb1027c6
diff --git a/sources b/sources
index f382ffb..6937562 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65a53b11bc01dcc97ee9b201dc620c32  xorg-server-1.12.3.tar.bz2
+961bb1ecade0ade9a4f0c04be063142c  xorg-server-20120717.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 4530285..f522904 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 # check out the master branch, pull, cherry-pick, and push.  FIXME describe
 # rebasing, add convenience 'make' targets maybe.
 
-#define gitdate 20120215
+%define gitdate 20120717
 %define stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -19,9 +19,9 @@
 
 %define ansic_major 0
 %define ansic_minor 4
-%define videodrv_major 12
+%define videodrv_major 13
 %define videodrv_minor 0
-%define xinput_major 16
+%define xinput_major 18
 %define xinput_minor 0
 %define extension_major 6
 %define extension_minor 0
@@ -47,7 +47,7 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.12.3
+Version:   1.12.99.902
 Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
@@ -91,7 +91,6 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.patch
 Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
 
 # ajax needs to upstream this
-Patch6027: xserver-1.6.0-displayfd.patch
 Patch6030: xserver-1.6.99-right-of.patch
 #Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 
@@ -99,10 +98,6 @@ Patch6030: xserver-1.6.99-right-of.patch
 # RedHat/Fedora-specific patch
 Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
 
-# backport pci slot claiming fix for kms drivers
-Patch7015: xserver-fix-pci-slot-claims.patch
-# backport modesetting fallback driver
-Patch7016: xserver-1.12-modesetting-fallback.patch
 # needed when building without xorg (aka s390x)
 Patch7017: xserver-1.12.2-xorg-touch-test.patch
 
@@ -495,11 +490,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/xorg/modules/drivers
 %dir %{_libdir}/xorg/modules/extensions
 %{_libdir}/xorg/modules/extensions/libglx.so
-%{_libdir}/xorg/modules/extensions/libdri.so
-%{_libdir}/xorg/modules/extensions/libdri2.so
-%{_libdir}/xorg/modules/extensions/libdbe.so
-%{_libdir}/xorg/modules/extensions/libextmod.so
-%{_libdir}/xorg/modules/extensions/librecord.so
 %dir %{_libdir}/xorg/modules/input
 %{_libdir}/xorg/modules/libfbdevhw.so
 %{_libdir}/xorg/modules/libexa.so
@@ -581,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 1.12.99.902-1
+- server 1.12.99.902
+
 * Mon Jul 09 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.12.3-1
 - server 1.12.3
 
diff --git a/xserver-1.12.2-xorg-touch-test.patch b/xserver-1.12.2-xorg-touch-test.patch
index fb4adad..b3daca5 100644
--- a/xserver-1.12.2-xorg-touch-test.patch
+++ b/xserver-1.12.2-xorg-touch-test.patch
@@ -1,14 +1,15 @@
-From ed61aafc4e2b2856955528ba8142075ce53d6dd9 Mon Sep 17 00:00:00 2001
-From: Dan Horák <dan at danny.cz>
+From cb26473121e35fed89050f1514bb37aa48b452ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
 Date: Fri, 15 Jun 2012 06:25:58 -0400
 Subject: [PATCH] build the touch test only when building Xorg
 
+Signed-off-by: Fedora X Ninjas <x at fedoraproject.org>
 ---
  test/Makefile.am |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/test/Makefile.am b/test/Makefile.am
-index 32be00d..93a102a 100644
+index aa018c9..b323a40 100644
 --- a/test/Makefile.am
 +++ b/test/Makefile.am
 @@ -1,11 +1,11 @@
@@ -20,11 +21,11 @@ index 32be00d..93a102a 100644
  # Tests that require at least some DDX functions in order to fully link
  # For now, requires xf86 ddx, could be adjusted to use another
  SUBDIRS += xi2
--noinst_PROGRAMS += xkb input xtest misc fixes xfree86
-+noinst_PROGRAMS += xkb input xtest misc fixes xfree86 touch
+-noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging
++noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
  endif
  check_LTLIBRARIES = libxservertest.la
  
 -- 
-1.7.10.2
+1.7.10.4