Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (bed8c1e213e70feddeff87d501538c35317d149f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (bed8c1e213e70feddeff87d501538c35317d149f)
  • Date: Mon, 23 Mar 2015 13:34:06 -0500

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

audio-soft/meterbridge/HISTORY | 3 +++
audio-soft/meterbridge/PRE_BUILD | 8 +++++---
smgl/smgl-gl_select/DETAILS | 2 +-
smgl/smgl-gl_select/HISTORY | 5 +++++
smgl/smgl-gl_select/smgl-gl_select | 34 ++++++++++++++++++++--------------
5 files changed, 34 insertions(+), 18 deletions(-)

New commits:
commit bed8c1e213e70feddeff87d501538c35317d149f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

smgl-gl_select: version 2.0.5, do not link .la files

commit ad4b98995189ab4f5430d299e1ffd195989bdd7e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

meterbridge: more resolute autotools regeneration, fixing strange erratic
build failures

diff --git a/audio-soft/meterbridge/HISTORY b/audio-soft/meterbridge/HISTORY
index 8b04fb8..20ac8b6 100644
--- a/audio-soft/meterbridge/HISTORY
+++ b/audio-soft/meterbridge/HISTORY
@@ -1,3 +1,6 @@
+2015-03-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: use autoreconf -if, fixing erratic failures
+
2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, PRE_BUILD: run autoconf and friends to fix linker error
* binutils_gold.patch, PRE_BUILD: fix linker error
diff --git a/audio-soft/meterbridge/PRE_BUILD
b/audio-soft/meterbridge/PRE_BUILD
index 52337c1..686809e 100755
--- a/audio-soft/meterbridge/PRE_BUILD
+++ b/audio-soft/meterbridge/PRE_BUILD
@@ -5,6 +5,8 @@ patch -p1 < $SPELL_DIRECTORY/main.h.patch &&
patch -p1 < $SPELL_DIRECTORY/binutils_gold.patch &&
patch -p1 < $SPELL_DIRECTORY/meterbridge_0.9.2_iec_fix.patch &&

-autoconf -f &&
-aclocal --force &&
-automake -f --add-missing
+#Magically seems to fix strange erratic build errors (indicated
+# by missing run of
+# ./config.status --recheck
+# in configure and subsequent failure to find .deps/*.Po files).
+autoreconf -if
diff --git a/smgl/smgl-gl_select/DETAILS b/smgl/smgl-gl_select/DETAILS
index 5ddde33..4a76e00 100755
--- a/smgl/smgl-gl_select/DETAILS
+++ b/smgl/smgl-gl_select/DETAILS
@@ -1,5 +1,5 @@
SPELL=smgl-gl_select
- VERSION=2.0.4
+ VERSION=2.0.5
WEB_SITE=http://www.sourcemage.org
ENTERED=20061014
LICENSE[0]=GPL
diff --git a/smgl/smgl-gl_select/HISTORY b/smgl/smgl-gl_select/HISTORY
index af1d183..0d6cec7 100644
--- a/smgl/smgl-gl_select/HISTORY
+++ b/smgl/smgl-gl_select/HISTORY
@@ -1,3 +1,8 @@
+2015-03-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.0.5
+ * smgl-gl_select: Don't link .la files, avoiding hardwiring of
+ mesalib library paths (RPATH).
+
2015-03-19 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.0.4, now matching the script
* smgl-gl_select: really more silent, also link libEGL
diff --git a/smgl/smgl-gl_select/smgl-gl_select
b/smgl/smgl-gl_select/smgl-gl_select
index 95dc801..7da86d1 100755
--- a/smgl/smgl-gl_select/smgl-gl_select
+++ b/smgl/smgl-gl_select/smgl-gl_select
@@ -6,7 +6,7 @@
# Minor - new GL provider added/removed
# Point - bugfixes/filelist changes and so on
#
-GL_SELECT_VERSION="2.0.4"
+GL_SELECT_VERSION="2.0.5"
GL_LIBS="$(ls ${TRACK_ROOT}/usr/lib/.{mesa,nvidia,ati}/libGL.so 2>/dev/null \
| awk -F"/" '{print $4}')"
. /etc/sysconfig/gl_select
@@ -24,6 +24,12 @@ function gl_list() {
exit 0
}

+function gl_link_libs() {
+ fromdir=$1
+ todir=$2
+ ln -sf $(ls $fromdir/*.* | grep -v '.la$') $todir/ 2>/dev/null
+}
+
function gl_pick() {
local gl_lib=$1
local file_list="
@@ -70,38 +76,38 @@ function gl_pick() {
case "$1" in
ati)
[[ -e ${INSTALL_ROOT}${dir_list[0]}/libGL.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[0]}/* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
+ gl_link_libs ${INSTALL_ROOT}${dir_list[0]} \
+ ${INSTALL_ROOT}/usr/lib
[[ -e ${INSTALL_ROOT}${dir_list[3]}/gl.h ]] &&
ln -sf ${INSTALL_ROOT}${dir_list[3]}/* \
${INSTALL_ROOT}/usr/include/GL/ 2>/dev/null
[[ -e ${INSTALL_ROOT}${dir_list[6]}/libglx.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[6]}/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/ 2>/dev/null
+ gl_link_libs ${INSTALL_ROOT}${dir_list[6]} \
+ ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions
echo -n "."
;;
mesa)
[[ -e ${INSTALL_ROOT}${dir_list[2]}/libGL.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[2]}/* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
+ gl_link_libs ${INSTALL_ROOT}${dir_list[2]} \
+ ${INSTALL_ROOT}/usr/lib
[[ -e ${INSTALL_ROOT}${dir_list[5]}/gl.h ]] &&
ln -sf ${INSTALL_ROOT}${dir_list[5]}/* \
${INSTALL_ROOT}/usr/include/GL/ 2>/dev/null
[[ -e ${INSTALL_ROOT}${dir_list[8]}/libglx.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[8]}/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/ 2>/dev/null
+ gl_link_libs ${INSTALL_ROOT}${dir_list[8]} \
+ ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions
echo -n "."
;;
nvidia)
[[ -e ${INSTALL_ROOT}${dir_list[1]}/libGL.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[1]}/* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
+ gl_link_libs ${INSTALL_ROOT}${dir_list[1]} \
+ ${INSTALL_ROOT}/usr/lib
[[ -e ${INSTALL_ROOT}${dir_list[4]}/gl.h ]] &&
ln -sf ${INSTALL_ROOT}${dir_list[4]}/* \
${INSTALL_ROOT}/usr/include/GL/ 2>/dev/null
[[ -e ${INSTALL_ROOT}${dir_list[7]}/libglx.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[7]}/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/ 2>/dev/null
+ gl_link_libs ${INSTALL_ROOT}${dir_list[7]} \
+ ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions
echo -n "."
;;
*) message "Unknown secondary files so I only linked the libGL.so"
@@ -137,7 +143,7 @@ nvidia)

function gl_help() {
message "gl_select -$GL_SELECT_VERSION
-Copyright (C) 2006-2009 Source Mage
+Copyright (C) 2006-2015 Source Mage
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (bed8c1e213e70feddeff87d501538c35317d149f), Thomas Orgis, 03/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page