Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.29 grimoire by Arwed von Merkatz (55fc6ee8d1aeb76c1d8533639aaba6bd96b58a24)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.29 grimoire by Arwed von Merkatz (55fc6ee8d1aeb76c1d8533639aaba6bd96b58a24)
  • Date: Mon, 26 Jan 2009 11:43:30 -0600

GIT changes to stable-0.29 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

ChangeLog | 4 ++++
FUNCTIONS | 15 ---------------
VERSION | 2 +-
xorg-xserver/xorg-server/CONFIGURE | 8 +++++++-
xorg-xserver/xorg-server/HISTORY | 4 ++++
xorg-xserver/xorg-server/PRE_BUILD | 4 +++-
6 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 55fc6ee8d1aeb76c1d8533639aaba6bd96b58a24
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION: 0.29-1

commit 68de77638b6a83b3d362fc8aab8c5fc4a6c66cfd
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xorg-server: made mesa header path patch optional
(cherry picked from commit 23d238f863e383287b0c526ab9bef3ac54b2cff1)

commit 4a92d06bf6eebe9cce49534b8b31f50787b9a2e9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

FUNCTIONS: Removed simple form duplicate get_kernel_version()
Should fix Bug #10771

diff --git a/ChangeLog b/ChangeLog
index 27834a9..eba0358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-23 Eric Sandall <sandalle AT sourcemage.org>
+ * FUNCTIONS: Removed simple form duplicate get_kernel_version()
+ Should fix Bug #10771
+
2009-01-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* python-pypi/pyxmpp: new spell, python xmpp library
* python-pypi/jcl: new spell, python jabber component library
diff --git a/FUNCTIONS b/FUNCTIONS
index 44bf5e9..24bc4d4 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -575,21 +575,6 @@ function get_sorcery_kernel_version()
installed_version linux || echo "-1"
}

-#-------------------------------------------------------------------------
-## Print the version of the kernel defined in USE_KERNEL_VERSION or,
-## lacking that, the version of either the installed linux spell or the
-## running kernel.
-#-------------------------------------------------------------------------
-function get_kernel_version()
-{
- if [[ $USE_KERNEL_VERSION ]]
- then
- echo "$USE_KERNEL_VERSION"
- else
- installed_version linux || get_running_kernel_version
- fi
-}
-
#-----------------------------------------------------------------------
## Print the kernel config status of the running kernel for the option
## defined in $1.
diff --git a/VERSION b/VERSION
index 2b0c5b5..ec3e61c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.29-0
+0.29-1
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index c008a67..38f0eef 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -374,4 +374,10 @@ config_query_multi XORG_SERVER_VIDEO_DRIVER_OBSCURE
\
xf86-video-suncg14 \
xf86-video-newport \
xf86-video-rendition \
- xf86-video-siliconmotion
+ xf86-video-siliconmotion
&&
+
+config_query_option XORG_SERVER_MESA_PATH_PATCH \
+ "Apply patch to search for extra mesalib include files?"\
+ n \
+ "t" \
+ ""
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index c98a757..764a746 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2009-01-20 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * CONFIGURE, PRE_BUILD: made George's patch optional because it
+ broke compilation for me.
+
2009-01-18 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added patch
* xorg-server-mesa.patch: Added patch to fix Bug #14937
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 89094b4..016f982 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -3,5 +3,7 @@ cd "$SOURCE_DIRECTORY" &&
unpack_file 2 &&

#patch -p0 < "$SPELL_DIRECTORY/randr.patch"
-patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch"
+if [[ "$XORG_SERVER_MESA_PATH_PATCH" == "t" ]] ; then
+ patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch"
+fi &&
patch -p1 < "$SPELL_DIRECTORY/evdev-flush.patch"



  • [SM-Commit] GIT changes to stable-0.29 grimoire by Arwed von Merkatz (55fc6ee8d1aeb76c1d8533639aaba6bd96b58a24), Arwed von Merkatz, 01/26/2009

Archive powered by MHonArc 2.6.24.

Top of Page