Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (ac56de68aabfb0e54103398da8cd36eaef496fec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (ac56de68aabfb0e54103398da8cd36eaef496fec)
  • Date: Thu, 29 Mar 2012 07:45:05 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

libs/libdrm/DETAILS | 4
libs/libdrm/HISTORY | 3
xorg-driver/xf86-video-ati/DETAILS | 4
xorg-driver/xf86-video-ati/HISTORY | 5
xorg-driver/xf86-video-ati/PRE_BUILD | 2
xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch | 118
------------------
6 files changed, 12 insertions(+), 124 deletions(-)

New commits:
commit ac56de68aabfb0e54103398da8cd36eaef496fec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-ati: => 6.14.4

commit 91f2fc6a0e18bfcd8b5ec5ae54ba5338f8be925c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdrm: => 2.4.33

diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index 7393813..2fa1a0f 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -11,8 +11,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=2.4.32
-
SOURCE_HASH=sha512:a1558b7afff85f4a3768ab471c2b07f8c80ba0d3198b29ce228de25e6350ccc15561c536be853894c35f7fcc1e59b2cafca00ae4a36505364ad84e958901a5c4
+ VERSION=2.4.33
+
SOURCE_HASH=sha512:ac355bab87c87b8540218401f89ad16ece0e6fdd28d937e41e8a4765d7f9792798f7e74d27f3b57c49d1d8dd3909d6668e10b0139b1c35bbab5ab9002ff64c1e
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 02fbdb1..fb2a58f 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2012-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.33
+
2012-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.4.32

diff --git a/xorg-driver/xf86-video-ati/DETAILS
b/xorg-driver/xf86-video-ati/DETAILS
index 2303211..b362bde 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -11,8 +11,8 @@ if [[ $ATI_SCM == y ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
else
- VERSION=6.14.3
-
SOURCE_HASH=sha512:aa2bf48a88b83e5267c774c25014dee2dbf81e4e9c8390c4bae644d11c079fe8d12fedec47af369a5ede56326aa94c8d7d100de93e58b2332ff4a8728976e49f
+ VERSION=6.14.4
+
SOURCE_HASH=sha512:68913954607680e299cb798ff58cfdaf2381823778f85d18adf2701439cc1f954f92867c226b51830b3adf8c3967119a989b2e07ff3af7c7b4c043e784c8e078
SOURCE=${SPELL}-${VERSION}.tar.bz2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index 24ea791..7b28b02 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,8 @@
+2012-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS version 6.14.4
+ * PRE_BUILD: do not apply patch
+ * radeon_dri2-bug45937.patch: deleted
+
2012-03-06 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply radeon_dri2-bug45937.patch
* radeon_dri2-bug45937: Fix compilation with xorg-server 1.12.x
diff --git a/xorg-driver/xf86-video-ati/PRE_BUILD
b/xorg-driver/xf86-video-ati/PRE_BUILD
index 139ebbf..1803e6d 100755
--- a/xorg-driver/xf86-video-ati/PRE_BUILD
+++ b/xorg-driver/xf86-video-ati/PRE_BUILD
@@ -1,7 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < "${SPELL_DIRECTORY}"/radeon_dri2-bug45937.patch &&
-autoreconf &&

if [[ $ATI_SCM == y ]] ; then
sedit "s:.*configure.*::" autogen.sh &&
diff --git a/xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch
b/xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch
deleted file mode 100644
index 43fa945..0000000
--- a/xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-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



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (ac56de68aabfb0e54103398da8cd36eaef496fec), Treeve Jelbert, 03/29/2012

Archive powered by MHonArc 2.6.24.

Top of Page