Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (8d1f16b0d88ea71a8677c60e7427ad0a97824a8e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (8d1f16b0d88ea71a8677c60e7427ad0a97824a8e)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (8d1f16b0d88ea71a8677c60e7427ad0a97824a8e)
  • Date: Thu, 3 Jan 2019 17:50:42 +0000
GIT changes to master z-rejected grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

z-kernels/nvidia_driver/DETAILS | 1
z-kernels/nvidia_driver/HISTORY | 4 ++
z-kernels/nvidia_driver/INSTALL | 66
+++++++++++++++++++++++++++++-----------
3 files changed, 53 insertions(+), 18 deletions(-)

New commits:
commit 8d1f16b0d88ea71a8677c60e7427ad0a97824a8e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

z-kernels/nvidia_driver: fix library installation

diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index dc0d18f..f6f6ab2 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -16,6 +16,7 @@ fi

SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86_64/${VERSION}/${SOURCE}
SOURCE_DIRECTORY="$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION"
SECURITY_PATCH=1
+ PATCHLEVEL=1
;;
############################################################
# missing ia64 support we don't have an arch spec for it???
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 750ef85..99f5b56 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,7 @@
+2019-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: fix library installation
+ * DETAILS: PATCHLEVEL++
+
2019-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: remove support for x86 since upstream has ceased to support
the architecture
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 17dfe4d..60b86cb 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -62,18 +62,14 @@ for lib in libGL.la \
done &&
mkdir -vp $INSTALL_ROOT/usr/lib/.nvidia \
$INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia/ &&
-cp -vr libGL.so.1.7.0 $INSTALL_ROOT/usr/lib/.nvidia
+cp -vr libGL.so.1.7.0 $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libGLdispatch.so.0 $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libEGL_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libEGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libEGL.so.1.1.0 $INSTALL_ROOT/usr/lib/.nvidia
-cp -vr libGLESv1_CM_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libGLESv1_CM.so.1.2.0 $INSTALL_ROOT/usr/lib/.nvidia
-cp -vr libGLESv2_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libGLESv2.so.2.1.0 $INSTALL_ROOT/usr/lib/.nvidia
+cp -vr libEGL.so.1.1.0 $INSTALL_ROOT/usr/lib/.nvidia &&
+cp -vr libGLESv1_CM.so.1.2.0 $INSTALL_ROOT/usr/lib/.nvidia &&
+cp -vr libGLESv2.so.2.1.0 $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libGLX.so.0 $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libglxserver_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libOpenGL.so.0 $INSTALL_ROOT/usr/lib/.nvidia &&
mkdir -vp $INSTALL_ROOT/usr/lib/tls &&
install -v -m 0644 -o root -g root libnvidia-tls.so.${VERSION/-/.} \
@@ -84,23 +80,43 @@ install -v -m 0644 -o root -g root
libnvidia-tls.so.${VERSION/-/.} \
pushd $INSTALL_ROOT/usr/lib/.nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
+
ln -sfn libEGL_nvidia.so.${VERSION/-/.} libEGL_nvidia.so.1 &&
-if [[ $NVIDIA_BETA == y ]]; then
- ln -sfn libEGL.so.${VERSION/-/.} libEGL.so.1 &&
- ln -sfn libGLESv1_CM.so.1 libGLESv1_CM.so &&
- ln -sfn libGLESv2.so.1 libGLESv2.so
-else
- ln -sfn libEGL.so.${VERSION/-/.} libEGL.so.1.1.0 &&
- ln -sfn libGLESv1_CM.so.1.2.0 libGLESv1_CM.so &&
- ln -sfn libGLESv2.so.2.1.0 libGLESv2.so
-fi &&
+ln -sfn libEGL_nvidia.so.1 libEGL_nvidia.so &&
+
+ln -sfn libGLX.so.0 libGLX.so &&
+
+ln -sfn libEGL.so.${VERSION/-/.} libEGL.so.1 &&
+ln -sfn libEGL.so.1 libEGL.so &&
+
+ln -sfn libGLESv1_CM.so.1 libGLESv1_CM.so &&
+ln -sfn libGLESv2.so.1 libGLESv2.so &&
ln -sfn libOpenGL.so.0 libOpenGL.so &&
popd &&
pushd $INSTALL_ROOT/usr/lib &&
ln -sfn libnvidia-glcore.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 &&
+
+ln -sfn libnvidia-egl-wayland.so.1.1.0 libnvidia-egl-wayland.so.1 &&
+
+ln -sfn libnvidia-ml.so.${VERSION/-/.} libnvidia-ml.so.1 &&
+ln -sfn libnvidia-ml.so.1 libnvidia-ml.so &&
+
+ln -sfn libnvidia-encode.so.${VERSION/-/.} libnvidia-encode.so.1 &&
+ln -sfn libnvidia-encode.so.1 libnvidia-encode.so &&
+
+ln -sfn libnvidia-ifr.so.${VERSION/-/.} libnvidia-ifr.so.1 &&
+ln -sfn libnvidia-ifr.so.1 libnvidia-ifr.so &&
+
+ln -sfn libnvidia-fbc.so.${VERSION/-/.} libnvidia-fbc.so.1 &&
+ln -sfn libnvidia-fbc.so.1 libnvidia-fbc.so &&
+
+ln -sfn libnvidia-fatbinaryloader.so.${VERSION/-/.}
libnvidia-fatbinaryloader.so.1 &&
+ln -sfn libnvidia-fatbinaryloader.so.1
libnvidia-fatbinaryloader.so &&
popd &&
pushd $INSTALL_ROOT/usr/lib/tls &&
ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
@@ -112,6 +128,20 @@ popd
&&
mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers &&
install -v -m 0644 -o root -g root nvidia_drv.so
$INSTALL_ROOT/usr/lib/xorg/modules/drivers/ &&
install -v -m 0644 -o root -g root libGLX_nvidia.so.${VERSION/-/.}
$INSTALL_ROOT/usr/lib/.nvidia/ &&
+pushd $INSTALL_ROOT/usr/lib/.nvidia/ &&
+ln -sfn libGLX_nvidia.so.${VERSION/-/.} libGLX_nvidia.so.0 &&
+ln -sfn libGLX_nvidia.so.0 libGLX_nvidia.so &&
+popd
+
+cp -vr libEGL_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
+cp -vr libGLESv1_CM_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
+cp -vr libGLESv2_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
+
+cp -vr libglxserver_nvidia.so.${VERSION/-/.}
$INSTALL_ROOT/usr/lib/xorg/modules/extensions/ &&
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/ &&
+ln -sfn libglxserver_nvidia.so.${VERSION/-/.} libglxserver_nvidia.so.1 &&
+ln -sfn libglxserver_nvidia.so.1 libglxserver_nvidia.so &&
+popd &&
#
# Setup symlinks
#
@@ -151,7 +181,7 @@ done &&
#
for lib in libvdpau_nvidia.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/
-done &&
+done
&&
mkdir -vp $INSTALL_ROOT/usr/lib/vdpau
&&
for lib in libvdpau_nvidia.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/vdpau/


  • [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (8d1f16b0d88ea71a8677c60e7427ad0a97824a8e), Florian Franzmann, 01/03/2019

Archive powered by MHonArc 2.6.24.

Top of Page