Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (46dfa2faa677981cde95ddca1dd0525355df7ded)
  • Date: Wed, 4 Dec 2019 17:51:54 +0000

GIT changes to master z-rejected grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

z-kernels/nvidia_driver/DETAILS | 4 -
z-kernels/nvidia_driver/HISTORY | 6 +-
z-kernels/nvidia_driver/INSTALL | 82
++++++++++++++++++++--------------------
3 files changed, 48 insertions(+), 44 deletions(-)

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

z-kernels/nvidia_driver: version 440.36

commit 7d28a845bb616c2d4418c6316a07826476fc77b1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "z-kernels/nvidia_driver: version 440.31"

This reverts commit e9640aed44282f82f4d8102fb21c07e51c3f31be.

diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 5969f5d..14720c6 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -1,6 +1,6 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_driver
- STABLE_VERSION=440.31
+ STABLE_VERSION=440.36
BETA_VERSION=415.27
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
@@ -9,7 +9,7 @@ if [[ $NVIDIA_BETA == y ]]; then

SOURCE_HASH=sha512:5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:5598d362f21fb4e75a07d77167e24411b5a550e3f1329b39fe004987e2bcb191c9bbf1b3d1a43a8754a9ba00faef57a943c7778999a4e3121c13c30f912fae38
+
SOURCE_HASH=sha512:445d7f58de418cbee79895469a27afa2186656a961499dfc0e7e62ba1f773f5a011affa563b0fc50c212b9e06b23f63e182c122b36d0d93c39cc3e9ff3641410
fi
SOURCE=NVIDIA-Linux-x86_64-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 6f40086..996266c 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,5 +1,7 @@
-2019-11-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: stable version 440.31
+2019-12-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 440.36
+ * INSTALL: fix installation of libGL, add missing &&, improve
+ formatting

2019-09-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 430.50
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index c213f12..762e750 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -61,16 +61,17 @@ for lib in libGL.la \
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
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.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libGLdispatch.so.0 $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 libGLdispatch.so.0 $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.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 libOpenGL.so.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 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/-/.} \
$INSTALL_ROOT/usr/lib/tls &&
@@ -78,7 +79,7 @@ install -v -m 0644 -o root -g root
libnvidia-tls.so.${VERSION/-/.} \
# Create library symlinks
#
pushd $INSTALL_ROOT/usr/lib/.nvidia &&
-ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
+ln -sfn libGL.so.1.7.0 libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&

ln -sfn libEGL_nvidia.so.${VERSION/-/.} libEGL_nvidia.so.1 &&
@@ -132,11 +133,11 @@ install -v -m 0644 -o root -g root
libGLX_nvidia.so.${VERSION/-/.} $INSTALL_ROOT
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
+popd &&

-cp -vr libEGL_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
+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 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/ &&
@@ -161,13 +162,13 @@ ln -sfn
/usr/lib/.nvidia/libGLX_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/l
for lib in libcuda.so.${VERSION/-/.} libnvcuvid.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
- #
- # Setup symlinks
- #
- pushd $INSTALL_ROOT/usr/lib &&
- ln -sfn libcuda.so.${VERSION/-/.} libcuda.so.1 &&
- ln -sfn libcuda.so.1 libcuda.so &&
- popd &&
+#
+# Setup symlinks
+#
+pushd $INSTALL_ROOT/usr/lib &&
+ln -sfn libcuda.so.${VERSION/-/.} libcuda.so.1 &&
+ln -sfn libcuda.so.1 libcuda.so &&
+popd &&

#
# Install VDPAU headers
@@ -182,22 +183,23 @@ done &&
#
for lib in libvdpau_nvidia.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/
-done
&&
-mkdir -vp $INSTALL_ROOT/usr/lib/vdpau
&&
+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/
done &&
- #
- # Setup symlinks
- #
- pushd $INSTALL_ROOT/usr/lib
&&
- ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau.so.1
&&
- ln -sfn libvdpau.so.1 libvdpau.so
&&
- popd
&&
- pushd $INSTALL_ROOT/usr/lib/vdpau
&&
- ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau_nvidia.so.1
&&
- ln -sfn libvdpau_nvidia.so.1 libvdpau_nvidia.so
&&
- popd
&&
+
+#
+# Setup symlinks
+#
+pushd $INSTALL_ROOT/usr/lib
&&
+ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau.so.1
&&
+ln -sfn libvdpau.so.1 libvdpau.so
&&
+popd
&&
+pushd $INSTALL_ROOT/usr/lib/vdpau
&&
+ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau_nvidia.so.1
&&
+ln -sfn libvdpau_nvidia.so.1 libvdpau_nvidia.so
&&
+popd
&&

#
# Install OpenCL headers
@@ -213,13 +215,13 @@ done &&
for lib in libOpenCL.so.1.0.0; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/
done &&
- #
- # Setup symlinks
- #
- pushd $INSTALL_ROOT/usr/lib &&
- ln -sfn libOpenCL.so.1.0.0 libOpenCL.so.1 &&
- ln -sfn libOpenCL.so.1 libOpenCL.so &&
- popd &&
+#
+# Setup symlinks
+#
+pushd $INSTALL_ROOT/usr/lib &&
+ln -sfn libOpenCL.so.1.0.0 libOpenCL.so.1 &&
+ln -sfn libOpenCL.so.1 libOpenCL.so &&
+popd &&

#
# Install Freedesktop.org spec



  • [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (46dfa2faa677981cde95ddca1dd0525355df7ded), Florian Franzmann, 12/04/2019

Archive powered by MHonArc 2.6.24.

Top of Page