Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d)

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 master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d)
  • Date: Sat, 18 Apr 2009 15:34:07 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

xorg-driver/xf86-input-synaptics/DETAILS |
5
xorg-driver/xf86-input-synaptics/HISTORY |
3
xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.1.0.tar.bz2.sig
|binary
xorg-proto/randrproto/DETAILS |
5
xorg-proto/randrproto/HISTORY |
3
xorg-proto/randrproto/randrproto-1.3.0.tar.bz2.sig
|binary
xorg-xserver/xorg-server/CONFIGURE |
7
xorg-xserver/xorg-server/DETAILS |
5
xorg-xserver/xorg-server/HISTORY |
14 -
xorg-xserver/xorg-server/PRE_BUILD |
9
xorg-xserver/xorg-server/gl_select.patch |
48 ++---
xorg-xserver/xorg-server/gnome.patch |
93 ----------
xorg-xserver/xorg-server/xorg-server-mesa.patch |
10 -
13 files changed, 46 insertions(+), 156 deletions(-)

New commits:
commit 5d08b0e631f1f78f5c2074ba1216f2d045f19a9d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-input-synaptics: Updated to 1.1.0

Cherry-picked from 79c2603cbd95d275a970efc79ce1a16c9c30884b in
devel-xorg-modular

commit 9bd3c56915a9695ce6a547d571bfd7d398b19b84
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

randrproto: Updated to 1.3.0

Cherry picked from f7832cd0bc0586fd91af126ae75a84839b490254 in
devel-xorg-modular

commit a374fd404c0e409139b99075d1667a4bba9ce5b2
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: updated to 1.6.1

Cherry-picked from 6eaaad23a5f81b323107c9d7101538c04c303e6b in
devel-xorg-modular

commit 817b8e4a6b77b0cbad23105df83094a0d4662903
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "xorg-server: apply patch to fix gnome 2.26 CPU usage issue"

This reverts commit e133365645aeb649de515f86dba23cb6298753c0.

Preparing for 1.6.1 which already has this fix

Conflicts:

xorg-xserver/xorg-server/gnome.patch

commit 1235e2e91f5a9d716b51b4f18b31a8b3cac89607
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "xorg-server: apply patch to fix gnome 2.26 CPU usage issue"

This reverts commit e133365645aeb649de515f86dba23cb6298753c0.

Prepare for 1.6.1 which already has this fix

Conflicts:

xorg-xserver/xorg-server/HISTORY
xorg-xserver/xorg-server/gnome.patch

commit be36e498c71b4972bdc7c6092e696916d6248341
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "xorg-server: Don't apply gnome.patch twice"

This reverts commit 9fdf819360f42527be84ac2e2d1ea2c43f212319.

Preparing for xorg 1.6.1 which already has this fix.

diff --git a/xorg-driver/xf86-input-synaptics/DETAILS
b/xorg-driver/xf86-input-synaptics/DETAILS
index e615406..1fcf6ea 100755
--- a/xorg-driver/xf86-input-synaptics/DETAILS
+++ b/xorg-driver/xf86-input-synaptics/DETAILS
@@ -1,8 +1,9 @@
SPELL=xf86-input-synaptics
- VERSION=0.15.2
+ VERSION=1.1.0
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/archive/individual/driver/$SOURCE
-
SOURCE_HASH=sha512:f2e853dfb13c2ebb63693c508b303153876089081c26e674a92b36d8489f649811c9c431a48301f2527641294b293272e10a0a8c6d60c4e06059919cd2afd33a
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+#
SOURCE_HASH=sha512:0fc34332957f56fccae35133d0f6096378d80679a12ff54c7414425a36777e2574f8087ea754493afb1148f725a5b5eb95ed512e4b93699d169de45a22ae16f5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://xorg.freedesktop.org/
LICENSE[0]=XCL
diff --git a/xorg-driver/xf86-input-synaptics/HISTORY
b/xorg-driver/xf86-input-synaptics/HISTORY
index 3ec2659..89c9457 100644
--- a/xorg-driver/xf86-input-synaptics/HISTORY
+++ b/xorg-driver/xf86-input-synaptics/HISTORY
@@ -1,3 +1,6 @@
+2009-03-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.0
+
2008-09-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.15.2

diff --git
a/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.1.0.tar.bz2.sig
b/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.1.0.tar.bz2.sig
new file mode 100644
index 0000000..9ce6190
Binary files /dev/null and
b/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.1.0.tar.bz2.sig
differ
diff --git a/xorg-proto/randrproto/DETAILS b/xorg-proto/randrproto/DETAILS
index c41b6ad..3d596cc 100755
--- a/xorg-proto/randrproto/DETAILS
+++ b/xorg-proto/randrproto/DETAILS
@@ -1,10 +1,11 @@
SPELL=randrproto
- VERSION=1.2.2
+ VERSION=1.3.0
XORG_VER=X11R7.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/proto/${SOURCE}
-
SOURCE_HASH=sha512:ad988a40eeb99fc70a096a06a1a1fcf4c5b823ef714e6163e17b8405641cc8d3485623f3e15ad9c645ea9484e07c3a4173dbfad74ae1432ea62b7d5a030ab44e
+#
SOURCE_HASH=sha512:063e42b7ff79f382ce0b5953203ee5863d52b4e70cb3f269befe2ec908bab7a3615e06bf2d67f1700657233b9cf87d89d38a2f8b80fc65b172dda06e3d178de6
LICENSE[0]=XCL
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051124
diff --git a/xorg-proto/randrproto/HISTORY b/xorg-proto/randrproto/HISTORY
index 3489c53..062ad68 100644
--- a/xorg-proto/randrproto/HISTORY
+++ b/xorg-proto/randrproto/HISTORY
@@ -1,3 +1,6 @@
+2009-03-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.3.0
+
2008-08-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.2.2

diff --git a/xorg-proto/randrproto/randrproto-1.3.0.tar.bz2.sig
b/xorg-proto/randrproto/randrproto-1.3.0.tar.bz2.sig
new file mode 100644
index 0000000..63575eb
Binary files /dev/null and
b/xorg-proto/randrproto/randrproto-1.3.0.tar.bz2.sig differ
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index ba2bb5e..033414f 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -362,10 +362,5 @@ config_query_multi XORG_SERVER_VIDEO_DRIVER_OBSCURE
\
xf86-video-suncg14 \
xf86-video-newport \
xf86-video-rendition \
- xf86-video-siliconmotion
&&
+ xf86-video-siliconmotion

-config_query_option XORG_SERVER_MESA_PATH_PATCH \
- "Apply patch to search for extra mesalib include files?"\
- n \
- "t" \
- ""
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 3f92370..84208a0 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,12 +1,11 @@
SPELL=xorg-server
- VERSION=1.5.3
+ VERSION=1.6.1
VERSION2=7.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=MesaLib-$VERSION2.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
SOURCE2_URL[0]=$SOURCEFORGE_URL/mesa3d/$SOURCE2
-
SOURCE_HASH=sha512:dd8b7a172e620c48db3f4f3e310c46f13d006f5e9cfc67872bf949a7f7929c9bd8a6999d2200a9dede4afdbea98f4acc7aad5f4a39b9e1ac10a38d8551234635
-#
SOURCE2_HASH=sha512:1adca91525b4118f1953aeea0d469b01d82035009c34d8f5966f39c72622f2b1f7f1475ba2d0edfc99ac080165a102e6efe99bf7a9893df24fee2aec1a3939b6
+
SOURCE_HASH=sha512:debd35fb83683b8442e314997733606bfaf5b78d46120848ed18a8e9948092d023a0a3d2b97b6bbe16ca99bbf39d7ce95f2c8cfb4d833414e3f030550c79039c
SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_DIRECTORY="$BUILD_DIRECTORY/Mesa-$VERSION2"
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 2698a25..dd97dc6 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,12 +1,8 @@
-2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
- * PRE_BUILD: Don't apply gnome.patch twice
-
-2009-04-18 Robin Cook <rcook AT wyrms.net>
- * gnome.patch: copy correct patch file
-
-2009-04-17 Robin Cook <rcook AT wyrms.net>
- * PRE_BUILD: apply patch to fix gnome 2.26 cpu issue bug #573472
-
http://cgit.freedesktop.org/xorg/xserver/commit/?id=1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
+2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.6.1
+ * xorg-server-mesa.patch: removed
+ * PRE_BUILD: removed the patch
+ * gl_select.patch: updated

2009-04-01 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated MesaLib to 7.4
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 03db7ae..71d22f8 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -3,11 +3,4 @@ default_pre_build &&
glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
unpack_file 2 &&
-patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
-if [[ "$XORG_SERVER_MESA_PATH_PATCH" == "t" ]] ; then
- patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch" &&
- # according to lynx^3 this is necessary
- sed -i 's,drm.h,drm/&,' Mesa-7.4/include/GL/internal/dri_interface.h
-fi &&
-patch -p1 < "$SPELL_DIRECTORY/evdev-flush.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/gnome.patch"
+patch -p0 < $SPELL_DIRECTORY/gl_select.patch
diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index 4f21bc9..c4f688a 100644
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -1,30 +1,32 @@
-diff -Nuar xorg-server-1.5.3.orig.orig/hw/xfree86/dixmods/Makefile.in
xorg-server-1.5.3.orig/hw/xfree86/dixmods/Makefile.in
---- xorg-server-1.5.3.orig.orig/hw/xfree86/dixmods/Makefile.in 2009-02-08
22:58:50.000000000 +0000
-+++ xorg-server-1.5.3.orig/hw/xfree86/dixmods/Makefile.in 2009-02-08
23:49:07.000000000 +0000
-@@ -519,7 +519,6 @@
+diff -Nuar hw.orig/xfree86/dixmods/Makefile.in hw/xfree86/dixmods/Makefile.in
+--- hw.orig/xfree86/dixmods/Makefile.in 2009-04-15 17:22:15.000000000
+0200
++++ hw/xfree86/dixmods/Makefile.in 2009-04-15 17:24:00.000000000 +0200
+@@ -427,8 +427,7 @@
+
extsmoduledir = $(moduledir)/extensions
extsmodule_LTLIBRARIES = $(RECORDMOD) \
- $(DBEMOD) \
-- $(GLXMODS) \
- $(XTRAPMOD)
+- $(DBEMOD) \
+- $(GLXMODS)
++ $(DBEMOD)

- fontsmoduledir = $(moduledir)/fonts
-@@ -612,6 +610,14 @@
+ AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
+ INCLUDES = @XORG_INCS@ \
+@@ -500,6 +499,14 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
-+ $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)/mesa"
++ $(mkdir_p) "$(DESTDIR)$(extsmoduledir)/mesa"
+ @lst='$(GLXMODS)'; for r in $$lst; do \
-+ if test -f $$r; then \
-+ h=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/$$h'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$r"
"$(DESTDIR)$(extsmoduledir)/mesa/$$h"; \
-+ else :; fi; \
++ if test -f $$r; then \
++ h=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/$$h'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$r"
"$(DESTDIR)$(extsmoduledir)/mesa/$$h"; \
++ else :; fi; \
+ done
+ test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
@list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
-@@ -990,7 +1004,7 @@
+@@ -834,7 +841,7 @@
done
check-am: all-am
check: check-recursive
@@ -32,11 +34,11 @@ diff -Nuar
xorg-server-1.5.3.orig.orig/hw/xfree86/dixmods/Makefile.in xorg-serve
+all-am: Makefile $(LTLIBRARIES) $(GLXMODS)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(extsmoduledir)" "$(DESTDIR)$(fontsmoduledir)"
"$(DESTDIR)$(moduledir)"; do \
-diff -Nuar xorg-server-1.5.3.orig.orig/hw/xfree86/dri/Makefile.in
xorg-server-1.5.3.orig/hw/xfree86/dri/Makefile.in
---- xorg-server-1.5.3.orig.orig/hw/xfree86/dri/Makefile.in 2009-02-08
22:58:50.000000000 +0000
-+++ xorg-server-1.5.3.orig/hw/xfree86/dri/Makefile.in 2009-02-08
22:59:46.000000000 +0000
-@@ -408,7 +408,7 @@
+ for dir in "$(DESTDIR)$(extsmoduledir)" "$(DESTDIR)$(moduledir)"; do \
+diff -Nuar hw.orig/xfree86/dri/Makefile.in hw/xfree86/dri/Makefile.in
+--- hw.orig/xfree86/dri/Makefile.in 2009-04-15 17:22:15.000000000 +0200
++++ hw/xfree86/dri/Makefile.in 2009-04-15 17:22:48.000000000 +0200
+@@ -377,7 +377,7 @@
@GL_CFLAGS@

libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
diff --git a/xorg-xserver/xorg-server/gnome.patch
b/xorg-xserver/xorg-server/gnome.patch
deleted file mode 100644
index 02fd1d1..0000000
--- a/xorg-xserver/xorg-server/gnome.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/Xext/sync.c b/Xext/sync.c
-index 88fc03d..d9e66b3 100644
---- a/Xext/sync.c
-+++ b/Xext/sync.c
-@@ -2281,7 +2281,7 @@ SyncInitServerTime(void)
- * IDLETIME implementation
- */
-
--static pointer IdleTimeCounter;
-+static SyncCounter *IdleTimeCounter;
- static XSyncValue *pIdleTimeValueLess;
- static XSyncValue *pIdleTimeValueGreater;
-
-@@ -2293,38 +2293,69 @@ IdleTimeQueryValue (pointer pCounter, CARD64
*pValue_return)
- }
-
- static void
--IdleTimeBlockHandler (pointer env,
-- struct timeval **wt,
-- pointer LastSelectMask)
-+IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer
LastSelectMask)
- {
-- XSyncValue idle;
-+ XSyncValue idle, old_idle;
-+ SyncTriggerList *list = IdleTimeCounter->pTriglist;
-+ SyncTrigger *trig;
-
- if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
- return;
-
-+ old_idle = IdleTimeCounter->value;
- IdleTimeQueryValue (NULL, &idle);
-+ IdleTimeCounter->value = idle; /* push, so CheckTrigger works */
-
- if (pIdleTimeValueLess &&
- XSyncValueLessOrEqual (idle, *pIdleTimeValueLess))
- {
-- AdjustWaitForDelay (wt, 0);
-+ /*
-+ * We've been idle for less than the threshold value, and someone
-+ * wants to know about that, but now we need to know whether they
-+ * want level or edge trigger. Check the trigger list against the
-+ * current idle time, and if any succeed, bomb out of select()
-+ * immediately so we can reschedule.
-+ */
-+
-+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-+ trig = list->pTrigger;
-+ if (trig->CheckTrigger(trig, old_idle)) {
-+ AdjustWaitForDelay(wt, 0);
-+ break;
-+ }
-+ }
- }
- else if (pIdleTimeValueGreater)
- {
-- unsigned long timeout = 0;
-+ /*
-+ * There's a threshold in the positive direction. If we've been
-+ * idle less than it, schedule a wakeup for sometime in the future.
-+ * If we've been idle more than it, and someone wants to know about
-+ * that level-triggered, schedule an immediate wakeup.
-+ */
-+ unsigned long timeout = -1;
-
-- if (XSyncValueLessThan (idle, *pIdleTimeValueGreater))
-- {
-+ if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) {
- XSyncValue value;
- Bool overflow;
-
- XSyncValueSubtract (&value, *pIdleTimeValueGreater,
- idle, &overflow);
-- timeout = XSyncValueLow32 (value);
-+ timeout = min(timeout, XSyncValueLow32 (value));
-+ } else {
-+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-+ trig = list->pTrigger;
-+ if (trig->CheckTrigger(trig, old_idle)) {
-+ timeout = min(timeout, 0);
-+ break;
-+ }
-+ }
- }
-
- AdjustWaitForDelay (wt, timeout);
- }
-+
-+ IdleTimeCounter->value = old_idle; /* pop */
- }
-
- static void
-
diff --git a/xorg-xserver/xorg-server/xorg-server-mesa.patch
b/xorg-xserver/xorg-server/xorg-server-mesa.patch
deleted file mode 100644
index 467cff7..0000000
--- a/xorg-xserver/xorg-server/xorg-server-mesa.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glx/Makefile.in.orig 2009-01-18 09:40:02.000000000 -0600
-+++ glx/Makefile.in 2009-01-18 09:40:46.000000000 -0600
-@@ -413,6 +413,7 @@
- -I$(top_srcdir)/hw/xfree86/common \
- -I$(top_srcdir)/hw/xfree86/dri \
- -I$(top_srcdir)/hw/xfree86/dri2 \
-+ -I@MESA_SOURCE@/include \
- -I$(top_srcdir)/mi
-
- glapi_sources = \




Archive powered by MHonArc 2.6.24.

Top of Page