diff --git a/.gitignore b/.gitignore index ee78f41..b4e6cac 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ xorg-server-1.9.1.tar.bz2 /xorg-server-1.13.0.tar.bz2 /xorg-server-1.13.1.tar.bz2 /xorg-server-20130109.tar.xz +/xorg-server-20130215.tar.xz diff --git a/0001-protocol-versions-Bump-minor-version-of-XI.patch b/0001-protocol-versions-Bump-minor-version-of-XI.patch deleted file mode 100644 index 73926de..0000000 --- a/0001-protocol-versions-Bump-minor-version-of-XI.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fcf7973d1b1e3ee6b418b2953d41422f643c0c82 Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" -Date: Wed, 23 Jan 2013 18:11:55 +0000 -Subject: [PATCH] protocol-versions: Bump minor version of XI - -This was accidentally excluded when we added barriers. ---- - include/protocol-versions.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/protocol-versions.h b/include/protocol-versions.h -index cb8e213..10f5117 100644 ---- a/include/protocol-versions.h -+++ b/include/protocol-versions.h -@@ -127,7 +127,7 @@ - - /* X Input */ - #define SERVER_XI_MAJOR_VERSION 2 --#define SERVER_XI_MINOR_VERSION 2 -+#define SERVER_XI_MINOR_VERSION 3 - - /* XKB */ - #define SERVER_XKB_MAJOR_VERSION 1 --- -1.8.1 - diff --git a/commitid b/commitid index a440709..e493f49 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -6703a7c7cf1a349c137e247a0c8eb462ff7b07be +90642948cc78834d95f7a3bddaac7ff77b68ed7e diff --git a/sources b/sources index 67e1d7a..43f929c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7dd5a129fbadfd36fbb6d812e67236e5 xorg-server-20130109.tar.xz +56777b1f9d3342eaf5c37c61b9adc6ba xorg-server-20130215.tar.xz diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 284bdc4..67fe461 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -8,7 +8,7 @@ # format, and add a PatchN: line. If you want to push something upstream, # check out the master branch, pull, cherry-pick, and push. -%global gitdate 20130109 +%global gitdate 20130215 %global stable_abi 0 %if !0%{?gitdate} || %{stable_abi} @@ -16,10 +16,10 @@ # source because rpm is a terrible language. %global ansic_major 0 %global ansic_minor 4 -%global videodrv_major 13 +%global videodrv_major 14 %global videodrv_minor 1 -%global xinput_major 18 -%global xinput_minor 0 +%global xinput_major 19 +%global xinput_minor 1 %global extension_major 7 %global extension_minor 0 %endif @@ -41,8 +41,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.13.99.901 -Release: 5%{?gitdate:.%{gitdate}}%{dist} +Version: 1.13.99.902 +Release: 1%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -109,8 +109,6 @@ Patch7065: 0001-xfree86-hotplug-cleanup-properly-if-the-screen-fails.patch Patch7066: 0001-xf86crtc-don-t-use-display-for-vx-vy-for-gpu-screens.patch # autoconfig: send events Patch7067: 0001-autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch -# http://patchwork.freedesktop.org/patch/12922/mbox/ -Patch7068: 0001-protocol-versions-Bump-minor-version-of-XI.patch %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri @@ -584,6 +582,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Fri Feb 15 2013 Peter Hutterer 1.13.99.902-1 +- xserver 1.14RC2 from git + * Thu Feb 14 2013 Peter Hutterer 1.13.99.901-5 - Fix scrolling for Evoluent Vertical Mouse 3 (#612140#c20)