Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (b823641bf7dbc3526e9b3c3c99a5688bdaac0379)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (b823641bf7dbc3526e9b3c3c99a5688bdaac0379)
  • Date: Fri, 11 Aug 2006 02:47:46 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

audio-creation/vkeybd/DEPENDS | 5 +++--
audio-creation/vkeybd/HISTORY | 4 ++++
audio-creation/vkeybd/PRE_BUILD | 13 +++++++++++++
3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit b823641bf7dbc3526e9b3c3c99a5688bdaac0379
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

vkeybd: Support xorg-modular + use $TRACK_ROOT.

diff --git a/audio-creation/vkeybd/DEPENDS b/audio-creation/vkeybd/DEPENDS
index f70d3eb..954495a 100755
--- a/audio-creation/vkeybd/DEPENDS
+++ b/audio-creation/vkeybd/DEPENDS
@@ -1,5 +1,6 @@
-depends tcl &&
-depends tk &&
+depends X11-LIBS &&
+depends tcl &&
+depends tk &&

if [[ $USE_ALSA == y ]]; then
depends alsa-lib
diff --git a/audio-creation/vkeybd/HISTORY b/audio-creation/vkeybd/HISTORY
index 8ec9fea..d4a2f5c 100644
--- a/audio-creation/vkeybd/HISTORY
+++ b/audio-creation/vkeybd/HISTORY
@@ -1,3 +1,7 @@
+2006-08-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Added depends X11-LIBS.
+ * PRE_BUILD: Fix dirs for xorg-modular, insert $TRACK_ROOT.
+
2006-08-10 Juuso Alasuutari <iuso AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY,
INSTALL, PRE_BUILD: created spell
diff --git a/audio-creation/vkeybd/PRE_BUILD b/audio-creation/vkeybd/PRE_BUILD
index e6ca947..f103e19 100755
--- a/audio-creation/vkeybd/PRE_BUILD
+++ b/audio-creation/vkeybd/PRE_BUILD
@@ -11,6 +11,19 @@ # Make sure tcl version is correct
local TCL_VERSION=$(installed_version tcl | cut -d. -f-2) &&
sedit "s/TCL_VERSION = .*/TCL_VERSION = $TCL_VERSION/" Makefile &&

+# Fix for xorg 7.x and insert $TRACK_ROOT
+if check_if_xorg_modular_libs; then
+ sedit "s:XLIB = .*:XLIB = -L${TRACK_ROOT}/usr/lib -lX11:" \
+ Makefile &&
+ sedit "s:XINC = .*:XINC = -I${TRACK_ROOT}/usr/include:" \
+ Makefile
+else
+ sedit "s:XLIB = .*:XLIB = -L${TRACK_ROOT}/usr/X11R6/lib -lX11:" \
+ Makefile &&
+ sedit "s:XINC = .*:XINC = -I${TRACK_ROOT}/usr/X11R6/include:" \
+ Makefile
+fi
+
# Apply config settings
if [[ $USE_AWE == n ]]; then
sedit "s/USE_AWE =.*/USE_AWE = 0/" Makefile



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (b823641bf7dbc3526e9b3c3c99a5688bdaac0379), Juuso Alasuutari, 08/11/2006

Archive powered by MHonArc 2.6.24.

Top of Page