Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (4761525dfe762484bda1ca0ea0c63797f7128ee0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (4761525dfe762484bda1ca0ea0c63797f7128ee0)
  • Date: Sat, 18 Apr 2009 23:33:29 +0200 (CEST)

:2009-04-18T15:49:Eric Sandall:


This patch is completely UNRELATED to the MesaLib sources so please
revert this back. Else this is broken.

> GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
>
> xorg-xserver/xorg-server/gl_select.patch | 49
> -----------------------
> 8 files changed, 5 insertions(+), 101 deletions(-)
>
> + * gl_select.patch: Removed
> +
> -glselect mesa &&
> -cd "$SOURCE_DIRECTORY" &&
> -unpack_file 2 &&
> -patch -p0 < $SPELL_DIRECTORY/gl_select.patch
> +++ /dev/null
> diff --git a/xorg-xserver/xorg-server/gl_select.patch
> b/xorg-xserver/xorg-server/gl_select.patch
> deleted file mode 100644
> index c4f688a..0000000
> --- a/xorg-xserver/xorg-server/gl_select.patch
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -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 \

--
Andraž ruskie Levstik
Source Mage GNU/Linux Games/Xorg grimoire guru
Geek/Hacker/Tinker

Quis custodiet ipsos custodies.


Archive powered by MHonArc 2.6.24.

Top of Page