Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD

3 files changed, 57 insertions, 75 deletions

diff --git a/abs/core-testing/nvidia-96xx-utils/PKGBUILD b/abs/core-testing/nvidia-96xx-utils/PKGBUILD
index 749dc08..7442a21 100644
--- a/abs/core-testing/nvidia-96xx-utils/PKGBUILD
+++ b/abs/core-testing/nvidia-96xx-utils/PKGBUILD
@@ -1,65 +1,63 @@
-# $Id: PKGBUILD 18827 2008-11-09 14:01:28Z jgc $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
+# $Id: PKGBUILD 69361 2010-02-20 11:24:49Z tpowa $
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-96xx-utils
-pkgver=96.43.09
+pkgver=96.43.16
 pkgrel=1
-pkgdesc="NVIDIA legacy drivers utilities and libraries, 96xx branch."
-arch=(i686 x86_64)
-license=('custom')
+pkgdesc="NVIDIA drivers utilities and libraries, 96xx branch."
+arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86 	 
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
 depends=('xorg-server')
-conflicts=('libgl' 'libgl-dri' 'ati-fglrx-utils' 'nvidia-utils' \
-           'nvidia-71xx-utils' 'nvidia-legacy-utils')
+optdepends=('gtk2: nvidia-settings' 'pkgconfig: nvidia-xconfig')
+conflicts=('libgl')
 provides=('libgl')
-install=nvidia-96xx.install
-source=(http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run \
-        supported-cards.txt)
-md5sums=('758c739114b81ea2cb7da7c22ab80a7e'
-         '6363d7e494d33729609540088e33e73f')
-[ "$CARCH" = "x86_64" ] && md5sums=('c03bd2469292d91dde8767af1418c4e1'
-         '6363d7e494d33729609540088e33e73f')
-options=(docs !strip)
+license=('custom')
+install=nvidia.install
+options=(!strip)
+source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run")
+md5sums=('7479b25c747e29af95b9ccf06f43fbf9')
+[ "$CARCH" = "x86_64" ] && md5sums=('73e226d4ee0996b6df4bdf44cc1fc6f5')
+
+build() {
+	cd $srcdir
+	sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run --extract-only
+	cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/
+
+	mkdir -p $pkgdir/usr/{lib,bin,share/applications,share/pixmaps,share/man/man1}
+	mkdir -p $pkgdir/usr/lib/xorg/modules/{extensions,drivers}
+	mkdir -p $pkgdir/usr/share/licenses/nvidia-96xx/
 
-build()
-{
-  # override nvida install routine and do it the long way.
-  cd $startdir/src/
-  sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run --extract-only
-  cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/
+	install lib/{libGLcore,libGL,libnvidia-cfg,tls/libnvidia-tls}.so.${pkgver} \
+	$pkgdir/usr/lib/ || return 1
+	install -m644 share/man/man1/* $pkgdir/usr/share/man/man1/ || return 1
+	rm $pkgdir/usr/share/man/man1/nvidia-installer.1.gz || return 1
+	install X11R6/lib/libXv* $pkgdir/usr/lib/ || return 1
+	install -m644 share/applications/nvidia-settings.desktop $pkgdir/usr/share/applications/ || return 1
+	# fix nvidia .desktop file
+	sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $pkgdir/usr/share/applications/nvidia-settings.desktop
+	install -m644 share/pixmaps/nvidia-settings.png $pkgdir/usr/share/pixmaps/ || return 1
+	install X11R6/lib/modules/drivers/nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers || return 1
+	install X11R6/lib/modules/extensions/libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions || return 1
+	install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $pkgdir/usr/bin/ || return 1
+	cd $pkgdir/usr/lib/
+	ln -s libGL.so.$pkgver libGL.so || return 1
+	ln -s libGL.so.$pkgver libGL.so.1 || return 1
+	ln -s libGLcore.so.$pkgver libGLcore.so.1 || return 1
+	ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 || return 1
+	ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1
+	ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 || return 1
 
-  mkdir -p $startdir/pkg/usr/{lib,bin,share/applications,share/pixmaps,share/man/man1}
-  mkdir -p $startdir/pkg/usr/lib/xorg/modules/{extensions,drivers}
-  mkdir -p $startdir/pkg/usr/share/licenses/nvidia-96xx/
-  
-  install lib/{libGLcore.so.${pkgver},libGL.so.${pkgver},libnvidia-cfg.so.${pkgver},tls/libnvidia-tls.so.${pkgver}} \
-       $startdir/pkg/usr/lib/ || return 1
-  install -m644 share/man/man1/* $startdir/pkg/usr/share/man/man1/ || return 1
-  rm $startdir/pkg/usr/share/man/man1/nvidia-installer.1.gz || return 1
-  install X11R6/lib/libXv* $startdir/pkg/usr/lib/ || return 1
-  install -m644 share/applications/nvidia-settings.desktop $startdir/pkg/usr/share/applications/ || return 1
-  # fix nvidia .desktop file
-  sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $startdir/pkg/usr/share/applications/nvidia-settings.desktop
-  install -m644 share/pixmaps/nvidia-settings.png $startdir/pkg/usr/share/pixmaps/ || return 1
-  install X11R6/lib/modules/drivers/nvidia_drv.so $startdir/pkg/usr/lib/xorg/modules/drivers || return 1
-  install X11R6/lib/modules/extensions/libglx.so.$pkgver $startdir/pkg/usr/lib/xorg/modules/extensions || return 1
-  install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $startdir/pkg/usr/bin/ || return 1
-  cd $startdir/pkg/usr/lib/
-  ln -s /usr/lib/libGL.so.$pkgver libGL.so || return 1
-  ln -s /usr/lib/libGL.so.$pkgver libGL.so.1 || return 1
-  ln -s /usr/lib/libGLcore.so.$pkgver libGLcore.so.1 || return 1
-  ln -s /usr/lib/libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 || return 1
-  ln -s /usr/lib/libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1
-  cd $startdir/pkg/usr/lib/xorg/modules/extensions
-  ln -s /usr/lib/xorg/modules/extensions/libglx.so.$pkgver libglx.so || return 1
+	cd $pkgdir/usr/lib/xorg/modules/extensions
+	ln -s libglx.so.$pkgver libglx.so || return 1
 
-  install -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $startdir/pkg/usr/share/licenses/nvidia-96xx/ || return 1
-  install -D -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $startdir/pkg/usr/share/doc/nvidia/README || return 1
-  install -D -m644 $startdir/src/supported-cards.txt $startdir/pkg/usr/share/doc/nvidia/supported-cards.txt || return 1
-  
-  find $startdir/pkg/usr -type d -exec chmod 755 {} \;
-  # phew :)
+	install -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $pkgdir/usr/share/licenses/nvidia-96xx/ || return 1
+	ln -s nvidia-96xx $startdir/pkg/usr/share/licenses/nvidia-96xx-utils || return 1
+
+	install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia-96xx/README || return 1
+
+	find $pkgdir/usr -type d -exec chmod 755 {} \;
 }
+
+
diff --git a/abs/core-testing/nvidia-96xx-utils/nvidia-96xx.install b/abs/core-testing/nvidia-96xx-utils/nvidia-96xx.install
deleted file mode 100644
index bb1fff2..0000000
--- a/abs/core-testing/nvidia-96xx-utils/nvidia-96xx.install
+++ /dev/null
@@ -1,22 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-
-  echo -------------------------------
-  echo By using this package you accept the NVIDIA license, 
-  echo which has been installed in /usr/share/licenses/nvidia/LICENSE
-  echo If you do not accept this license, you must remove the package immediately.
-  echo Dont forget to update your /etc/X11/xorg.conf
-  echo In order to use nvidia-settings, you need to install 'gtk2' package.
-  echo -------------------------------
-	 
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/core-testing/nvidia-96xx-utils/nvidia.install b/abs/core-testing/nvidia-96xx-utils/nvidia.install
new file mode 100644
index 0000000..0a878a7
--- /dev/null
+++ b/abs/core-testing/nvidia-96xx-utils/nvidia.install
@@ -0,0 +1,6 @@
+post_install() {
+	echo By using this package you accept the NVIDIA license,
+	echo which has been installed in /usr/share/licenses/nvidia/LICENSE
+	echo If you do not accept this license, you must remove the package immediately.
+	echo Dont forget to update your /etc/X11/xorg.conf
+}