Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (d7f8365e70b553e619260f440b9b9a29391b80f2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (d7f8365e70b553e619260f440b9b9a29391b80f2)
  • Date: Mon, 9 Feb 2009 02:18:28 -0600

GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:

.glselect/ati-filelist | 11 ++
.glselect/mesa-filelist | 14 +++
.glselect/nvidia-filelist | 9 ++
ChangeLog | 6 +
FUNCTIONS | 2
glselect.function | 137
++++++++++++++++++++++++++++++++
graphics-libs/mesalib/DEPENDS | 1
graphics-libs/mesalib/FINAL | 1
graphics-libs/mesalib/HISTORY | 5 +
graphics-libs/mesalib/POST_RESURRECT | 1
windowmanagers/fvwm/DEPENDS | 73 ++++++++++++++---
windowmanagers/fvwm/HISTORY | 4
xorg-xserver/xorg-server/DEPENDS | 1
xorg-xserver/xorg-server/FINAL | 3
xorg-xserver/xorg-server/HISTORY | 6 +
xorg-xserver/xorg-server/POST_RESURRECT | 1
xorg-xserver/xorg-server/PRE_BUILD | 2
17 files changed, 259 insertions(+), 18 deletions(-)

New commits:
commit 721201e1cdefc12f6a90125713fb6968c745f023
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

.glselect/nvidia-filelist: updated

commit 1de38a6c5239a82bd47dab2eab1ea86e6c4f104e
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

fvwm: updated DEPENDS

commit e2fd93d8c8296d06f2d354dbf7100e3ecc43b9b2
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xorg-server: use glselect

commit bd9a3a6b1eef86d46c7a6706e0b1f8cd9170df6e
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

mesalib: using internal glselect

commit 5054faf6a300d78370d198db5e08daa1c6a686cc
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

glselect: added as a function

diff --git a/.glselect/ati-filelist b/.glselect/ati-filelist
new file mode 100644
index 0000000..007df47
--- /dev/null
+++ b/.glselect/ati-filelist
@@ -0,0 +1,11 @@
+/usr/lib/ati/libGL.so
+/usr/lib/ati/libGL.so.1.2
+/usr/lib/xorg/modules/extensions/ati/libdri.so
+/usr/lib/xorg/modules/extensions/ati/libglx.so
+/usr/lib/xorg/modules/mesa/libwfb.la
+/usr/lib/xorg/modules/mesa/libwfb.so
+/usr/include/GL/mesa/gl.h
+/usr/include/GL/mesa/glext.h
+/usr/include/GL/mesa/glx.h
+/usr/include/GL/mesa/glxext.h
+
diff --git a/.glselect/mesa-filelist b/.glselect/mesa-filelist
new file mode 100644
index 0000000..3e0a4dc
--- /dev/null
+++ b/.glselect/mesa-filelist
@@ -0,0 +1,14 @@
+/usr/include/GL/mesa/gl.h
+/usr/include/GL/mesa/glext.h
+/usr/include/GL/mesa/glx.h
+/usr/include/GL/mesa/glxext.h
+/usr/lib/mesa/libGL.so
+/usr/lib/mesa/libGL.so.1
+/usr/lib/mesa/libGL.so.1.2
+/usr/lib/xorg/modules/extensions/mesa/libdri.la
+/usr/lib/xorg/modules/extensions/mesa/libdri.so
+/usr/lib/xorg/modules/extensions/mesa/libglx.la
+/usr/lib/xorg/modules/extensions/mesa/libglx.so
+/usr/lib/xorg/modules/mesa/libwfb.la
+/usr/lib/xorg/modules/mesa/libwfb.so
+
diff --git a/.glselect/nvidia-filelist b/.glselect/nvidia-filelist
new file mode 100644
index 0000000..9557cc0
--- /dev/null
+++ b/.glselect/nvidia-filelist
@@ -0,0 +1,9 @@
+/usr/include/GL/nvidia/gl.h
+/usr/include/GL/nvidia/glext.h
+/usr/include/GL/nvidia/glx.h
+/usr/include/GL/nvidia/glxext.h
+/usr/lib/nvidia/libGL.so
+/usr/lib/nvidia/libGL.so.1
+/usr/lib/xorg/modules/extensions/nvidia/libglx.so
+/usr/lib/xorg/modules/mesa/libwfb.so
+
diff --git a/ChangeLog b/ChangeLog
index f9d976f..35e8064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * .glselect/{nvidia,ati,mesa}-filelist: added from gl_select
+ * glselect.function: gl_select as a function
+ * FUNCTIONS: source glselect.function
+ * .glselect/nvidia-filelist: updated
+
2009-02-05 Eric Sandall <sandalle AT sourcemage.org>
* font-{tex,x11}/FUNCTIONS: Override Sorcery's default_post_resurrect
to do TeX/X11 specific font generation
diff --git a/FUNCTIONS b/FUNCTIONS
index 24bc4d4..e9a9307 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -719,3 +719,5 @@ function default_build_configure() {
function default_build_make(){
make
}
+
+. $GRIMOIRE/glselect.function
diff --git a/glselect.function b/glselect.function
new file mode 100755
index 0000000..d075850
--- /dev/null
+++ b/glselect.function
@@ -0,0 +1,137 @@
+#---
+## glselect - select default libGL provider
+## rewritten from smgl-gl_select
+##
+## this is run in FINAL and will always set the provider
+## based on the final spell cast that calls this.
+## If one wants to have this settable runtime then
+## there's the smgl-gl_select tool to do so
+##
+#---
+
+function glselect(){
+ # get all available GL providers
+ local gl_libs="$(ls -1 --color=none ${TRACK_ROOT}/usr/lib/*/libGL.so \
+ | awk -F"/" '{print $4}' 2> /dev/null )"
+ # where to store the filelists
+ local gl_filelist_dir="$GRIMOIRE/.glselect"
+ local orig_file new_file
+ local gl_lib=$1
+ if ! grep -q "$gl_lib" <<< "$gl_libs"
+ then
+ message "Error $gl_lib is not a valid GL Library"
+ exit 1
+ fi
+ 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 orig_file in $(grep "/ati" $gl_filelist_dir/ati-filelist)
+ do
+ new_file=${orig_file/\/ati}
+ rm -f $new_file
+ echo -n "."
+ done
+ echo -n "."
+ orig_file=""
+ for orig_file in $(grep "/mesa" $gl_filelist_dir/mesa-filelist)
+ do
+ new_file=${orig_file/\/mesa}
+ rm -f $new_file
+ echo -n "."
+ done
+ echo -n "."
+ orig_file=""
+ for orig_file in $(grep "/nvidia" $gl_filelist_dir/nvidia-filelist)
+ do
+ new_file=${orig_file/\/nvidia}
+ rm -f $new_file
+ echo -n "."
+ done
+ orig_file=""
+ echo ""
+ message "Done."
+ message "Setting up new GL provider $gl_lib..."
+ case "$1" in
+ ati)
+ for orig_file in $(grep "/mesa" $gl_filelist_dir/ati-filelist)
+ do
+ new_file=${orig_file/\/mesa}
+ ln -sf ${INSTALL_ROOT}${orig_file} \
+ ${INSTALL_ROOT}${new_file} 2>/dev/null
+ echo -n "."
+ done
+ orig_file=""
+ for orig_file in $(grep "/ati" $gl_filelist_dir/ati-filelist)
+ do
+ new_file=${orig_file/\/ati}
+ ln -sf ${INSTALL_ROOT}${orig_file} \
+ ${INSTALL_ROOT}${new_file} 2>/dev/null
+ echo -n "."
+ done
+ ;;
+ mesa)
+ for orig_file in $(cat $gl_filelist_dir/mesa-filelist)
+ do
+ new_file=${orig_file/\/mesa}
+ ln -sf ${INSTALL_ROOT}${orig_file} \
+ ${INSTALL_ROOT}${new_file} 2>/dev/null
+ echo -n "."
+ done
+ ;;
+ nvidia)
+ for orig_file in $(grep "/mesa" $gl_filelist_dir/nvidia-filelist)
+ do
+ new_file=${orig_file/\/mesa}
+ ln -sf ${INSTALL_ROOT}${orig_file} \
+ ${INSTALL_ROOT}${new_file} 2>/dev/null
+ echo -n "."
+ done
+ orig_file=""
+ for orig_file in $(grep "/nvidia"
$gl_filelist_dir/nvidia-filelist)
+ do
+ new_file=${orig_file/\/nvidia}
+ ln -sf ${INSTALL_ROOT}${orig_file} \
+ ${INSTALL_ROOT}${new_file} 2>/dev/null
+ echo -n "."
+ done
+ ;;
+ *) message "Unknown secondary files so I only linked the libGL.so"
+ for orig_file in $(cat $gl_filelist_dir/mesa-filelist)
+ do
+ new_file=${orig_file/\/mesa}
+ ln -sf ${INSTALL_ROOT}${orig_file} \
+ ${INSTALL_ROOT}${new_file} 2>/dev/null
+ echo -n "."
+ done
+ 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/xorg/modules/extensions/[nvidia,ati,mesa]/lib{glx,dri}.so"
+ message "/usr/include/GL/[nvidia|mesa]/gl{x,xext,ext}.h"
+ message ""
+ message "To:"
+ message "/usr/lib/libGL.so"
+ message "/usr/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
+}
+
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index afcfc25..36e5669 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,4 +1,3 @@
-depends smgl-gl_select &&
depends dri2proto &&
depends libdrm &&
depends util-macros &&
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 16aa327..f8b3284 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,8 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: removed smgl-gl_select
+ * FINAL: using internal glselect
+ * POST_RESURRECT: restore mesa on resurrection
+
2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_BUILD: added a patch for smgl-gl_select
* gl_select.patch: patch to install to subdir
diff --git a/graphics-libs/mesalib/POST_RESURRECT
b/graphics-libs/mesalib/POST_RESURRECT
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/graphics-libs/mesalib/POST_RESURRECT
@@ -0,0 +1 @@
+glselect mesa
diff --git a/windowmanagers/fvwm/DEPENDS b/windowmanagers/fvwm/DEPENDS
index 0af7c65..0b1a89d 100755
--- a/windowmanagers/fvwm/DEPENDS
+++ b/windowmanagers/fvwm/DEPENDS
@@ -1,21 +1,68 @@
depends xorg-libs &&
depends zlib &&
depends netpbm &&
-
-optional_depends "libstroke" "" "" "allows interpretation by fvwm of mouse
strokes(mouse motion)" &&
-optional_depends "gtk+" "" "--disable-gtk" "With GTK support for
FvwmGtk?" &&
-optional_depends "gnome-libs" "--with-gnome" "--with-gnome=no" "With GNOME
support in FvwmGtk?" &&
-optional_depends "readline" "--with-readline-library
--without-termcap-library" "--without-readline-library" "line
editing/history" &&
-optional_depends libsm "--enable-sm" "--disable-sm" "Enable session
Managment?" &&
-optional_depends libxext "--enable-shape" "--disable-shape" "Enable shaped
window support?" &&
-optional_depends libxinerama "--enable-xinerama" "--disable-xinerama"
"Enable xinerama support?" &&
-optional_depends libxrender "--enable-xrender" "--disable-xrender" "Enable
Xrender alpha-blend rendering?" &&
-optional_depends "rplay" "--enable-rplay" "--without-rplay-library" "support
sound" &&
+optional_depends libstroke \
+ "" \
+ "" \
+ "allows interpretation of mouse strokes(mouse motion)" &&
+optional_depends gtk+ \
+ "" \
+ "--disable-gtk" \
+ "With GTK support for FvwmGtk?" &&
+optional_depends gnome-libs \
+ "--with-gnome" \
+ "--with-gnome=no" \
+ "With GNOME support in FvwmGtk?" &&
+optional_depends readline \
+ "--with-readline-library --without-termcap-library" \
+ "--without-readline-library" \
+ "line editing/history" &&
+optional_depends libsm \
+ "--enable-sm" \
+ "--disable-sm" \
+ "Enable session Managment?" &&
+optional_depends libxext \
+ "--enable-shape" \
+ "--disable-shape" \
+ "Enable shaped window support?" &&
+optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
+ "Enable xinerama support?" &&
+optional_depends libxrender \
+ "--enable-xrender" \
+ "--disable-xrender" \
+ "Enable Xrender alpha-blend rendering?" &&
+optional_depends rplay \
+ "--enable-rplay" \
+ "--without-rplay-library" \
+ "support sound" &&

if [ ! "${FVWM_RELEASE}" = "stable" ]; then
- optional_depends "perl" "--enable-perllib" "--disable-perllib" "install
perl bindings" &&
- optional_depends "fribidi" "--enable-bidi" "--disable-bidi"
"bidirectional writing support" &&
- optional_depends "libpng" "--with-png" "--without-png-library" "png
image support"
+ optional_depends libxcursor \
+ "--enable-xcursor" \
+ "--disable-xcursor" \
+ "Enable XCursor support" &&
+ optional_depends librsvg2 \
+ "--enable-rsvg" \
+ "--disable-rsvg" \
+ "SVG Support" &&
+ optional_depends libxft \
+ "--enable-xft" \
+ "--disable-xft" \
+ "XFT Support" &&
+ optional_depends perl \
+ "--enable-perllib" \
+ "--disable-perllib" \
+ "install perl bindings" &&
+ optional_depends fribidi \
+ "--enable-bidi" \
+ "--disable-bidi" \
+ "bidirectional writing support" &&
+ optional_depends libpng \
+ "--with-png" \
+ "--without-png-library" \
+ "png image support"
fi &&

if [ "${FVWM_RELEASE}" = "cvs" ]; then
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index a0fc9fb..99fe25d 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,7 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: added librsvg2, xcursor, xft, unified the look since
+ some go over 80 chars long
+
2009-09-19 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: removed an unneeded &&
thanks for the catch hybris
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index c4e4afd..e3663bd 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -2,7 +2,6 @@
## Check this every release as X.org likes to change things on us...
#
##Check this on updates
-#depends smgl-gl_select &&
depends libxv "--enable-xv" &&
# workaround until: https://bugs.freedesktop.org/show_bug.cgi?id=6009
# get's fixed
diff --git a/xorg-xserver/xorg-server/FINAL b/xorg-xserver/xorg-server/FINAL
index 7f15ec3..cb13cda 100755
--- a/xorg-xserver/xorg-server/FINAL
+++ b/xorg-xserver/xorg-server/FINAL
@@ -9,5 +9,4 @@ message "${MESSAGE_COLOR}If your mouse or keyboard stop
working, then add\n" \
"Section \"ServerFlags\"\n"
\
" Option \"AllowEmptyInput\" \"false\"\n"
\
"EndSection${DEFAULT_COLOR}"
-# switch back to default provider
-smgl-gl_select -d
+glselect mesa
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 6098871..4a1ca4e 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * PRE_BUILD: use glselect function
+ * DEPENDS: no longer use smgl-gl_select
+ * FINAL: use glselect
+ * POST_RESURRECT: restore mesa
+
2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_BUILD: added smgl-gl_select patch, and run it before building,
apply a sed as per lynx^3 to fix drm if patch is applied it seems
diff --git a/xorg-xserver/xorg-server/POST_RESURRECT
b/xorg-xserver/xorg-server/POST_RESURRECT
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/xorg-xserver/xorg-server/POST_RESURRECT
@@ -0,0 +1 @@
+glselect mesa
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 2888e80..930d26f 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
# required to build
-smgl-gl_select -s mesa &&
+glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
unpack_file 2 &&
patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&




Archive powered by MHonArc 2.6.24.

Top of Page