Skip to Content.
Sympa Menu

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

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 z-rejected grimoire by Andraž Levstik (eac56538a03e4ae958c8a64750e59e74070fce88)
  • Date: Sun, 8 Feb 2009 06:51:24 -0600

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

z-kernels/nvidia_driver/HISTORY | 2 +-
z-kernels/nvidia_driver/INSTALL | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)

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

nvidia_driver: libGLcore is something else

diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 6fcb068..674fffb 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -2,7 +2,7 @@
* DEPENDS: xorg-server
* DETAILS: patchlevel by default is 0, ARCHIVE even if binary,
bug has been fixed, fixed rejected reason, patchlevel++
- * INSTALL: fixups for smgl-gl_select
+ * INSTALL: fixups for smgl-gl_select, libGLcore is something different
* POST_REMOVE: removed
* PRE_BUILD: fixups
* glext-redef.patch: removed
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 8dacd0d..61b0422 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -38,7 +38,7 @@ pushd $SOURCE_DIRECTORY/usr/lib &&

# Fill in the path to libGL.so
sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
-for lib in libGL.la \
+for lib in libGL.la libGLcore.so.${VERSION/-/.} \
libnvidia-tls.so.${VERSION/-/.} libnvidia-cfg.so.${VERSION/-/.};
do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
@@ -58,6 +58,7 @@ install -v -m 0644 -o root -g root
tls/libnvidia-tls.so.${VERSION/-/.} \
ln -sfn libGL.so.1 libGL.so &&
popd
pushd $INSTALL_ROOT/usr/lib &&
+ ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
ln -sfn libnvidia-cfg.so.${VERSION/-/.} libnvidia-cfg.so.1 &&
ln -sfn libnvidia-cfg.so.1 libnvidia-cfg.so &&
ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
@@ -71,7 +72,8 @@ popd &&
# Install X11 OpenGL libraries
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib &&
-for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
+for lib in libGLcore.so.${VERSION/-/.} \
+ libXvMCNVIDIA.a
libXvMCNVIDIA.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
#
@@ -106,7 +108,6 @@ ln -sfn "libnvidia-wfb.so.${VERSION/-/.}" \
"libwfb.so" &&
pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
-ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
popd &&
popd &&
popd



  • [SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (eac56538a03e4ae958c8a64750e59e74070fce88), Andraž Levstik, 02/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page