Skip to Content.
Sympa Menu

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

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 (28d25d9b4dee9c7e8f1e58157cdc065dceba35b3)
  • Date: Mon, 27 Aug 2012 07:13:24 -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 | 18 +++++++++---------
3 files changed, 15 insertions(+), 11 deletions(-)

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

xorg-server 1.12.4

diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index d1d8a75..887be83 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.12.3
-
SOURCE_HASH=sha512:8fa3b55a5032ec02f525656f0081aca2d2320a1d9351bae89bc70209883f88da3c264d7b4e688c89f863fb5a3a661adbfc833c1352298e7ef4e39d73177f6b5f
+ VERSION=1.12.4
+
SOURCE_HASH=sha512:70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85
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 07ddc24..96efdec 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2012-08-27 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.4
+ * gl_select.patch: updated
+
2012-07-13 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: generalise fix for gcc-4.7.x

diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index bec9231..c52f575 100644
--- 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 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 @@
+--- hw.orig/xfree86/dixmods/Makefile.in 2012-08-27 07:12:00.000000000
+0200
++++ hw/xfree86/dixmods/Makefile.in 2012-08-27 13:36:52.000000000 +0200
+@@ -579,8 +579,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@ \
-@@ -621,6 +620,14 @@
+@@ -652,6 +651,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 \
-@@ -983,7 +990,7 @@
+ if test -f $$p; then \
+@@ -1010,7 +1017,7 @@
done
check-am: all-am
check: check-recursive
@@ -36,9 +36,9 @@ 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 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 @@
+--- hw.orig/xfree86/dri/Makefile.in 2012-08-27 07:12:00.000000000 +0200
++++ hw/xfree86/dri/Makefile.in 2012-08-27 13:21:05.000000000 +0200
+@@ -498,7 +498,7 @@
@DRI_CFLAGS@

libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (28d25d9b4dee9c7e8f1e58157cdc065dceba35b3), Ladislav Hagara, 08/27/2012

Archive powered by MHonArc 2.6.24.

Top of Page