- up to 6.14.4

Changed files:
    vgahw.patch -> 1.2
    xorg-driver-video-ati.spec -> 1.89
    xorg_list.patch -> 1.2

diff --git a/vgahw.patch b/vgahw.patch
deleted file mode 100644 (file)
index de0ad40..0000000
--- a/vgahw.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0a8d04eeac95f4db9d03ee31070bd825a7feb0b2 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Sun, 01 Jan 2012 17:27:54 +0000
-Subject: Update for new vgaHW API.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
-Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
----
-diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index a9abd66..81f5645 100644
---- a/src/radeon_driver.c
-+++ b/src/radeon_driver.c
-@@ -3131,8 +3131,10 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
-     } else
-            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAAccess option set to FALSE,"
-                       " VGA module load skipped\n");
--    if (info->VGAAccess)
-+    if (info->VGAAccess) {
-+      vgaHWSetStdFuncs(VGAHWPTR(pScrn));
-         vgaHWGetIOBase(VGAHWPTR(pScrn));
-+    }
- #endif
- 
- 
---
-cgit v0.9.0.2-2-gbebe

diff --git a/xorg-driver-video-ati.spec b/xorg-driver-video-ati.spec
index b3f2b5bf401260849d5a77e0d525c292478815c7..7ef9bff3dad74824bbc9708180f5caea52d9797c 100644 (file)
--- a/xorg-driver-video-ati.spec
+++ b/xorg-driver-video-ati.spec
@@ -1,19 +1,17 @@
 Summary:       X.org video drivers for ATI Radeon adapters
 Summary(pl.UTF-8):     Sterowniki obrazu X.org do kart graficznych ATI Radeon
 Name:          xorg-driver-video-ati
-Version:       6.14.3
-Release:       3
+Version:       6.14.4
+Release:       1
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-%{version}.tar.bz2
-# Source0-md5: 19126c8421a05d9605883dcf7498d876
-Patch0:                xorg_list.patch
-Patch1:                vgahw.patch
+# Source0-md5: 17dd4f0bf4dbe9839e5f7d1161994222
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
-BuildRequires: libdrm-devel >= 2.2
+BuildRequires: libdrm-devel >= 2.4.33
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: rpmbuild(macros) >= 1.389
@@ -28,6 +26,7 @@ BuildRequires:        xorg-proto-xf86driproto-devel
 BuildRequires: xorg-util-util-macros >= 1.8
 BuildRequires: xorg-xserver-server-devel >= 1.6.2
 %{?requires_xorg_xserver_videodrv}
+Requires:      libdrm >= 2.4.33
 Requires:      xorg-xserver-libdri >= 1.6.2
 Requires:      xorg-xserver-libglx >= 1.6.2
 Requires:      xorg-xserver-server >= 1.6.2
@@ -142,8 +141,6 @@ graficzne PCI i AGP oparte na następujących układach ATI:
 
 %prep
 %setup -q -n xf86-video-ati-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}

diff --git a/xorg_list.patch b/xorg_list.patch
deleted file mode 100644 (file)
index 43fa945..0000000
--- a/xorg_list.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From c66ae235700f5efe64eb168327551b8f1d153c9c Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel.daenzer@amd.com>
-Date: Mon, 13 Feb 2012 09:43:58 +0000
-Subject: Handle new xorg_list API.
-
-Fixes https://bugs.freedesktop.org/show_bug.cgi?id=45937
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/configure.ac b/configure.ac
-index 29f129a..0083325 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,10 +234,18 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-             [#include "xorg-server.h"])
- 
- AC_CHECK_HEADERS([list.h],
--               [], [],
-+               [have_list_h="yes"], [have_list_h="no"],
-                [#include <X11/Xdefs.h>
-                 #include "xorg-server.h"])
- 
-+if test "x$have_list_h" = xyes; then
-+    AC_CHECK_DECL(xorg_list_init,
-+                [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [],
-+                [#include <X11/Xdefs.h>
-+                 #include "xorg-server.h"
-+                 #include "list.h"])
-+fi
-+
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
- AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
-diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
-index 835575f..cf905a1 100644
---- a/src/radeon_dri2.c
-+++ b/src/radeon_dri2.c
-@@ -40,6 +40,13 @@
- 
- #if HAVE_LIST_H
- #include "list.h"
-+#if !HAVE_XORG_LIST
-+#define xorg_list                     list
-+#define xorg_list_init                        list_init
-+#define xorg_list_add                 list_add
-+#define xorg_list_del                 list_del
-+#define xorg_list_for_each_entry      list_for_each_entry
-+#endif
- #endif
- 
- #ifdef RADEON_DRI2
-@@ -515,11 +522,11 @@ typedef struct _DRI2FrameEvent {
- 
-     Bool valid;
- 
--    struct list link;
-+    struct xorg_list link;
- } DRI2FrameEventRec, *DRI2FrameEventPtr;
- 
- typedef struct _DRI2ClientEvents {
--    struct list   reference_list;
-+    struct xorg_list   reference_list;
- } DRI2ClientEventsRec, *DRI2ClientEventsPtr;
- 
- #if HAS_DEVPRIVATEKEYREC
-@@ -538,7 +545,7 @@ DevPrivateKey DRI2ClientEventsPrivateKey = &DRI2ClientEventsPrivateKeyIndex;
-     dixLookupPrivate(&(pClient)->devPrivates, DRI2ClientEventsPrivateKey))
- 
- static int
--ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
-+ListAddDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
- {
-     DRI2ClientEventsPtr pClientPriv;
-     pClientPriv = GetDRI2ClientEvents(client);
-@@ -547,12 +554,12 @@ ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
-         return BadAlloc;
-     }
- 
--    list_add(entry, &pClientPriv->reference_list);
-+    xorg_list_add(entry, &pClientPriv->reference_list);
-     return 0;
- }
- 
- static void
--ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
-+ListDelDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
- {
-     DRI2ClientEventsPtr pClientPriv;
-     pClientPriv = GetDRI2ClientEvents(client);
-@@ -560,7 +567,7 @@ ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
-     if (!pClientPriv) {
-         return;
-     }
--    list_del(entry);
-+    xorg_list_del(entry);
- }
- 
- static void
-@@ -574,7 +581,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
- 
-     switch (pClient->clientState) {
-     case ClientStateInitial:
--        list_init(&pClientEventsPriv->reference_list);
-+        xorg_list_init(&pClientEventsPriv->reference_list);
-         break;
-     case ClientStateRunning:
-         break;
-@@ -582,7 +589,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
-     case ClientStateRetained:
-     case ClientStateGone:
-         if (pClientEventsPriv) {
--            list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
-+            xorg_list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
-                 ref->valid = FALSE;
-             }
-         }
---
-cgit v0.9.0.2-2-gbebe