[Frugalware-git] frugalware-current: nvidia.sh

2011-03-21 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=86c9dde6302b68b53e6b0fc812ccd0d7685f3c54

commit 86c9dde6302b68b53e6b0fc812ccd0d7685f3c54
Author: Michel Hermier 
Date:   Mon Mar 21 08:55:54 2011 +0100

nvidia.sh

* Remove some old fixes.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 417fc5a..cdb295a 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -93,13 +93,11 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
# * conflicts: add libgl, libgl-headers and libglx to conflicts
# * provides: add libgl, libgl-headers and libglx to provides
# * options: add nostrip to options
-# * removes: temporary fix for some nvidia mess, has to be removed after 
Frugalware 1.3
###
rodepends=("${rodepends[@]}" 'libvdpau' 'nvidia-settings' 'nvidia-xconfig' 
'pkgconfig' 'xorg-server>=1.9.0')
conflicts=("${conflicts[@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
provides=("${provides[@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
options=("${options[@]}" 'nostrip')
-removes=("${removes[@]}" '/usr/lib/libOpenCL.so.1')

if [ "$pkgname" != "nvidia" ]; then
conflicts=("${conflicts[@]}" 'nvidia')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2010-04-08 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80c5bbc7b21825104707f0aaa1bff4e9da093283

commit 80c5bbc7b21825104707f0aaa1bff4e9da093283
Author: Michel Hermier 
Date:   Thu Apr 8 09:34:07 2010 +0200

nvidia.sh

* Attempt to allow a clean install (ldconfig symlink issue)

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 158abec..c16ceff 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -94,11 +94,13 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
# * conflicts: add libgl, libgl-headers and libglx to conflicts
# * provides: add libgl, libgl-headers and libglx to provides
# * options: add nostrip to options
+# * removes: temporary fix for some nvidia mess, has to be removed after 
Frugalware 1.3
###
rodepends=("${rodepen...@]}" 'libvdpau' 'nvidia-settings' 'nvidia-xconfig' 
'pkgconfig' 'xorg-server>=1.7.1')
conflicts=("${conflic...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
provides=("${provid...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
options=("${optio...@]}" 'nostrip')
+removes=("${remov...@]}" '/usr/lib/libOpenCL.so.1')

if [ "$pkgname" != "nvidia" ]; then
conflicts=("${conflic...@]}" 'nvidia')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2010-04-05 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0a38c8b7021dc8f648b6797e0b46b1a773087e3

commit b0a38c8b7021dc8f648b6797e0b46b1a773087e3
Author: Michel Hermier 
Date:   Mon Apr 5 18:08:25 2010 +0200

nvidia.sh

* Use nvidia-settings and nvidia-xconfig packages.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 8a66e95..158abec 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -95,7 +95,7 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
# * provides: add libgl, libgl-headers and libglx to provides
# * options: add nostrip to options
###
-rodepends=("${rodepen...@]}" 'libvdpau' 'pkgconfig' 'xorg-server>=1.7.1')
+rodepends=("${rodepen...@]}" 'libvdpau' 'nvidia-settings' 'nvidia-xconfig' 
'pkgconfig' 'xorg-server>=1.7.1')
conflicts=("${conflic...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
provides=("${provid...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
options=("${optio...@]}" 'nostrip')
@@ -235,12 +235,20 @@ Fbuild_nvidia() {
Fmkdir usr/man/man1
Ffilerel usr/share/man/man1/* /usr/man/man1/
Frm usr/man/man1/nvidia-installer.1.gz
-   Fsed "__UTILS_PATH__" "/usr/bin" 
$Fdestdir/usr/share/applications/nvidia-settings.desktop
-   Fsed "__PIXMAP_PATH__" "/usr/share/pixmaps" 
$Fdestdir/usr/share/applications/nvidia-settings.desktop

# Documentation
Fdocrel LICENSE usr/share/doc/*
Fln "$pkgname-$pkgver" "/usr/share/doc/$pkgname"
+
+   # Remove nvidia-setings
+   Frm /usr/bin/nvidia-settings
+   Frm /usr/man/man1/nvidia-settings.1.gz
+   Frm /usr/share/applications/nvidia-settings.\*
+   Frm /usr/share/pixmaps/nvidia-settings.\*
+
+   # Remove nvidia-xconfig
+   Frm /usr/bin/nvidia-xconfig
+   Frm /usr/man/man1/nvidia-xconfig.1.gz
}

build() {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2010-02-09 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d65d1fe61bb69dbdca9018fda742d981c4a39203

commit d65d1fe61bb69dbdca9018fda742d981c4a39203
Author: Michel Hermier 
Date:   Tue Feb 9 20:57:27 2010 +0100

nvidia.sh

* Renamed libgl-headers to libgl-headers-mesa (to follow mesa).

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index dca5945..9407943 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -92,14 +92,14 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
# * provides: add libgl, libgl-headers and libglx to provides
# * options: add nostrip to options
###
-depends=(${depen...@]} 'libvdpau' 'xorg-server>=1.7.1' 'pkgconfig')
-conflicts=(${conflic...@]} 'libgl' 'libgl-headers' 'libglx')
-provides=(${provid...@]} 'libgl' 'libgl-headers' 'libglx')
-options=(${optio...@]} 'nostrip')
+rodepends=("${rodepen...@]}" 'libvdpau' 'pkgconfig' 'xorg-server>=1.7.1')
+conflicts=("${conflic...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
+provides=("${provid...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
+options=("${optio...@]}" 'nostrip')

if [ "$pkgname" != "nvidia" ]; then
-   conflicts=(${conflic...@]} 'nvidia')
-   provides=(${provid...@]} 'nvidia')
+   conflicts=("${conflic...@]}" 'nvidia')
+   provides=("${provid...@]}" 'nvidia')
fi

###
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh * remove trailing whitespace

2010-01-22 Thread James Buren 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4bde760b55690f210f1b938d59ad63348edba129

commit 4bde760b55690f210f1b938d59ad63348edba129
Author: James Buren 
Date:   Sat Jan 23 01:31:54 2010 -0600

nvidia.sh
* remove trailing whitespace

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index e119556..984a69d 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -29,7 +29,7 @@
# * _F_nvidia_pkgnum (defaults guessed using _F_nvidia_arch): the nvidia 
package number
# * _F_nvidia_linkver (defaults to pkgver): the link number used by the nvidia 
shared libraries
# * _F_nvidia_install (defaults to nvidia.install): Install file
-# * _F_nvidia_legacyver (optionnal): version string has found at 
http://www.nvidia.com/object/unix.html
+# * _F_nvidia_legacyver (optionnal): version string has found at 
http://www.nvidia.com/object/unix.html
# * _F_nvidia_up2date (defaults depends of _F_nvidia_legacyver): an up2date 
grep string that will be followed
###
# General variables
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh nvidia.install

2009-07-07 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c08641805b7a1ed6287d217e62aabd59a8cc5ec1

commit c08641805b7a1ed6287d217e62aabd59a8cc5ec1
Author: Michel Hermier 
Date:   Sun Jul 5 15:56:20 2009 +0200

nvidia.sh nvidia.install

* Make nvidia package conflicts with libgl-headers.

diff --git a/source/include/nvidia.install b/source/include/nvidia.install
index 9f4d25a..ec7b9de 100644
--- a/source/include/nvidia.install
+++ b/source/include/nvidia.install
@@ -97,7 +97,7 @@ pre_remove() {
post_remove() {
/sbin/depmod -a $_F_kernelmod_uname
echo "*** Nvidia driver is removed now. To have a working Xorg Server again run 
: ***"
-   echo "*** pacman-g2 -S libgl libglx "
+   echo "*** pacman-g2 -S libgl libgl-headers libglx "
}

op=$1
diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 697475f..e119556 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -88,14 +88,14 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
###
# == APPENDED VARIABLES
# * depends: add xorg-server and pkgconfig to depends
-# * conflicts: add libgl and libglx to conflicts
-# * provides: add ligl and libglx to provides
+# * conflicts: add libgl, libgl-headers and libglx to conflicts
+# * provides: add libgl, libgl-headers and libglx to provides
# * options: add nostrip to options
# * removes: temporary fix for some nvidia mess, has to be removed after 
Frugalware 1.0
###
depends=(${depen...@]} 'xorg-server>=1.6.1-8' 'pkgconfig')
-conflicts=(${conflic...@]} 'libgl' 'libglx')
-provides=(${provid...@]} 'libgl' 'libglx')
+conflicts=(${conflic...@]} 'libgl' 'libgl-headers' 'libglx')
+provides=(${provid...@]} 'libgl' 'libgl-headers' 'libglx')
options=(${optio...@]} 'nostrip')
removes=(${remov...@]} 'usr/lib/libcuda.so.1' 'usr/lib/libnvidia-cfg.so.1')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2009-03-12 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2da433f3ab3c5af8dc98eb47a456de803bf7d1cc

commit 2da433f3ab3c5af8dc98eb47a456de803bf7d1cc
Author: Michel Hermier 
Date:   Thu Mar 12 21:23:58 2009 +0100

nvidia.sh
* Update the source url, ftp lacks some sources sometimes.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index c21e399..94ef437 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -77,7 +77,8 @@ groups=('x11-extra')
pkgdesc="3D accelerated display driver for Nvidia cards"
url="http://www.nvidia.com/object/unix.html";
if [ -n "$_F_nvidia_arch" ]; then
-   
source=(ftp://download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
+   
source=(http://us.download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
+#  
source=(ftp://download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
fi
up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 
'"$_F_nvidia_up2date"'|sed 's/.*]//;s/-/_/'"
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2008-11-19 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17823b4fdf507fea98aa0ddbc5810da7b23dc119

commit 17823b4fdf507fea98aa0ddbc5810da7b23dc119
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Wed Nov 19 22:53:13 2008 +0100

nvidia.sh
* Fix typo noticed by phayz (affect versions >=180)

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 6bd457a..cfbd9a8 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -152,7 +152,7 @@ Fbuild_nvidia() {
Fmkdir usr/include/cuda
Ffilerel usr/include/cuda/* /usr/include/cuda/
fi
-   if [ -d usr/unclude/vdpau ]; then
+   if [ -d usr/include/vdpau ]; then
Fmkdir usr/include/vdpau
Ffilerel usr/include/vdpau/* /usr/include/vdpau/
fi
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2008-11-19 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18ae2c0d8f9e172c380e1f97f088019c6c254cbe

commit 18ae2c0d8f9e172c380e1f97f088019c6c254cbe
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Wed Nov 19 12:33:28 2008 +0100

nvidia.sh
* Add changes for the pure video libs that commes with versions 180+

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 91e31ad..6bd457a 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -152,6 +152,10 @@ Fbuild_nvidia() {
Fmkdir usr/include/cuda
Ffilerel usr/include/cuda/* /usr/include/cuda/
fi
+   if [ -d usr/unclude/vdpau ]; then
+   Fmkdir usr/include/vdpau
+   Ffilerel usr/include/vdpau/* /usr/include/vdpau/
+   fi

# Install the xorg modules
Fmkdir usr/lib/xorg/modules/drivers
@@ -189,6 +193,18 @@ Fbuild_nvidia() {
Fln "libcuda.so.$_F_nvidia_linkver" "/usr/lib/libcuda.so"
Fln "libcuda.so.$_F_nvidia_linkver" "/usr/lib/libcuda.so.1"
fi
+   if [ -e "usr/lib/libvdpau.so.$_F_nvidia_linkver" ]; then
+   Fln "libvdpau.so.$_F_nvidia_linkver" "/usr/lib/libvdpau.so"
+   Fln "libvdpau.so.$_F_nvidia_linkver" "/usr/lib/libvdpau.so.1"
+   fi
+   if [ -e "usr/lib/libvdpau_nvidia.so.$_F_nvidia_linkver" ]; then
+   Fln "libvdpau_nvidia.so.$_F_nvidia_linkver" 
"/usr/lib/libvdpau_nvidia.so"
+   Fln "libvdpau_nvidia.so.$_F_nvidia_linkver" 
"/usr/lib/libvdpau_nvidia.so.1"
+   fi
+   if [ -e "usr/lib/libvdpau_trace.so.$_F_nvidia_linkver" ]; then
+   Fln "libvdpau_trace.so.$_F_nvidia_linkver" 
"/usr/lib/libvdpau_trace.so"
+   Fln "libvdpau_trace.so.$_F_nvidia_linkver" 
"/usr/lib/libvdpau_trace.so.1"
+   fi

# Weird TLS stuff
Fmkdir usr/lib/tls
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2008-10-22 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=881ae97e7d77f778bc4e5d9578e300271ce35754

commit 881ae97e7d77f778bc4e5d9578e300271ce35754
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Wed Oct 22 18:57:32 2008 +0200

nvidia.sh
* Add some removes definitions required for stable upgrade.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index a9c4b9b..91e31ad 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -90,11 +90,13 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
# * conflicts: add libgl and libglx to conflicts
# * provides: add ligl and libglx to provides
# * options: add nostrip to options
+# * removes: temporary fix for some nvidia mess, has to be removed after 
Frugalware 1.0
###
depends=([EMAIL PROTECTED] 'xorg-server>=1.1.0' 'pkgconfig')
conflicts=([EMAIL PROTECTED] 'libgl' 'libglx')
provides=([EMAIL PROTECTED] 'libgl' 'libglx')
options=([EMAIL PROTECTED] 'nostrip')
+removes=([EMAIL PROTECTED] 'usr/lib/libcuda.so.1' 'usr/lib/libnvidia-cfg.so.1')

if [ "$pkgname" != "nvidia" ]; then
conflicts=([EMAIL PROTECTED] 'nvidia')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2008-10-18 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0c17eb156a0aa654fb8830b0360f0902dedb8cb3

commit 0c17eb156a0aa654fb8830b0360f0902dedb8cb3
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Sat Oct 18 14:08:01 2008 +0200

nvidia.sh
* Don't check on absolute path, we check inside the package for
libraries being present.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 4309750..c47f1f1 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -155,7 +155,7 @@ Fbuild_nvidia() {
Fmkdir usr/lib/xorg/modules/extensions
Fexerel usr/X11R6/lib/modules/extensions/*.so* /usr/lib/xorg/modules/extensions/
Fln "libglx.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/extensions/libglx.so"
-   if [ -e "usr/lib/xorg/modules/libnvidia-wfb.so.$_F_nvidia_linkver" ]; 
then
+   if [ -e "usr/X11R6/lib/modules/libnvidia-wfb.so.$_F_nvidia_linkver" ]; 
then
Fexerel usr/X11R6/lib/modules/libnvidia-wfb.so* /usr/lib/xorg/modules/
Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so"
Fln "libnvidia-wfb.so.$_F_nvidia_linkver" "/usr/lib/xorg/modules/libwfb.so"
@@ -177,11 +177,11 @@ Fbuild_nvidia() {
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so.1"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so.1"
-   if [ -e "/usr/lib/libnvidia-cfg.so.$_F_nvidia_linkver" ]; then
+   if [ -e "usr/lib/libnvidia-cfg.so.$_F_nvidia_linkver" ]; then
Fln "libnvidia-cfg.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-cfg.so"
Fln "libnvidia-cfg.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-cfg.so.1"
fi
-   if [ -e "/usr/lib/libcuda.so.$_F_nvidia_linkver" ]; then
+   if [ -e "usr/lib/libcuda.so.$_F_nvidia_linkver" ]; then
Fln "libcuda.so.$_F_nvidia_linkver" "/usr/lib/libcuda.so"
Fln "libcuda.so.$_F_nvidia_linkver" "/usr/lib/libcuda.so.1"
fi
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2008-10-16 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0174a65ddff0cfbeb7b90f8d74d0c6d9b189ec29

commit 0174a65ddff0cfbeb7b90f8d74d0c6d9b189ec29
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Thu Oct 16 22:37:49 2008 +0200

nvidia.sh
* Reorganised the build method, now we build the kernel module before
installing the binaries, and some missing includes, symlinks ...

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 41e614e..4309750 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -127,62 +127,84 @@ Fbuild_nvidia() {
Fcd
Fpatchall

+   # Build the kernel module
+   cd usr/src/nv || Fdie
+   ln -s Makefile.kbuild Makefile || Fdie
+   make SYSSRC=$_F_kernelmod_dir/build module || Fdie
+   cd ../../.. || Fdie
+
+   # Install the kernel module
+   Ffilerel usr/src/nv/nvidia.ko 
$_F_kernelmod_dir/kernel/drivers/video/nvidia.ko
+   Fbuild_nvidia_scriptlet
+
# Install the binaries
Fexerel usr/bin/nvidia-* /usr/bin/

-   # Xorg modules
-   Fmkdir usr/lib/xorg/
-   Fcp $_F_cd_path/usr/X11R6/lib/modules /usr/lib/xorg/modules
+   # Install the includes
+   # GL includes conflicts with mesa ones, remove for now
+#  Fmkdir usr/include/GL/
+#  Ffilerel usr/include/GL/* /usr/include/GL/
+   if [ -d usr/include/cuda ]; then
+   Fmkdir usr/include/cuda
+   Ffilerel usr/include/cuda/* /usr/include/cuda/
+   fi
+
+   # Install the xorg modules
+   Fmkdir usr/lib/xorg/modules/drivers
+   Fexerel usr/X11R6/lib/modules/drivers/*.so* 
/usr/lib/xorg/modules/drivers/
+   Fmkdir usr/lib/xorg/modules/extensions
+   Fexerel usr/X11R6/lib/modules/extensions/*.so* 
/usr/lib/xorg/modules/extensions/
+   Fln "libglx.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/extensions/libglx.so"
+   if [ -e "usr/lib/xorg/modules/libnvidia-wfb.so.$_F_nvidia_linkver" ]; 
then
+   Fexerel usr/X11R6/lib/modules/libnvidia-wfb.so* 
/usr/lib/xorg/modules/
+   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so"
+   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libwfb.so"
+   fi

-   # Libraries
+   # Install the libraries
Fexerel usr/lib/*.so* /usr/lib/
Fexerel usr/lib/libGL.la /usr/lib/libGL.la
+   Fexerel usr/X11R6/lib/*.so* /usr/lib/
Fsed "__LIBGL_PATH__" "/usr/lib" $Fdestdir/usr/lib/libGL.la
-
-   # Weird TLS stuff
-   Fmkdir usr/lib/tls
-   Fexerel usr/lib/tls/*.so* /usr/lib/tls/
-   Fexerel usr/X11R6/lib/libXv* /usr/lib/
-
-   # Data
-   Fmkdir usr/share
-   Fcp $_F_cd_path/usr/share/pixmaps /usr/share/
-   Fcp $_F_cd_path/usr/share/applications /usr/share/
-   Fcp $_F_cd_path/usr/share/man /usr/
-   Frm usr/man/man1/nvidia-installer.1.gz
-   Fsed "__UTILS_PATH__" "/usr/bin" 
$Fdestdir/usr/share/applications/nvidia-settings.desktop
-   Fsed "__PIXMAP_PATH__" "/usr/share/pixmaps" 
$Fdestdir/usr/share/applications/nvidia-settings.desktop
-
-   # Library links
Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so"
Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so.1"
Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so.1.2"
+   Fln "libGLcore.so.$_F_nvidia_linkver" "/usr/lib/libGLcore.so"
Fln "libGLcore.so.$_F_nvidia_linkver" "/usr/lib/libGLcore.so.1"
-   Fln "libnvidia-cfg.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-cfg.so.1"
-   Fln "libnvidia-cfg.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-cfg.so"
+   Fln "libnvidia-tls.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-tls.so"
Fln "libnvidia-tls.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-tls.so.1"
-   Fln "libnvidia-tls.so.$_F_nvidia_linkver" 
"/usr/lib/tls/libnvidia-tls.so.1"
-   Fln "libglx.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/extensions/libglx.so"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so.1"
+   Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" 
"/usr/lib/libXvMCNVIDIA_dynamic.so"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so.1"
-   if [ -e "/usr/lib/xorg/modules/libnvidia-wfb.so.$_F_nvidia_linkver" ]; 
then
-   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so"
-   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so.1"
-   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libwfb.so"
+   if [ -e "/usr/lib/libnvidia-cfg.so.$_F_nvidia_linkver" ]; then
+   Fln "libnvidia-cfg.so.$_F_nvidia_linkver" 
"/usr/lib/libnvidia-cfg.so"
+   Fln "libnvidia-cfg.so.$_F_nvidia_linkver" 
"/usr/lib/libnvidia-cfg.so.1"
+   fi
+   if [ -e "/usr/lib/libcuda.so.$_F_nvidia_linkver" ]; then
+   Fln "libcuda.so.$_F_nvidia_linkver" "/usr/lib/libcuda.so"
+

[Frugalware-git] frugalware-current: nvidia.sh

2008-10-08 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=726613567f802dcdeb95b3bb6fdbe0b08cf9df6c

commit 726613567f802dcdeb95b3bb6fdbe0b08cf9df6c
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Wed Oct 8 19:57:43 2008 +0200

nvidia.sh
* Do not die if CARCH is not found.
* Added some options to help to up2date search for legacy drivers.
* Do not symlink one of the lib not present in earlier legacy version.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index c22a608..41e614e 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -29,6 +29,8 @@
# * _F_nvidia_pkgnum (defaults guessed using _F_nvidia_arch): the nvidia 
package number
# * _F_nvidia_linkver (defaults to pkgver): the link number used by the nvidia 
shared libraries
# * _F_nvidia_install (defaults to nvidia.install): Install file
+# * _F_nvidia_legacyver (optionnal): version string has found at 
http://www.nvidia.com/object/unix.html
+# * _F_nvidia_up2date (defaults depends of _F_nvidia_legacyver): an up2date 
grep string that will be followed
###
# General variables
if [ -z "$_F_nvidia_arch" ]; then
@@ -36,17 +38,12 @@ if [ -z "$_F_nvidia_arch" ]; then
_F_nvidia_arch=x86
elif [ "$CARCH" == "x86_64" ]; then
_F_nvidia_arch=x86_64
-   else
-   Fmessage "Unkown nvidia arch for $CARCH"
-   Fdie
fi
fi
if [ -z "$_F_nvidia_pkgnum" ]; then
case "$_F_nvidia_arch" in
x86)_F_nvidia_pkgnum=1;;
x86_64) _F_nvidia_pkgnum=2;;
-   *)  Fmessage "Unkown default nvidia pkgnum for $_F_nvidia_arch"
-   Fdie
esac
fi
if [ -z "$_F_nvidia_name" ]; then
@@ -58,6 +55,13 @@ fi
if [ -z "$_F_nvidia_install" ]; then
_F_nvidia_install="nvidia.install"
fi
+if [ -z "$_F_nvidia_up2date" ]; then
+   if [ -z "$_F_nvidia_legacyver" ]; then
+   _F_nvidia_up2date="Latest Version:"
+   else
+   _F_nvidia_up2date="Latest Legacy GPU Version 
($_F_nvidia_legacyver series):"
+   fi
+fi

###
# == OVERWRITTEN VARIABLES
@@ -71,9 +75,9 @@ fi
###
groups=('x11-extra')
pkgdesc="3D accelerated display driver for Nvidia cards"
-url="http://www.nvidia.com/object/linux_display_archive.html";
-source=(ftp://download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
-up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest 
Version:'|sed 's/.*]//;s/-/_/'"
+url="http://www.nvidia.com/object/unix.html";
+source=(http://us.download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
+up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 
'"$_F_nvidia_up2date"'|sed 's/.*]//;s/-/_/'"

_F_cd_path=$_F_nvidia_name
_F_kernelmod_scriptlet=$_F_nvidia_install
@@ -162,9 +166,11 @@ Fbuild_nvidia() {
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so.1"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so.1"
-   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so"
-   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so.1"
-   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libwfb.so"
+   if [ -e "/usr/lib/xorg/modules/libnvidia-wfb.so.$_F_nvidia_linkver" ]; 
then
+   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so"
+   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libnvidia-wfb.so.1"
+   Fln "libnvidia-wfb.so.$_F_nvidia_linkver" 
"/usr/lib/xorg/modules/libwfb.so"
+   fi

# Kernel module
cd usr/src/nv || Fdie
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh nvidia.install

2008-10-06 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4df142775db25b766021ce6a7205106e2e58860

commit a4df142775db25b766021ce6a7205106e2e58860
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Mon Oct 6 20:12:41 2008 +0200

nvidia.sh nvidia.install
* Point the install comment to the correct documentation path.

diff --git a/source/include/nvidia.install b/source/include/nvidia.install
index 568aa79..4aa4e9c 100644
--- a/source/include/nvidia.install
+++ b/source/include/nvidia.install
@@ -1,6 +1,6 @@
post_install() {
echo "*** In order to use this package you have to accept Nvidia's license 
which"
-   echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE."
+   echo "*** can be found at /usr/share/doc/$pkgname-$pkgver/LICENSE."
echo "*** If you don't accept it, please remove the package!"

if [ -e /etc/X11/xorg.conf ]; then
diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 88cdbc9..c22a608 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -104,10 +104,19 @@ Finclude kernel-module

###
# == PROVIDED FUNCTIONS
+# * Fbuild_nvidia_scriptlet: Build the nvidia scriplet
# * Fbuild_nvidia: Builds the software
# * build(): just calls Fbuild_nvidia
###

+Fbuild_nvidia_scriptlet()
+{
+   cp $Fincdir/nvidia.install ${Fsrcdir%/src}
+   Fsed '$pkgname' "$pkgname" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet
+   Fsed '$pkgver' "$pkgver" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet
+   Fbuild_kernelmod_scriptlet
+}
+
Fbuild_nvidia() {
cd $Fsrcdir
sh $_F_nvidia_name.run --extract-only
@@ -163,10 +172,7 @@ Fbuild_nvidia() {
make SYSSRC=$_F_kernelmod_dir/build module || Fdie
cd ../../.. || Fdie
Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko
-
-   # Kernel module scriptlet
-   cp $Fincdir/nvidia.install ${Fsrcdir%/src}
-   Fbuild_kernelmod_scriptlet
+   Fbuild_nvidia_scriptlet

# Documentation
Fdoc $_F_cd_path/LICENSE
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: nvidia.sh

2008-10-05 Thread Michel Hermier 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57a91a3b9aea9a2fb3f5f0ca39e68505facab7c0

commit 57a91a3b9aea9a2fb3f5f0ca39e68505facab7c0
Author: Michel Hermier <[EMAIL PROTECTED]>
Date:   Mon Oct 6 07:47:28 2008 +0200

nvidia.sh
* Add nvidia.sh to help the build of the nvidia modules.
Will be used in current and in the nvidia-beta repository.

diff --git a/source/include/nvidia.install b/source/include/nvidia.install
new file mode 100644
index 000..568aa79
--- /dev/null
+++ b/source/include/nvidia.install
@@ -0,0 +1,71 @@
+post_install() {
+   echo "*** In order to use this package you have to accept Nvidia's 
license which"
+   echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE."
+   echo "*** If you don't accept it, please remove the package!"
+
+   if [ -e /etc/X11/xorg.conf ]; then
+   sed -i 's/^.*Load  "dri"/# Load  "dri"/' /etc/X11/xorg.conf
+   sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' 
/etc/X11/xorg.conf
+   else
+   echo "WARNING: /etc/X11/xorg.conf does not exist!"
+   fi
+
+   exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l`
+   if [ "$exist" -eq 0 ]; then
+   echo nvidia >> /etc/sysconfig/modules
+   fi
+   /sbin/depmod -ea $_F_kernelmod_uname
+   ## if nvidia dependent kernel is the current kernel
+   if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then
+   ## Try to load it
+   /sbin/modprobe nvidia
+   fi
+}
+
+post_upgrade() {
+   echo -n "Runing depmod for nvidia kernel module for kernel 
$_F_kernelmod_uname ..."
+   /sbin/depmod -ea $_F_kernelmod_uname
+   echo " done."
+## if that exisit we bumped / upgraded the package only no new kernel
+   ## on a new kernel we do nothing because one has to reboot anyway
+   if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then
+   ## see if is loaded , if yes kill it and modprobe again if not 
do nothing
+   if grep -q nvidia /proc/modules; then
+   echo -n "Reloading nvidia kernel module.."
+   modprobe --remove nvidia
+   sleep 1
+   modprobe nvidia
+   echo " done."
+   fi
+   fi
+}
+
+pre_remove() {
+   if test `lsmod | grep ^nvidia | wc -l` -gt 0; then
+   /sbin/modprobe --remove nvidia
+   fi
+
+   if [ -e /etc/X11/xorg.conf ]; then
+   sed -i 's/^.*# Load  "dri"/Load  "dri"/' /etc/X11/xorg.conf
+   sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf
+   fi
+
+   exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l`
+   if [ "$exist" -eq 1 ]; then
+   grep -v '^nvidia' /etc/sysconfig/modules > 
/etc/sysconfig/modules.tmp
+   mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules
+   fi
+if [ -e /usr/lib/xorg/temp/libglx.so ]; then
+mv /usr/lib/xorg/temp/libglx.so 
/usr/lib/xorg/modules/extensions/
+fi
+}
+
+post_remove() {
+   /sbin/depmod -a $_F_kernelmod_uname
+   echo "*** Nvidia driver is removed now. To have a working Xorg Server 
again run : ***"
+   echo "*** pacman-g2 -S libgl libglx "
+}
+
+op=$1
+shift
+$op $*
diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
new file mode 100644
index 000..88cdbc9
--- /dev/null
+++ b/source/include/nvidia.sh
@@ -0,0 +1,179 @@
+#!/bin/sh
+
+###
+# = nvidia.sh(3)
+# Michel Hermier <[EMAIL PROTECTED]>
+#
+# == NAME
+# nvidia.sh - for Frugalware
+#
+# == SYNOPSIS
+# Common schema for nVidia packages.
+#
+# == EXAMPLE
+# --
+# pkgname=nvidia
+# pkgver=173.14.12
+# pkgrel=3
+# archs=('i686' 'x86_64')
+# Finclude nvidia
+# case "$_F_nvidia_arch" in
+# x86)sha1sums=('01d297c477b95593e9fbf5c73e501a4f5617b497');;
+# x86_64) sha1sums=('78d3034314df7f9c95526707d7fcf4543f5993ed');;
+# esac
+# --
+#
+# == OPTIONS
+# * _F_nvidia_name (defaults to 
NVIDIA-Linux-$_F_nvidia_arch-$pkgver-pkg$F_nvidia_pkgnum): the nvidia package 
name
+# * _F_nvidia_arch (defaults guessed using CARCH): the nvidia package arch
+# * _F_nvidia_pkgnum (defaults guessed using _F_nvidia_arch): the nvidia 
package number
+# * _F_nvidia_linkver (defaults to pkgver): the link number used by the nvidia 
shared libraries
+# * _F_nvidia_install (defaults to nvidia.install): Install file
+###
+# General variables
+if [ -z "$_F_nvidia_arch" ]; then
+   if echo "$CARCH" | grep -q 'i.86'; then
+   _F_nvidia_arch=x86
+   elif [ "$CARCH" == "x86_64" ]; then
+   _F_nvidia_arch=x86_64
+   else
+   Fmessage "Unkown nvidia arch for $CARCH"
+   Fdie
+   fi
+fi
+if [ -z "$_F_nvidia_pkgnum" ]; then
+   case "$_