[Lunar-commits] <moonbase> NVIDIA(-beta): updated to 275.09.07 and synced build
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Fri Jun 17 02:19:59 CEST 2011
commit 11e6a371e56277a7e153c907b916640bef67968c
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Fri Jun 17 02:19:59 2011 +0200
NVIDIA(-beta): updated to 275.09.07 and synced build
---
x11/NVIDIA-beta/BUILD | 2 +-
x11/NVIDIA-beta/DETAILS | 12 ++--
x11/NVIDIA-beta/DETAILS.x86_64 | 12 ++--
x11/NVIDIA/BUILD | 112 +++++++++++++++++++++-------------------
x11/NVIDIA/DEPENDS | 4 +-
5 files changed, 75 insertions(+), 67 deletions(-)
diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index fc4f7aa..62bd5f4 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -102,7 +102,7 @@
# We make the kernel modules on our own
cd kernel &&
- sedit "s@\$\(shell uname -r\)@`readlink /usr/src/linux | cut -d- -f2`@" Makefile.* makefile &&
+ sedit "s@\$\(shell uname -r\)@`cat /usr/src/linux/include/config/kernel.release`@" Makefile.* makefile &&
# sedit "s/-O/$CFLAGS/" Makefile.nvidia &&
# NV_VERBOSE=0 EXTRA_CFLAGS=$CFLAGS ARCH=
make module &&
diff --git a/x11/NVIDIA-beta/DETAILS b/x11/NVIDIA-beta/DETAILS
index 1896a46..9a422e9 100644
--- a/x11/NVIDIA-beta/DETAILS
+++ b/x11/NVIDIA-beta/DETAILS
@@ -1,5 +1,5 @@
MODULE=NVIDIA-beta
- VERSION=270.41.19
+ VERSION=275.09.07
SOURCE=NVIDIA-Linux-x86-$VERSION.run
SOURCE2=nvidia-settings-$VERSION.tar.bz2
SOURCE3=nvidia-installer-$VERSION.tar.bz2
@@ -27,14 +27,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
SOURCE2_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
SOURCE3_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
SOURCE4_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
- SOURCE_VFY=sha1:5b5eb7b2650059b17537ed4b9d646a6dbd46d6a8
- SOURCE2_VFY=sha1:f72f69394a0c546d707a438dc2f3bb1ca00e2012
- SOURCE3_VFY=sha1:3499e8e4a5b4cc0a34ddff755b365aceb87c018c
- SOURCE4_VFY=sha1:d3e3346ede0c6c7a4579715595546dd732749f09
+ SOURCE_VFY=sha1:068b007bb08603689ada3ebb342dc87849f50b7c
+ SOURCE2_VFY=sha1:d8ead4eb6ff57c18ddbbb6d9e02991d2ef9a5d80
+ SOURCE3_VFY=sha1:25a937a309549f87a68c600daf1d04d496667745
+ SOURCE4_VFY=sha1:e4aa5061c89100b6d05a78e65f72be26e14be47c
WEB_SITE=http://www.nvidia.com
LICENSE="proprietary"
ENTERED=20030804
- UPDATED=20110612
+ UPDATED=20110616
SHORT="X11 NVIDIA binary beta driver for Geforce 6/7/8/9/GT2xx"
cat << EOF
diff --git a/x11/NVIDIA-beta/DETAILS.x86_64 b/x11/NVIDIA-beta/DETAILS.x86_64
index dc68751..a47c593 100644
--- a/x11/NVIDIA-beta/DETAILS.x86_64
+++ b/x11/NVIDIA-beta/DETAILS.x86_64
@@ -1,5 +1,5 @@
MODULE=NVIDIA-beta
- VERSION=270.41.19
+ VERSION=275.09.07
SOURCE=NVIDIA-Linux-x86_64-$VERSION-no-compat32.run
SOURCE2=nvidia-settings-$VERSION.tar.bz2
SOURCE3=nvidia-installer-$VERSION.tar.bz2
@@ -27,14 +27,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
SOURCE2_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
SOURCE3_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
SOURCE4_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
- SOURCE_VFY=sha1:3da4007ea4b316836695f7b6772a92d0d165ec7f
- SOURCE2_VFY=sha1:f72f69394a0c546d707a438dc2f3bb1ca00e2012
- SOURCE3_VFY=sha1:3499e8e4a5b4cc0a34ddff755b365aceb87c018c
- SOURCE4_VFY=sha1:d3e3346ede0c6c7a4579715595546dd732749f09
+ SOURCE_VFY=sha1:ffa7c158794ae1c8f9a6da14955f030f65521e74
+ SOURCE2_VFY=sha1:d8ead4eb6ff57c18ddbbb6d9e02991d2ef9a5d80
+ SOURCE3_VFY=sha1:25a937a309549f87a68c600daf1d04d496667745
+ SOURCE4_VFY=sha1:e4aa5061c89100b6d05a78e65f72be26e14be47c
WEB_SITE=http://www.nvidia.com
LICENSE="proprietary"
ENTERED=20030804
- UPDATED=20110612
+ UPDATED=20110616
SHORT="X11 NVIDIA binary beta driver for Geforce 6/7/8/9/GT2xx"
cat << EOF
diff --git a/x11/NVIDIA/BUILD b/x11/NVIDIA/BUILD
index 2505a2c..62bd5f4 100644
--- a/x11/NVIDIA/BUILD
+++ b/x11/NVIDIA/BUILD
@@ -1,15 +1,15 @@
(
- # This is installer less build script. If you find bugs let me know by e-mail: zbiggy(0)o2(period)pl
+ # This is an installer-less build script. If you find bugs let me know by e-mail: zbiggy(0)o2(period)pl
GCCKNL=`cat /proc/version | cut -d\( -f3 | cut -d\ -f3`
GCCNOW=`gcc --version | grep gcc | cut -d\ -f3`
if [ $GCCKNL != $GCCNOW ]; then
- message "${PROBLEM_COLOR}The kernel is compiled using gcc version: $GCCKNL"
- message "but you try to compile nvidia kernel module with"
- message "gcc version: $GCCNOW. You can not use different"
- message "gcc to build kernel and modules. Please lin kernel"
- message "with current gcc, then reboot and lin nvidia driver.${DEFAULT_COLOR}"
- exit 1
+ message "${PROBLEM_COLOR}The kernel is compiled using gcc version: $GCCKNL"
+ message "but you try to compile nvidia kernel module with"
+ message "gcc version: $GCCNOW. You can not use different"
+ message "gcc to build kernel and modules. Please lin kernel"
+ message "with current gcc, then reboot and lin nvidia driver.${DEFAULT_COLOR}"
+ exit 1
fi &&
# Fix for broken MSI in driver
@@ -24,6 +24,7 @@
# Temporary paths and symlinks to make sources compilable
LD_LIBRARY_PATH="$SOURCE_DIRECTORY:$LD_LIBRARY_PATH" &&
CFLAGS=" -L$SOURCE_DIRECTORY $CFLAGS " &&
+ export SYSSRC=/usr/src/linux &&
ln -s libGL.so.$VERSION nvidia-installer-$VERSION/libGL.so &&
ln -s libnvidia-glcore.so.$VERSION nvidia-installer-$VERSION/libGLcore.so.1 &&
ln -s libnvidia-tls.so.$VERSION nvidia-installer-$VERSION/libnvidia-tls.so.1 &&
@@ -46,68 +47,70 @@
make rebuild_rtld_test &&
make &&
if [[ $(arch) == x86_64 ]] ; then
- install -m 755 _out/Linux_x86_64/nvidia-installer ..
- install -m 755 _out/Linux_x86_64/mkprecompiled ..
- install -m 644 _out/Linux_x86_64/nvidia-installer.1.gz ..
- cp tls_test_`uname`-x86_64 ../tls_test
- cp tls_test_dso_`uname`-x86_64.so ../tls_test_dso.so
+ install -m 755 _out/Linux_x86_64/nvidia-installer .. &&
+ install -m 755 _out/Linux_x86_64/mkprecompiled .. &&
+ install -m 644 _out/Linux_x86_64/nvidia-installer.1.gz .. &&
+ cp tls_test_`uname`-x86_64 ../tls_test &&
+ cp tls_test_dso_`uname`-x86_64.so ../tls_test_dso.so
else
- install -m 755 _out/Linux_x86/nvidia-installer ..
- install -m 755 _out/Linux_x86/mkprecompiled ..
- install -m 644 _out/Linux_x86/nvidia-installer.1.gz ..
- cp tls_test_`uname`-x86 ../tls_test
- cp tls_test_dso_`uname`-x86.so ../tls_test_dso.so
+ install -m 755 _out/Linux_x86/nvidia-installer .. &&
+ install -m 755 _out/Linux_x86/mkprecompiled .. &&
+ install -m 644 _out/Linux_x86/nvidia-installer.1.gz .. &&
+ cp tls_test_`uname`-x86 ../tls_test &&
+ cp tls_test_dso_`uname`-x86.so ../tls_test_dso.so
fi &&
- # Builds nvidia-settings from source
- cd ../nvidia-settings-$VERSION &&
+ cd ..
+ if in_depends $MODULE "gtk+-2" ; then
+ # Builds nvidia-settings from source
+ cd nvidia-settings-$VERSION &&
- # xf86vmode.h has been removed in xf86vidmodeproto 2.3
- if [[ ! -e /usr/include/X11/extensions/xf86vmode.h ]] ; then
- sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c
- fi &&
+ # xf86vmode.h has been removed in xf86vidmodeproto 2.3
+ if [[ ! -e /usr/include/X11/extensions/xf86vmode.h ]] ; then
+ sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c
+ fi &&
- make clean &&
- make -C src/libXNVCtrl &&
+ make clean &&
+ make -C src/libXNVCtrl &&
# X_CFLAGS=$CFLAGS GL_INCLUDE_PATH=$SOURCE_DIRECTORY
- make
- if [[ $(arch) == x86_64 ]] ; then
- install -m 755 _out/Linux_x86_64/nvidia-settings ..
- install -m 644 _out/Linux_x86_64/nvidia-settings.1.gz ..
- else
- install -m 755 _out/Linux_x86/nvidia-settings ..
- install -m 644 _out/Linux_x86/nvidia-settings.1.gz ..
- fi &&
- install -m 644 doc/nvidia-settings.png .. &&
- install -m 644 doc/nvidia-settings.desktop .. &&
+ make &&
+ if [[ $(arch) == x86_64 ]] ; then
+ install -m 755 _out/Linux_x86_64/nvidia-settings .. &&
+ install -m 644 _out/Linux_x86_64/nvidia-settings.1.gz ..
+ else
+ install -m 755 _out/Linux_x86/nvidia-settings .. &&
+ install -m 644 _out/Linux_x86/nvidia-settings.1.gz ..
+ fi &&
+ sedit 's/__UTILS_PATH__/\/usr\/bin/' doc/nvidia-settings.desktop &&
+ sedit 's/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/' doc/nvidia-settings.desktop &&
+ sedit 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;DesktopSettings;/' doc/nvidia-settings.desktop &&
+ cd ..
+ fi &&
# Builds nvidia-xconfig from source
- cd ../nvidia-xconfig-$VERSION &&
+ cd nvidia-xconfig-$VERSION &&
make clean &&
make &&
if [[ $(arch) == x86_64 ]] ; then
- install -m 755 _out/Linux_x86_64/nvidia-xconfig ..
- install -m 644 _out/Linux_x86_64/nvidia-xconfig.1.gz ..
+ install -m 755 _out/Linux_x86_64/nvidia-xconfig .. &&
+ install -m 644 _out/Linux_x86_64/nvidia-xconfig.1.gz ..
else
- install -m 755 _out/Linux_x86/nvidia-xconfig ..
- install -m 644 _out/Linux_x86/nvidia-xconfig.1.gz ..
+ install -m 755 _out/Linux_x86/nvidia-xconfig .. &&
+ install -m 644 _out/Linux_x86/nvidia-xconfig.1.gz ..
fi &&
cd .. &&
- sedit 's/__UTILS_PATH__/\/usr\/bin/' nvidia-settings.desktop &&
- sedit 's/__PIXMAP_PATH__/\/usr\/share\/doc\/NVIDIA_GLX-1.0/' nvidia-settings.desktop &&
- sedit 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;DesktopSettings;/' nvidia-settings.desktop &&
# We make the kernel modules on our own
cd kernel &&
sedit "s@\$\(shell uname -r\)@`cat /usr/src/linux/include/config/kernel.release`@" Makefile.* makefile &&
# sedit "s/-O/$CFLAGS/" Makefile.nvidia &&
# NV_VERBOSE=0 EXTRA_CFLAGS=$CFLAGS ARCH=
- make SYSSRC=`cd /usr/src/linux; pwd -P` module &&
+ make module &&
rm -f $SOURCE_DIRECTORY/{libGL.so,libGLcore.so.1,libnvidia-tls.so.1} &&
prepare_install &&
- make SYSSRC=`cd /usr/src/linux; pwd -P` install &&
+ make install &&
# NV_VERBOSE=0 EXTRA_CFLAGS=$CFLAGS ARCH=
cd .. &&
@@ -115,7 +118,6 @@
install -m0444 nvidia.icd /etc/OpenCL/vendors &&
install -m0755 nvidia-bug-report.sh /usr/bin &&
install -m0755 nvidia-installer /usr/bin &&
- install -m0755 nvidia-settings /usr/bin &&
install -m0755 nvidia-smi /usr/bin &&
ln -sf /usr/bin/nvidia-installer /usr/bin/nvidia-uninstall &&
install -m0755 nvidia-xconfig /usr/bin &&
@@ -152,16 +154,20 @@
mkdir -p /usr/lib/xorg/modules/extensions &&
install -m0755 libglx.so.$VERSION /usr/lib/xorg/modules/extensions &&
- mkdir -p /usr/share/applications &&
- install -m0444 nvidia-settings.desktop /usr/share/applications &&
-
- mkdir -p /usr/share/doc/NVIDIA_GLX-1.0/html &&
+ mkdir -p /usr/share/{applications,doc/NVIDIA_GLX-1.0/html} &&
install -m0444 html/* /usr/share/doc/NVIDIA_GLX-1.0/html &&
- install -m0444 README.txt nvidia-settings.png LICENSE NVIDIA_Changelog /usr/share/doc/NVIDIA_GLX-1.0 &&
- install -m0444 nvidia-xconfig.1.gz nvidia-smi.1.gz nvidia-settings.1.gz nvidia-installer.1.gz /usr/share/man/man1 &&
+ install -m0444 README.txt LICENSE NVIDIA_Changelog /usr/share/doc/NVIDIA_GLX-1.0 &&
+ install -m0444 nvidia-xconfig.1.gz nvidia-smi.1.gz nvidia-installer.1.gz /usr/share/man/man1 &&
# Register Nvidia XvMC library for use in any XvMC enabled media player
- install -m644 XvMCConfig /etc/X11
+ install -m644 XvMCConfig /etc/X11 &&
+
+ if in_depends $MODULE "gtk+-2" ; then
+ install -m0755 nvidia-settings /usr/bin &&
+ install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.desktop /usr/share/applications &&
+ install -m0444 nvidia-settings-$VERSION/doc/nvidia-settings.png /usr/share/doc/NVIDIA_GLX-1.0 &&
+ install -m0444 nvidia-settings.1.gz /usr/share/man/man1
+ fi
) > $C_FIFO 2>&1
diff --git a/x11/NVIDIA/DEPENDS b/x11/NVIDIA/DEPENDS
index 936fc26..807ffc5 100644
--- a/x11/NVIDIA/DEPENDS
+++ b/x11/NVIDIA/DEPENDS
@@ -2,5 +2,7 @@ depends pciutils
depends ncurses
depends libXxf86vm
depends libvdpau
-depends gtk+-2
depends CUDA-OpenCL-headers
+
+# Optional, to break circular dependency between gtk+-2 and nvidia
+optional_depends "gtk+-2" "" "" "to build nvidia-settings"
More information about the Lunar-commits
mailing list