Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (5c42910349404b3490eaf78b0d0dd9c7bf9f0d3e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (5c42910349404b3490eaf78b0d0dd9c7bf9f0d3e)
  • Date: Mon, 28 May 2012 04:24:33 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

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

New commits:
commit 5c42910349404b3490eaf78b0d0dd9c7bf9f0d3e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xorg-server: => 1.12.1.902

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index f52d7f6..a8ae07a 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -12,6 +12,9 @@ CXXFLAGS="${CXXFLAGS/-O2/-O0}"
CFLAGS="${CFLAGS/-O3/-O0}"
CXXFLAGS="${CXXFLAGS/-O3/-O0}"
fi &&
+if [[ $(installed_version gcc) == "4.7.0" ]] ; then
+ CFLAGS+=" -Wno-error=array-bounds"
+fi &&
OPTS="${XORG_SERVER_OPTS} \
--with-xkb-output=$TRACK_ROOT/var/lib/xkb \
--with-dri-driver-path=$TRACK_ROOT/usr/lib/dri \
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index af34fd8..aa99095 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.12.1
-
SOURCE_HASH=sha512:a1ea1617bf101d2865543014d0d5a672a96dbe7e258c71107a2b43d8e3d9eb8f97cf05e890ef0ff448b647a3a70461b4306e865cef22f530609c89fa01e36eec
+ VERSION=1.12.1.902
+
SOURCE_HASH=sha512:2e7a8d5a2e243a6e6e8d65b95e778dd54f55033f4c9da49e83a4ed57d48eda7967fc002301217e8d38c02f9fb32c9d66e0f3a10ec2f17e0a15a7af0a55ffeb1f
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 1312fe4..d45c478 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+2012-05-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.12.1.902
+ * gl_select.patch: updtae pathc
+ * BUILD: suppress errors with gcc-4.7.0
+
2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.1

diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index 6dd4a59..44a2950 100755
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -12,7 +12,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 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ $(mkdir_p) "$(DESTDIR)$(extsmoduledir)/.mesa"
@@ -23,8 +23,8 @@ 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)'; for p in $$list; do \
+ @list='$(extsmodule_LTLIBRARIES)'; test -n "$(extsmoduledir)" ||
list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
@@ -834,7 +841,7 @@
done



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (5c42910349404b3490eaf78b0d0dd9c7bf9f0d3e), Treeve Jelbert, 05/28/2012

Archive powered by MHonArc 2.6.24.

Top of Page