Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (e1dd92bf457ca5d880ba18f3243af9bc7cef86c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (e1dd92bf457ca5d880ba18f3243af9bc7cef86c7)
  • Date: Wed, 11 Jul 2012 22:07:30 -0500

GIT changes to devel-xorg-modular grimoire by Ladislav Hagara <hgr AT vabo.cz>:

xorg-xserver/xorg-server/DETAILS | 4 ++--
xorg-xserver/xorg-server/HISTORY | 4 ++++
xorg-xserver/xorg-server/gl_select.patch | 20 ++++++++++----------
3 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit e1dd92bf457ca5d880ba18f3243af9bc7cef86c7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

xorg-server 1.12.3

diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index fcde1e5..d1d8a75 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.12.2
-
SOURCE_HASH=sha512:28cc392b9183d0586cac40d349a8390bc90a240fceac689bd6a00a315c9d3ab115c37d3b283c892652f53106190707d1d74bacf256a1543741f555310a7c1ca1
+ VERSION=1.12.3
+
SOURCE_HASH=sha512:8fa3b55a5032ec02f525656f0081aca2d2320a1d9351bae89bc70209883f88da3c264d7b4e688c89f863fb5a3a661adbfc833c1352298e7ef4e39d73177f6b5f
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 6919ab4..06563f3 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.3
+ * gl_select.patch: updated
+
2012-05-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.12.2

diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
old mode 100755
new mode 100644
index 44a2950..bec9231
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -1,7 +1,7 @@
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 @@
+--- hw.orig/xfree86/dixmods/Makefile.in 2012-07-11 14:37:32.000000000
+0200
++++ hw/xfree86/dixmods/Makefile.in 2012-07-11 14:50:12.000000000 +0200
+@@ -548,8 +548,7 @@

extsmoduledir = $(moduledir)/extensions
extsmodule_LTLIBRARIES = $(RECORDMOD) \
@@ -11,7 +11,7 @@ diff -Nuar hw.orig/xfree86/dixmods/Makefile.in
hw/xfree86/dixmods/Makefile.in

AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \
-@@ -500,6 +499,14 @@
+@@ -621,6 +620,14 @@
$(am__aclocal_m4_deps):
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -23,10 +23,10 @@ diff -Nuar hw.orig/xfree86/dixmods/Makefile.in
hw/xfree86/dixmods/Makefile.in
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(INSTALL) $(INSTALL_STRIP_FLAG) $$r "$(DESTDIR)$(extsmoduledir)/.mesa/"; \
+ else :; fi; \
+ done
+ test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
@list='$(extsmodule_LTLIBRARIES)'; test -n "$(extsmoduledir)" ||
list=; \
list2=; for p in $$list; do \
- if test -f $$p; then \
-@@ -834,7 +841,7 @@
+@@ -983,7 +990,7 @@
done
check-am: all-am
check: check-recursive
@@ -36,10 +36,10 @@ diff -Nuar hw.orig/xfree86/dixmods/Makefile.in
hw/xfree86/dixmods/Makefile.in
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@
+--- hw.orig/xfree86/dri/Makefile.in 2012-07-11 14:37:32.000000000 +0200
++++ hw/xfree86/dri/Makefile.in 2012-07-11 14:51:13.000000000 +0200
+@@ -468,7 +468,7 @@
+ @DRI_CFLAGS@

libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
-libdri_ladir = $(moduledir)/extensions



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (e1dd92bf457ca5d880ba18f3243af9bc7cef86c7), Ladislav Hagara, 07/11/2012

Archive powered by MHonArc 2.6.24.

Top of Page