Skip to Content.
Sympa Menu

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

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 (bff9cf9376515e2149b8ab5522eabec6ee12b666)
  • Date: Sat, 18 Apr 2009 16:47:43 -0500

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

xorg-xserver/xorg-server/HISTORY | 1
xorg-xserver/xorg-server/PRE_BUILD | 4 +-
xorg-xserver/xorg-server/gl_select.patch | 49
+++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 2 deletions(-)

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

xorg-server: MesaLib source is no longer required during build

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

Revert "xorg-server: MesaLib source is no longer required during build"

This reverts commit 4834954d7ab7e13a2fc15909cfa923bdc56f878f.

Apparently gl_select.patch is "for installation of libdri.so and
libglx.so to the right spots"

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 585a669..1076deb 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,6 +1,5 @@
2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, BUILD, PRE_BUILD: MesaLib source is no longer required at
build
- * gl_select.patch: Removed

2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.6.1
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index bd52acb..7ce2187 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
# required to build
-glselect mesa
+glselect mesa &&
+cd "$SOURCE_DIRECTORY" &&
+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
new file mode 100644
index 0000000..c4f688a
--- /dev/null
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -0,0 +1,49 @@
+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)
++ $(DBEMOD)
+
+ 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)
++ $(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; \
++ done
+ test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
+ @list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+@@ -834,7 +841,7 @@
+ done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(LTLIBRARIES)
++all-am: Makefile $(LTLIBRARIES) $(GLXMODS)
+ 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 Eric Sandall (bff9cf9376515e2149b8ab5522eabec6ee12b666), Eric Sandall, 04/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page