Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (31d415ed8bfd3cce04564300258c3ba6e56fa782)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (31d415ed8bfd3cce04564300258c3ba6e56fa782)
  • Date: Thu, 17 Dec 2009 17:10:25 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

xorg-xserver/xorg-server/DETAILS | 2 +-
xorg-xserver/xorg-server/HISTORY | 5 -----
xorg-xserver/xorg-server/gl_select.patch | 12 ++++++++++++
3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 31d415ed8bfd3cce04564300258c3ba6e56fa782
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "xorg-server: corrected gl_select.patch for searching libglx.so
only in extensions dir"

This reverts commit f61d70e82f8c3d230ca6b0c5e9caeee3e68743ef.

This is a problem of 1.7.3

diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 24cd219..9387d58 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -9,7 +9,7 @@
ENTERED=20051125
LICENSE[0]=XCL
SECURITY_PATCH=4
- PATCHLEVEL=2
+ PATCHLEVEL=1
SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)"
cat << EOF
X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx), the core of the X
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 590aabc..68fc5a4 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,8 +1,3 @@
-2009-12-18 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: PATCHLEVEL+=1
- * gl_select.patch: make X search in /usr/lib/xorg/extensions dir only
- while looking for libglx.so
-
2009-12-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: fixed the ati driver name and changed the nvidia one to
the provider - NVIDIA
diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index 262d6fa..db24e5c 100755
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -35,3 +35,15 @@ diff -Nuar hw.orig/xfree86/dixmods/Makefile.in
hw/xfree86/dixmods/Makefile.in
installdirs: installdirs-recursive
installdirs-am:
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@
+-libdri_ladir = $(moduledir)/extensions
++libdri_ladir = $(moduledir)/extensions/mesa
+ libdri_la_SOURCES = \
+ dri.c \
+ dri.h \



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (31d415ed8bfd3cce04564300258c3ba6e56fa782), Vlad Glagolev, 12/17/2009

Archive powered by MHonArc 2.6.24.

Top of Page