Mon Sep 21 01:51:26 CEST 2009

commit c8da75afa88db37903668e29f10e6b64fa04f488
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Sep 21 01:51:26 2009 +0200

    NVIDIA-beta: big changes
    What's new in Lunar release:
    *VDPAU libraries and headers removed - NVIDIA-beta depends now on libvdpau module
    (this is also the future for NVIDIA module when it reaches 190.32 or newer release)
    *libnvidia-wfb removed - this is just a hack to make Geforce8 or later working on
    X server which does not have libwfb.so library. libwfb.so is present since XOrg 1.3
    so we do not install it if XOrg7 is installed. This is probabely important only
    for XOrg6 module users.
    *Now we build as much as possible from sources:
    -Nvidia control panel,
    -Nvidia x configurator,
    -Nvidia installer.
    The last missing part to enjoy hw accelerated movies are VDPAU capable players and patched ffmpeg.
    I have almost ready modules: mplayer-vdpau (which covers ffmpeg and much more)
    and xine-vdpau. I will commit them when ready.
    If you use other player you will have to add it yourself.
    Other players known to have VDPAU: MythTV, XBMC, Boxee, vlc.
    At present only players from special vdpau branches of repositories have vdpau.
    Official releases from tarballs do not have it.
---
 x11/NVIDIA-beta/BUILD          |   49 +++++++++++++++++++++++++++++++++++++--
 x11/NVIDIA-beta/DEPENDS        |    3 ++
 x11/NVIDIA-beta/DETAILS        |   47 ++++++++++++++++++++++---------------
 x11/NVIDIA-beta/DETAILS.x86_64 |   47 ++++++++++++++++++++++---------------
 x11/NVIDIA-beta/PRE_BUILD      |    6 ++++-
 5 files changed, 110 insertions(+), 42 deletions(-)

diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index a6bf055..7a1b74a 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -1,5 +1,51 @@
 (
 
+  cd $SOURCE_DIRECTORY &&
+  rm -f nvidia-installer &&
+  rm -f usr/bin/mkprecompiled &&
+  rm -f usr/bin/tls_test &&
+  rm -f usr/bin/tls_test_dso.so &&
+  rm -f usr/share/man/man1/nvidia-installer.1.gz &&
+  rm -f usr/bin/nvidia-settings &&
+  rm -f usr/share/man/man1/nvidia-settings.1.gz &&
+  rm -f usr/bin/nvidia-xconfig &&
+  rm -f usr/share/man/man1/nvidia-xconfig.1.gz &&
+  rm -f usr/bin/nvidia-settings/nvidia-settings &&
+  if module_installed XOrg7 ; then
+  rm -f usr/X11R6/lib/modules/libnvidia-wfb.so*
+  fi &&
+  rm -f usr/lib/libvdpau.so* &&
+  rm -f usr/lib/libvdpau_trace.so* &&
+  rm -rf usr/include/vdpau &&
+  cd $SOURCE_DIRECTORY/nvidia-installer-$VERSION &&
+  rm -f libpci.a &&
+  rm -f *Linux* &&
+  sedit 's/Bstatic/Bdynamic/' Makefile &&
+  sedit 's/Bstatic/Bdynamic/' public.mk &&
+  make clean &&
+  make rebuild_tls_test &&
+  make rebuild_tls_test_dso &&
+  make rebuild_rtld_test &&
+  make &&
+  make install ROOT=$SOURCE_DIRECTORY &&
+  ARK=`uname -m | sed 's/i[3456]86/x86/'` &&
+  cp tls_test_`uname`-$ARK -f $SOURCE_DIRECTORY/usr/bin/tls_test &&
+  cp tls_test_dso_`uname`-$ARK.so -f $SOURCE_DIRECTORY/usr/bin/tls_test_dso.so &&
+  cd .. &&
+  cd $SOURCE_DIRECTORY/nvidia-settings-$VERSION &&
+  sedit 's/-O -DNDEBUG/-DNDEBUG/' Makefile &&
+  sedit '/CFLAGS = -Wall -g/d' src/XF86Config-parser/Makefile &&
+  make clean &&
+  make &&
+  make install ROOT=$SOURCE_DIRECTORY &&
+  cd .. &&
+  cd $SOURCE_DIRECTORY/nvidia-xconfig-$VERSION &&
+  sedit '/CFLAGS += -O/d' Makefile &&
+  sedit '/CFLAGS = -Wall -g/d' XF86Config-parser/Makefile &&
+  make clean &&
+  make &&
+  make install ROOT=$SOURCE_DIRECTORY &&
+
   # We make the kernel modules on our own
   cd $SOURCE_DIRECTORY/usr/src/nv &&
 
@@ -23,21 +69,18 @@
   mkdir -p /usr/lib/opengl/nvidia &&
 
   cd $SOURCE_DIRECTORY &&
-  cp -f nvidia-installer /usr/bin &&
   mkdir -p /usr/share/doc/NVIDIA_GLX-1.0/include &&
   cp -f LICENSE /usr/share/doc/NVIDIA_GLX-1.0/include &&
   cp -f usr/X11R6/lib/lib* /usr/lib &&
   cp -rf usr/X11R6/lib/modules /usr/X11/lib/xorg &&
 
   cd /usr/X11/lib/xorg/modules &&
-  ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1 &&
   cd /usr/X11/lib/xorg/modules/extensions &&
   ln -sf libglx.so.$VERSION libglx.so &&
 
   cd $SOURCE_DIRECTORY &&
   cp -f usr/bin/nvidia* /usr/bin &&
   cp -rf usr/include/cuda /usr/X11/include &&
-  cp -rf usr/include/vdpau /usr/X11/include &&
   cp -rf usr/include/GL /usr/share/doc/NVIDIA_GLX-1.0/include &&
   cp -rf usr/lib/tls /usr/lib &&
   cd /usr/lib/tls &&
diff --git a/x11/NVIDIA-beta/DEPENDS b/x11/NVIDIA-beta/DEPENDS
new file mode 100644
index 0000000..4f1c8eb
--- /dev/null
+++ b/x11/NVIDIA-beta/DEPENDS
@@ -0,0 +1,3 @@
+depends pciutils
+depends libvdpau
+depends gtk+-2
diff --git a/x11/NVIDIA-beta/DETAILS b/x11/NVIDIA-beta/DETAILS
index 9256f66..a217783 100644
--- a/x11/NVIDIA-beta/DETAILS
+++ b/x11/NVIDIA-beta/DETAILS
@@ -1,30 +1,39 @@
           MODULE=NVIDIA-beta
          VERSION=190.32
           SOURCE=NVIDIA-Linux-x86-$VERSION-pkg0.run
+         SOURCE2=nvidia-settings-$VERSION.tar.bz2
+         SOURCE3=nvidia-installer-$VERSION.tar.bz2
+         SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION-pkg0
-   SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[2]=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[3]=http://pl.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[4]=http://de.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[5]=http://uk.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[6]=http://es.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[7]=http://fr.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[8]=http://in.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-   SOURCE_URL[9]=http://sg.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[10]=http://cn.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[11]=http://tw.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[12]=http://jp.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[13]=http://kr.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[14]=http://ru.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[15]=http://it.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[16]=http://br.download.nvidia.com/XFree86/Linux-x86/$VERSION/
-  SOURCE_URL[17]=http://la.download.nvidia.com/XFree86/Linux-x86/$VERSION/
+   SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[2]=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[3]=http://pl.download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[4]=http://de.download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[5]=http://uk.download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[6]=http://es.download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[7]=http://fr.download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[8]=http://in.download.nvidia.com/XFree86/Linux-x86/$VERSION
+   SOURCE_URL[9]=http://sg.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[10]=http://cn.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[11]=http://tw.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[12]=http://jp.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[13]=http://kr.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[14]=http://ru.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[15]=http://it.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[16]=http://br.download.nvidia.com/XFree86/Linux-x86/$VERSION
+  SOURCE_URL[17]=http://la.download.nvidia.com/XFree86/Linux-x86/$VERSION
+     SOURCE2_URL=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
+     SOURCE3_URL=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
+     SOURCE4_URL=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
       SOURCE_VFY=sha1:cfbe17e056343f8bd2fbeb15cff411be0a7b128d
+     SOURCE2_VFY=sha1:4f79c8b9273ddcae87fac6bc2dc8dde292a0af4d
+     SOURCE3_VFY=sha1:af19fd1172b61bcd17ca7de15760241300a110df
+     SOURCE4_VFY=sha1:3531c1b55b8a1fe8eb653a5172b05c281fa9e73a
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20090905
+         UPDATED=20090919
            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 70fcc7c..b28023e 100644
--- a/x11/NVIDIA-beta/DETAILS.x86_64
+++ b/x11/NVIDIA-beta/DETAILS.x86_64
@@ -1,30 +1,39 @@
           MODULE=NVIDIA-beta
          VERSION=190.32
           SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg0.run
+         SOURCE2=nvidia-settings-$VERSION.tar.bz2
+         SOURCE3=nvidia-installer-$VERSION.tar.bz2
+         SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-pkg0
-   SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[2]=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[3]=http://pl.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[4]=http://de.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[5]=http://uk.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[6]=http://es.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[7]=http://fr.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[8]=http://in.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-   SOURCE_URL[9]=http://sg.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[10]=http://cn.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[11]=http://tw.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[12]=http://jp.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[13]=http://kr.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[14]=http://ru.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[15]=http://it.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[16]=http://br.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
-  SOURCE_URL[17]=http://la.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/
+   SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[2]=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[3]=http://pl.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[4]=http://de.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[5]=http://uk.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[6]=http://es.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[7]=http://fr.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[8]=http://in.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+   SOURCE_URL[9]=http://sg.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[10]=http://cn.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[11]=http://tw.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[12]=http://jp.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[13]=http://kr.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[14]=http://ru.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[15]=http://it.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[16]=http://br.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+  SOURCE_URL[17]=http://la.download.nvidia.com/XFree86/Linux-x86_64/$VERSION
+     SOURCE2_URL=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
+     SOURCE3_URL=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
+     SOURCE4_URL=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
       SOURCE_VFY=sha1:61223b400031cdd4fc9fb2eeca07abc0e855889b
+     SOURCE2_VFY=sha1:4f79c8b9273ddcae87fac6bc2dc8dde292a0af4d
+     SOURCE3_VFY=sha1:af19fd1172b61bcd17ca7de15760241300a110df
+     SOURCE4_VFY=sha1:3531c1b55b8a1fe8eb653a5172b05c281fa9e73a
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20090905
+         UPDATED=20090919
            SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF
diff --git a/x11/NVIDIA-beta/PRE_BUILD b/x11/NVIDIA-beta/PRE_BUILD
index aa47872..81a94fa 100644
--- a/x11/NVIDIA-beta/PRE_BUILD
+++ b/x11/NVIDIA-beta/PRE_BUILD
@@ -2,6 +2,10 @@
 
   cd $BUILD_DIRECTORY       &&
   rm -rf $SOURCE_DIRECTORY  &&
-  sh $SOURCE_CACHE/$SOURCE --extract-only
+  sh $SOURCE_CACHE/$SOURCE --extract-only &&
+  cd $SOURCE_DIRECTORY &&
+  unpack $SOURCE2 &&
+  unpack $SOURCE3 &&
+  unpack $SOURCE4
 
 )
