Skip to Content.
Sympa Menu

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

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 (a7dc593acb1050287772909d73b2e1da6b70ff30)
  • Date: Tue, 5 May 2015 03:07:26 -0500

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

ChangeLog | 6 ++
glselect.function | 109
+--------------------------------------
graphics-libs/mesalib/DEPENDS | 1
graphics-libs/mesalib/FINAL | 1
graphics-libs/mesalib/HISTORY | 4 +
libs/openscenegraph/DEPENDS | 1
libs/openscenegraph/HISTORY | 3 +
video/mpv/DEPENDS | 2
video/mpv/HISTORY | 3 +
xorg-xserver/xorg-server/DEPENDS | 1
xorg-xserver/xorg-server/HISTORY | 3 +
11 files changed, 27 insertions(+), 107 deletions(-)

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

glselect.function: just call smgl-gl_select

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

xorg-server: depends smgl-gl_select

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

mpv: properly depend on smgl-gl_select

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

openscenegraph: depend on smgl-gl_select

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

mesalib: depend on smgl-gl_select and actually select GL in FINAL

diff --git a/ChangeLog b/ChangeLog
index a35f283..1c62844 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * glselect.function: Call out to smgl-gl_select to avoid
+ code duplication; spells having to depend on that
+ Spells might call smgl-gl_select in future and this function
+ might be removed.
+
2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/python-pgpdump: new spell, version 1.5

diff --git a/glselect.function b/glselect.function
index b2dddd5..1e7cb21 100755
--- a/glselect.function
+++ b/glselect.function
@@ -1,6 +1,7 @@
#---
## glselect - select default libGL provider
## rewritten from smgl-gl_select
+## then modified to call the latter instead, duplication == BAD
##
## this is run in FINAL and will always set the provider
## based on the final spell cast that calls this.
@@ -10,110 +11,6 @@
#---

function glselect(){
- local file_list="
- /usr/lib/libGL.so
- /usr/lib/libGL.so.*
- /usr/lib/xorg/modules/extensions/libdri.la
- /usr/lib/xorg/modules/extensions/libdri.so
- /usr/lib/xorg/modules/extensions/libglx.la
- /usr/lib/xorg/modules/extensions/libglx.so*
- /usr/include/GL/gl.h
- /usr/include/GL/glext.h
- /usr/include/GL/glx.h
- /usr/include/GL/glxext.h
- "
- local dir_list=( \
- "/usr/lib/.ati" \
- "/usr/lib/.nvidia" \
- "/usr/lib/.mesa" \
- "/usr/include/GL/.ati" \
- "/usr/include/GL/.nvidia" \
- "/usr/include/GL/.mesa" \
- "/usr/lib/xorg/modules/extensions/.ati" \
- "/usr/lib/xorg/modules/extensions/.nvidia" \
- "/usr/lib/xorg/modules/extensions/.mesa" \
- )
- local rm_file orig_dir
- local gl_lib=$1
- message "Selecting $gl_lib as the default system GL library"
- if [[ -L ${INSTALL_ROOT}/usr/lib/libGL.so ]] ||
- [[ ! -e ${INSTALL_ROOT}/usr/lib/libGL.so ]]
- then
- message "Cleaning all previous GL providers..."
- for rm_file in $file_list
- do
- rm -f $rm_file
- echo -n "."
- done
- echo -n "."
- echo ""
- message "Done."
- message "Setting up new GL provider $gl_lib..."
- 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
- [[ -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
- 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
- [[ -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
- 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
- [[ -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
- echo -n "."
- ;;
- *) message "Unknown secondary files so I only linked the libGL.so"
- ln -fs ${INSTALL_ROOT}/usr/lib/$gl_lib/libGL.so* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
- ;;
- esac
- echo -e "\nDone."
- message "You can manage the libGL providers at runtime by using"
- message "either smgl-gl_select or manually by symlinking the files"
- message "from their respective directories i.e.:"
- message "/usr/lib/.[nvidia|ati|mesa]/libGL.so"
- message
"/usr/lib/xorg/modules/extensions/.[nvidia,ati,mesa]/lib{glx,dri}.so"
- message "/usr/include/GL/.[nvidia|ati|mesa]/gl{x,xext,ext}.h"
- message ""
- message "To:"
- message "/usr/lib/libGL.so"
- message "/usr/lib/xorg/modules/extensions/lib{glx,dri}.so"
- message "/usr/include/GL/gl{x,xext,ext}.h"
- message ""
- return 0
- else
- message "Error ${INSTALL_ROOT}/usr/lib/libGL.so is not a symlink"
- message "unable to proceed!!!"
- message "Please recast:"
- message "mesalib, xorg-server and whatever GL driver you use."
- message ""
- message "If this continues to happen please file a bug."
- message ""
- return 1
- fi
+ message "${MESSAGE_COLOR}Calling smgl-gl_select to switch to
$1.$DEFAULT_COLOR" &&
+ smgl-gl_select -s "$1"
}
-
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index ae489af..daf26eb 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,5 +1,6 @@
. "$GRIMOIRE/FUNCTIONS" &&

+depends smgl-gl_select &&
depends -sub 'CXX' gcc &&
depends bison &&
depends flex &&
diff --git a/graphics-libs/mesalib/FINAL b/graphics-libs/mesalib/FINAL
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/graphics-libs/mesalib/FINAL
@@ -0,0 +1 @@
+glselect mesa
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 121ea09..6dc07c3 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depend on smgl-gl_select
+ * FINAL: call glselect (smgl-gl_select behind it)
+
2015-04-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 10.5.4
* DEPENDS: add gettext
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 9d785b4..5234dba 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -12,6 +12,7 @@ depends libice &&
depends libxml2 &&
depends libxrandr &&
depends mesalib &&
+depends smgl-gl_select &&
depends tiff &&
depends unzip &&
depends zlib &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 8395d2f..89157d2 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: smgl-gl_select
+
2014-10-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.2.1

diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index 92db750..4fe5b7b 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -201,7 +201,7 @@ else
fi &&

if is_depends_enabled $SPELL $(get_spell_provider $SPELL OPENGL); then
- suggest_depends smgl-gl_select "" "" "to switch between OPENGL providers
in userspace"
+ depends smgl-gl_select
fi &&

if is_depends_enabled $SPELL $(get_spell_provider $SPELL LUA); then
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 234e04f..7848fe5 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: definitely depend on smgl-gl_select
+
2015-04-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 0.9.0, waf 1.8.9
* BUILD: uses waf_build from FUNCTIONS again
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 0ffa9f1..a03bfdf 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -156,6 +156,7 @@ depends pkgconfig &&
depends libtool &&
depends AWK &&
depends mesalib &&
+depends smgl-gl_select &&
depends rgb &&
depends font-cursor-misc &&
depends font-misc-misc &&
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index d7a7fcd..b48e003 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: on smgl-gl_select
+
2015-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, xorg-server-1.17.1-gcc5_fixes-1.patch: add patch from
LFS to fix build with gcc 5



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a7dc593acb1050287772909d73b2e1da6b70ff30), Thomas Orgis, 05/05/2015

Archive powered by MHonArc 2.6.24.

Top of Page