[SM-Commit] GIT changes to master grimoire by Thomas Orgis (f4a0e81a71e08792e539c2b7de5bff9b620a40d1)

Thomas Orgis scm at sourcemage.org
Tue Dec 4 16:36:34 EST 2007


GIT changes to master grimoire by Thomas Orgis <sobukus at sourcemage.org>:

 audio-drivers/jack/HISTORY     |    3 +++
 audio-drivers/jack/PRE_BUILD   |    3 ++-
 graphics-libs/freeglut/DEPENDS |    4 ++++
 graphics-libs/freeglut/HISTORY |    3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit f4a0e81a71e08792e539c2b7de5bff9b620a40d1
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    jack: no lib64 ... always use $PREFIX/usr/lib

commit 12a5109cdd2aa671cc946307d589896120e81e49
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    freeglut: modular X dep on libxdamage

diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index ef43953..5a0a71a 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,6 @@
+2007-12-04 Thomas Orgis <sobukus at sourcemage.org>
+	* PRE_BUILD: no lib64!
+
 2007-07-01 Juuso Alasuutari <iuso at sourcemage.org>
 	* CONFIGURE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: Changed
 	  the time patch option to only apply to the stable version
diff --git a/audio-drivers/jack/PRE_BUILD b/audio-drivers/jack/PRE_BUILD
index 7522f85..11bf72a 100755
--- a/audio-drivers/jack/PRE_BUILD
+++ b/audio-drivers/jack/PRE_BUILD
@@ -7,4 +7,5 @@ then
 elif [[ $JACK_TIME == y ]]
 then
   patch -p1 < "$SCRIPT_DIRECTORY/jack_time.patch"
-fi
+fi &&
+sedit 's/libnn=lib64/libnn=lib/' configure
diff --git a/graphics-libs/freeglut/DEPENDS b/graphics-libs/freeglut/DEPENDS
index 60b32a7..a5c0f00 100755
--- a/graphics-libs/freeglut/DEPENDS
+++ b/graphics-libs/freeglut/DEPENDS
@@ -2,6 +2,10 @@ depends  libtool  &&
 depends  automake  &&
 depends  autoconf  &&
 depends  X11-LIBS  &&
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
+  depends libxdamage
+fi &&
 depends  OPENGL  &&
 
 optional_depends  "libpng"                    \
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index 1c1dd8f..6ff9b8a 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,6 @@
+2007-09-05 Thomas Orgis <sobukus at sourcemage.org>
+	* DEPENDS: depend on libxdamage for modular xorg
+
 2006-10-15 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* TRIGGERS: removed, not necessary #13089
 



More information about the SM-Commit mailing list