Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (118e7b86b73809c4c0a960ecacd085f32cee2007)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (118e7b86b73809c4c0a960ecacd085f32cee2007)
  • Date: Tue, 6 Mar 2012 19:46:58 -0600

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

mail/dspam/BUILD | 9 -
mail/dspam/CONFIGURE | 16 +-
mail/dspam/DEPENDS | 5
mail/dspam/HISTORY | 7 +
xorg-driver/xf86-video-ati/HISTORY | 4
xorg-driver/xf86-video-ati/PRE_BUILD | 9 -
xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch | 118
++++++++++++++++++
7 files changed, 149 insertions(+), 19 deletions(-)

New commits:
commit 118e7b86b73809c4c0a960ecacd085f32cee2007
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-ati: Fix compilation with xorg-server 1.12.x

commit 94b875876f13783c47f7b54484b6a838ae5a0890
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dspam: corrected several issues

diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index 9ad3fc1..24147d4 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -16,9 +16,6 @@ STORAGE_DRIVERS='hash_drv' &&
if is_depends_enabled $SPELL sqlite ; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"
fi &&
-if is_depends_enabled $SPELL db ; then
-STORAGE_DRIVERS="$STORAGE_DRIVERS,libdb4_drv"
-fi &&
if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv"
fi &&
@@ -28,9 +25,9 @@ fi &&
OPTS="--with-storage-driver=$STORAGE_DRIVERS $OPTS" &&

case "$DSPAM_SCALE" in
- "none") OPTS="--disable-large-scale --disable-domain-scale" ;;
- "Large Scale") OPTS="$OPTS --enable-large-scale --disable-domain-scale" ;;
- "Domain Scale") OPTS="$OPTS --enable-domain-scale --disable-large-scale" ;;
+ "None") OPTS="--disable-large-scale --disable-domain-scale $OPTS" ;;
+ "Large Scale") OPTS="--enable-large-scale --disable-domain-scale $OPTS" ;;
+ "Domain Scale") OPTS="--enable-domain-scale --disable-large-scale $OPTS" ;;
esac &&

default_build
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 1c492cc..e6d0aa0 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -32,18 +32,24 @@ config_query_option DSPAM_OPTS 'Enable long usernames?
(defaults to system lengt
'--enable-long-usernames' \
'--disable-long-usernames' &&

-config_query_option DSPAM_OPTS 'Enable home directory filesystem storage
driver?' n \
- '--enable-homedir' \
- '--disable-homedir' &&
-
config_query_option DSPAM_OPTS 'Enable performance profiling?' n \
'--enable-profiling' \
'--disable-profiling' &&

-config_query_list DSPAM_SCALE 'Select a filesystem organization method:'\
+config_query_list DSPAM_SCALE 'Select a filesystem organization method:' \
'None' \
'Domain Scale' \
'Large Scale' &&
+
+if [[ $DSPAM_SCALE == None ]]; then
+ config_query_option DSPAM_OPTS 'Enable home directory filesystem storage
driver?' n \
+ '--enable-homedir' \
+ '--disable-homedir'
+else
+ list_add "DSPAM_OPTS" "--disable-homedir" &&
+ list_remove "DSPAM_OPTS" "--enable-homedir"
+fi &&
+
# the next 2 queries use the previous spell defaults instead of the upstream
# default, to make sure the spell does not disrupt anything
config_query_string DSPAM_HOME 'which home directory for dspam?'
'/var/spool/dspam'
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index ac3b72f..0b97eba 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -3,11 +3,6 @@ optional_depends MAIL-TRANSPORT-AGENT \
'' \
'Enable delivery agent support' &&

-optional_depends db \
- '' \
- '' \
- 'Enable DB storage driver' &&
-
optional_depends sqlite \
'' \
'' \
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index b509864..c847fcc 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,10 @@
+2012-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: corrected typo ('none' -> 'None'), fixed OPTS joining; moved
+ OPTS to the end of lines; removed deprecated db4 driver
+ * DEPENDS: dropped deprecated db dependency
+ * CONFIGURE: resolved conflict with home-dir vs. large || domain
scale,
+ fixes build with specific setups
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index 6cdf443..24ea791 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,7 @@
+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
+
2011-11-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS version 6.14.3

diff --git a/xorg-driver/xf86-video-ati/PRE_BUILD
b/xorg-driver/xf86-video-ati/PRE_BUILD
index ecc94ad..139ebbf 100755
--- a/xorg-driver/xf86-video-ati/PRE_BUILD
+++ b/xorg-driver/xf86-video-ati/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
-if [[ $ATI_SCM == y ]] ; then
cd $SOURCE_DIRECTORY &&
-sedit "s:.*configure.*::" autogen.sh &&
-./autogen.sh
+patch -p1 < "${SPELL_DIRECTORY}"/radeon_dri2-bug45937.patch &&
+autoreconf &&
+
+if [[ $ATI_SCM == y ]] ; then
+ sedit "s:.*configure.*::" autogen.sh &&
+ ./autogen.sh
fi
diff --git a/xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch
b/xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch
new file mode 100644
index 0000000..43fa945
--- /dev/null
+++ b/xorg-driver/xf86-video-ati/radeon_dri2-bug45937.patch
@@ -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



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (118e7b86b73809c4c0a960ecacd085f32cee2007), Eric Sandall, 03/06/2012

Archive powered by MHonArc 2.6.24.

Top of Page