- up to 1.6.2

Changed files:
    xorg-xserver-server-build.patch -> 1.2
    xorg-xserver-server-dri.patch -> 1.2
    xorg-xserver-server.spec -> 1.190

diff --git a/xorg-xserver-server-build.patch b/xorg-xserver-server-build.patch
deleted file mode 100644 (file)
index ab47b3d..0000000
--- a/xorg-xserver-server-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xorg-server-1.6.1.902/hw/xfree86/common/Makefile.am~       2009-06-29 23:07:32.000000000 +0200
-+++ xorg-server-1.6.1.902/hw/xfree86/common/Makefile.am        2009-06-30 08:32:35.758318463 +0200
-@@ -47,7 +47,7 @@
-               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
-               xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
-               $(XVSDKINCS) xorgVersion.h \
--              xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
-+              xf86sbusBus.h xf86xvpriv.h
- 
- DISTCLEANFILES = xf86Build.h
- CLEANFILES = $(BUILT_SOURCES)
---- xorg-server-1.6.1.902/hw/xfree86/parser/Makefile.am~       2009-06-30 08:34:09.558724639 +0200
-+++ xorg-server-1.6.1.902/hw/xfree86/parser/Makefile.am        2009-06-30 08:37:41.372535747 +0200
-@@ -35,6 +35,4 @@
-       xf86tokens.h
- 
- sdk_HEADERS = \
--      $(LIBHEADERS) \
--      xf86Parser.h \
--      xf86Optrec.h
-+      $(LIBHEADERS)

diff --git a/xorg-xserver-server-dri.patch b/xorg-xserver-server-dri.patch
deleted file mode 100644 (file)
index 5dcd429..0000000
--- a/xorg-xserver-server-dri.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xorg-server-1.6.1.902/glx/glxdri2.c~       2009-06-29 23:10:40.000000000 +0200
-+++ xorg-server-1.6.1.902/glx/glxdri2.c        2009-06-30 08:26:31.188770402 +0200
-@@ -222,12 +222,15 @@
-     if (texBuffer == NULL)
-         return Success;
- 
-+#if __DRI_TEX_BUFFER_VERSION >= 2
-     if (texBuffer->base.version >= 2 && texBuffer->setTexBuffer2 != NULL) {
-       (*texBuffer->setTexBuffer2)(context->driContext,
-                                   glxPixmap->target,
-                                   glxPixmap->format,
-                                   drawable->driDrawable);
--    } else {
-+    } else
-+#endif
-+    {
-       texBuffer->setTexBuffer(context->driContext,
-                               glxPixmap->target,
-                               drawable->driDrawable);

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 5c5e78571f9eeaada08628db5edf83a56e9cd53a..a254d0e3b365da5ef592d4b03d0d9803860406c9 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -17,12 +17,12 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.6.1.902
-Release:       0.1%{?with_multigl:.mgl}
+Version:       1.6.2
+Release:       1%{?with_multigl:.mgl}
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 43de544c9b8b0c1d927f3e45f294211d
+# Source0-md5: 37641d0899df8a9c4a6284586d932b8d
 Source2:       xserver.pamd
 Patch0:                %{name}-xwrapper.patch
 Patch1:                %{name}-pic-libxf86config.patch
@@ -30,8 +30,6 @@ Patch2:               %{name}-fb-size.patch
 Patch3:                %{name}-exa.patch
 Patch5:                %{name}-xinerama-cursors.patch
 Patch6:                %{name}-less-acpi-brokenness.patch
-Patch7:                %{name}-dri.patch
-Patch8:                %{name}-build.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.3
 # for glx headers
@@ -327,8 +325,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h