packages: xorg-driver-video-ati/xorg-driver-video-ati.spec, xorg-driver-vid...
wiget
wiget at pld-linux.org
Mon Mar 5 13:01:20 CET 2012
Author: wiget Date: Mon Mar 5 12:01:20 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- patches for xorg-xserver 1.12.0
- rel. 3
---- Files affected:
packages/xorg-driver-video-ati:
xorg-driver-video-ati.spec (1.87 -> 1.88) , vgahw.patch (NONE -> 1.1) (NEW), xorg_list.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-ati/xorg-driver-video-ati.spec
diff -u packages/xorg-driver-video-ati/xorg-driver-video-ati.spec:1.87 packages/xorg-driver-video-ati/xorg-driver-video-ati.spec:1.88
--- packages/xorg-driver-video-ati/xorg-driver-video-ati.spec:1.87 Mon Mar 5 07:25:55 2012
+++ packages/xorg-driver-video-ati/xorg-driver-video-ati.spec Mon Mar 5 13:01:15 2012
@@ -3,11 +3,13 @@
Summary(pl.UTF-8): Sterowniki obrazu X.org do kart graficznych ATI Radeon
Name: xorg-driver-video-ati
Version: 6.14.3
-Release: 2
+Release: 3
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
URL: http://xorg.freedesktop.org/
BuildRequires: Mesa-libGL-devel
BuildRequires: autoconf >= 2.60
@@ -141,6 +143,8 @@
%prep
%setup -q -n xf86-video-ati-%{version}
+%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -180,6 +184,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.88 2012/03/05 12:01:15 wiget
+- patches for xorg-xserver 1.12.0
+- rel. 3
+
Revision 1.87 2012/03/05 06:25:55 arekm
- release 2
================================================================
Index: packages/xorg-driver-video-ati/vgahw.patch
diff -u /dev/null packages/xorg-driver-video-ati/vgahw.patch:1.1
--- /dev/null Mon Mar 5 13:01:20 2012
+++ packages/xorg-driver-video-ati/vgahw.patch Mon Mar 5 13:01:15 2012
@@ -0,0 +1,27 @@
+From 0a8d04eeac95f4db9d03ee31070bd825a7feb0b2 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb at laas.fr>
+Date: Sun, 01 Jan 2012 17:27:54 +0000
+Subject: Update for new vgaHW API.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>
+Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
+Signed-off-by: Alex Deucher <alexdeucher at 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
================================================================
Index: packages/xorg-driver-video-ati/xorg_list.patch
diff -u /dev/null packages/xorg-driver-video-ati/xorg_list.patch:1.1
--- /dev/null Mon Mar 5 13:01:21 2012
+++ packages/xorg-driver-video-ati/xorg_list.patch Mon Mar 5 13:01:15 2012
@@ -0,0 +1,118 @@
+From c66ae235700f5efe64eb168327551b8f1d153c9c Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer at 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 at 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-ati/xorg-driver-video-ati.spec?r1=1.87&r2=1.88&f=u
More information about the pld-cvs-commit
mailing list