[SM-Commit] GIT changes to master grimoire by Andraž Levstik (d9afde34785ec2e6bf85a52bd98530db296848d8)

Andraž Levstik scm at sourcemage.org
Sat Feb 7 19:00:35 EST 2009


GIT changes to master grimoire by Andraž Levstik <ruskie at codemages.net>:

 xorg-xserver/xorg-server/FINAL     |    2 ++
 xorg-xserver/xorg-server/HISTORY   |    3 ++-
 xorg-xserver/xorg-server/PRE_BUILD |    2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d9afde34785ec2e6bf85a52bd98530db296848d8
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    xorg-server: fix for building xorg-server

diff --git a/xorg-xserver/xorg-server/FINAL b/xorg-xserver/xorg-server/FINAL
index ebd3868..7f15ec3 100755
--- a/xorg-xserver/xorg-server/FINAL
+++ b/xorg-xserver/xorg-server/FINAL
@@ -9,3 +9,5 @@ message "${MESSAGE_COLOR}If your mouse or keyboard stop working, then add\n"  \
         "Section \"ServerFlags\"\n"                                           \
         "  Option  \"AllowEmptyInput\"       \"false\"\n"                     \
         "EndSection${DEFAULT_COLOR}"
+# switch back to default provider
+smgl-gl_select -d
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index e20db06..425b30f 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,8 +1,9 @@
 2009-02-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* PRE_BUILD: added smgl-gl_select patch
+	* PRE_BUILD: added smgl-gl_select patch, and run it before building
 	* DEPENDS: added smgl-gl_select
 	* gl_select.patch: patch to modify some installation paths
 	* DETAILS: patchlevel++
+	* FINAL: run smgl-gl_select -d
 
 2009-01-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DEPENDS: no more XPrint
diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD
index 02f4164..bad81d6 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build &&
+# required to build
+smgl-gl_select -s mesa  &&
 cd "$SOURCE_DIRECTORY" &&
 unpack_file 2 &&
 patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&



More information about the SM-Commit mailing list