[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-09-24 Thread Laurent Carlier 
Date: Sunday, September 24, 2017 @ 10:33:33
  Author: lcarlier
Revision: 306182

upgpkg: nvidia-304xx-utils 304.137-1

upstream update 304.137

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-24 10:27:29 UTC (rev 306181)
+++ PKGBUILD2017-09-24 10:33:33 UTC (rev 306182)
@@ -4,8 +4,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.135
-pkgrel=6
+pkgver=304.137
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -15,8 +15,8 @@
 
source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
 
source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
 md5sums=('a433deeb5f9cc661e537f42bde2f1df7')
-md5sums_i686=('0e2082ae8490b135eb306befe6db56e1')
-md5sums_x86_64=('8ee9bd0b020508bca9953181811422fa')
+md5sums_i686=('133098e70581f6b81c481338cc20f100')
+md5sums_x86_64=('485506ee6a7c54780488dacddf1d56b1')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-27 Thread Laurent Carlier 
Date: Monday, February 27, 2017 @ 13:05:50
  Author: lcarlier
Revision: 289622

upgpkg: nvidia-304xx-utils 304.135-5

reintroduce nvidia-utils provides/conflicts (FS#53067)

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-27 12:51:54 UTC (rev 289621)
+++ PKGBUILD2017-02-27 13:05:50 UTC (rev 289622)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.135
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -65,8 +65,8 @@
   optdepends=('gtk2: nvidia-settings'
   'pkg-config: nvidia-xconfig'
   'opencl-nvidia-304xx: OpenCL support')
-  conflicts=('nvidia-304xx-libgl' 'nvidia-340xx-utils')
-  provides=('libgl' 'libgles' 'libegl' 'nvidia-304xx-libgl')
+  conflicts=('nvidia-304xx-libgl' 'nvidia-340xx-utils' 'nvidia-utils')
+  provides=('libgl' 'libgles' 'libegl' 'nvidia-304xx-libgl' 'nvidia-utils')
   replaces=('nvidia-304xx-libgl')
   
   cd ${_pkg}

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-27 Thread Laurent Carlier 
Date: Monday, February 27, 2017 @ 10:30:04
  Author: lcarlier
Revision: 289614

upgpkg: nvidia-304xx-utils 304.135-4

rename nvidia-drm-outputclass.conf to 10-nvidia-drm-outputclass.conf, so it can 
be easily overriden in a xorg.conf.d prefixed file

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-27 10:10:44 UTC (rev 289613)
+++ PKGBUILD2017-02-27 10:30:04 UTC (rev 289614)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.135
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -143,7 +143,7 @@
 
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
   install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
-  install -m644 "${srcdir}/nvidia-drm-outputclass.conf" 
"${pkgdir}/usr/share/X11/xorg.conf.d/"
+  install -m644 "${srcdir}/nvidia-drm-outputclass.conf" 
"${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf"
 
   install -dm 755 "${pkgdir}"/etc/ld.so.conf.d
   echo -e '/usr/lib/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-nvidia.conf

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-23 Thread Laurent Carlier 
Date: Thursday, February 23, 2017 @ 16:26:36
  Author: lcarlier
Revision: 289437

upgpkg: nvidia-304xx-utils 304.135-3

remove useless conflicts/provides

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-23 16:14:30 UTC (rev 289436)
+++ PKGBUILD2017-02-23 16:26:36 UTC (rev 289437)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.135
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -65,8 +65,8 @@
   optdepends=('gtk2: nvidia-settings'
   'pkg-config: nvidia-xconfig'
   'opencl-nvidia-304xx: OpenCL support')
-  conflicts=('nvidia-utils' 'nvidia-libgl' 'nvidia-340xx-utils' 
'nvidia-304xx-libgl')
-  provides=('libgl' 'libgles' 'libegl' 'nvidia-utils' 'nvidia-libgl' 
'nvidia-304xx-libgl')
+  conflicts=('nvidia-304xx-libgl' 'nvidia-340xx-utils')
+  provides=('libgl' 'libgles' 'libegl' 'nvidia-304xx-libgl')
   replaces=('nvidia-304xx-libgl')
   
   cd ${_pkg}

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-23 Thread Laurent Carlier 
Date: Thursday, February 23, 2017 @ 12:31:05
  Author: lcarlier
Revision: 289428

upgpkg: nvidia-304xx-utils 304.135-2

nvidia-304xx-utils doesn't conflict anymore with libgl/libegl/libgles

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-23 12:00:59 UTC (rev 289427)
+++ PKGBUILD2017-02-23 12:31:05 UTC (rev 289428)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.135
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -65,7 +65,7 @@
   optdepends=('gtk2: nvidia-settings'
   'pkg-config: nvidia-xconfig'
   'opencl-nvidia-304xx: OpenCL support')
-  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-utils' 'nvidia-libgl' 
'nvidia-304xx-libgl')
+  conflicts=('nvidia-utils' 'nvidia-libgl' 'nvidia-340xx-utils' 
'nvidia-304xx-libgl')
   provides=('libgl' 'libgles' 'libegl' 'nvidia-utils' 'nvidia-libgl' 
'nvidia-304xx-libgl')
   replaces=('nvidia-304xx-libgl')

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-22 Thread Laurent Carlier 
Date: Wednesday, February 22, 2017 @ 09:57:49
  Author: lcarlier
Revision: 289394

upgpkg: nvidia-304xx-utils 304.135-1

upstream update 304.135

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-22 09:56:34 UTC (rev 289393)
+++ PKGBUILD2017-02-22 09:57:49 UTC (rev 289394)
@@ -4,8 +4,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.134
-pkgrel=8
+pkgver=304.135
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -15,8 +15,8 @@
 
source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
 
source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
 md5sums=('4f5562ee8f3171769e4638b35396c55d')
-md5sums_i686=('9abd7e9272382bd0e6939c3a367cc1a6')
-md5sums_x86_64=('2ecfa6bd145f673264f7977e0366e259')
+md5sums_i686=('0e2082ae8490b135eb306befe6db56e1')
+md5sums_x86_64=('8ee9bd0b020508bca9953181811422fa')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-20 Thread Laurent Carlier 
Date: Monday, February 20, 2017 @ 13:18:00
  Author: lcarlier
Revision: 289321

upgpkg: nvidia-304xx-utils 304.134-6

fix libEGL and libgles symlinks

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-20 10:30:53 UTC (rev 289320)
+++ PKGBUILD2017-02-20 13:18:00 UTC (rev 289321)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.134
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -129,15 +129,15 @@
   ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"
 
   # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
-  ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0"
+  ln -s /usr/lib/mesa/libEGL.so.1.0.0 
"${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0"
   ln -s libEGL.so.1.0.0  "${pkgdir}/usr/lib/nvidia/libEGL.so.1"
   ln -s libEGL.so.1.0.0  "${pkgdir}/usr/lib/nvidia/libEGL.so"
 
-  ln -s mesa/libGLESv1_CM.so.1.1.0 
"${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0"
+  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 
"${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0"
   ln -s libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1"
   ln -s libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so"
 
-  ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0"
+  ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 
"${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0"
   ln -s libGLESv2.so.2.0.0  "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2"
   ln -s libGLESv2.so.2.0.0  "${pkgdir}/usr/lib/nvidia/libGLESv2.so"

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-19 Thread Laurent Carlier 
Date: Sunday, February 19, 2017 @ 19:26:07
  Author: lcarlier
Revision: 289277

upgpkg: nvidia-304xx-utils 304.134-5

fix provides/conflicts/replaces arrays

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-19 19:02:36 UTC (rev 289276)
+++ PKGBUILD2017-02-19 19:26:07 UTC (rev 289277)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.134
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -62,14 +62,12 @@
 package_nvidia-304xx-utils() {
   pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
   depends=('xorg-server' 'libxvmc' 'mesa')
-  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-304xx-libgl')
-  provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-304xx-libgl')
-  replaces=('nvidia-304xx-gl')
   optdepends=('gtk2: nvidia-settings'
   'pkg-config: nvidia-xconfig'
   'opencl-nvidia-304xx: OpenCL support')
-  conflicts=('nvidia-utils')
-  provides=('nvidia-utils')
+  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-utils' 'nvidia-libgl' 
'nvidia-304xx-libgl')
+  provides=('libgl' 'libgles' 'libegl' 'nvidia-utils' 'nvidia-libgl' 
'nvidia-304xx-libgl')
+  replaces=('nvidia-304xx-libgl')
   
   cd ${_pkg}

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-19 Thread Laurent Carlier 
Date: Sunday, February 19, 2017 @ 19:02:27
  Author: lcarlier
Revision: 289275

upgpkg: nvidia-304xx-utils 304.134-4

remove nvidia-304xx-libgl package, use a ld.so conf file instead

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   70 +
 1 file changed, 29 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-19 16:55:28 UTC (rev 289274)
+++ PKGBUILD2017-02-19 19:02:27 UTC (rev 289275)
@@ -3,9 +3,9 @@
 # Contributor: Andreas Radke 
 
 pkgbase=nvidia-304xx-utils
-pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
+pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.134
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -59,40 +59,12 @@
   install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE"
 }
 
-package_nvidia-304xx-libgl() {
-  pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch"
-  depends=('nvidia-304xx-utils' 'mesa')
-  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
-  provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
-
-  cd ${_pkg}
-
-  mkdir -p "${pkgdir}/usr/lib/"
-
-  ln -s nvidia/libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.${pkgver}"
-  ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.1"
-  ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so"
-
-  # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
-  ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1.0.0"
-  ln -s libEGL.so.1.0.0  "${pkgdir}/usr/lib/libEGL.so.1"
-  ln -s libEGL.so.1.0.0  "${pkgdir}/usr/lib/libEGL.so"
-
-  ln -s mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0"
-  ln -s libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-  ln -s libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib/libGLESv1_CM.so"
-
-  ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0"
-  ln -s libGLESv2.so.2.0.0  "${pkgdir}/usr/lib/libGLESv2.so.2"
-  ln -s libGLESv2.so.2.0.0  "${pkgdir}/usr/lib/libGLESv2.so"
-
-  mkdir -p "${pkgdir}/usr/share/licenses"
-  ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-libgl"
-}
-
 package_nvidia-304xx-utils() {
   pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
-  depends=('xorg-server' 'libxvmc')
+  depends=('xorg-server' 'libxvmc' 'mesa')
+  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-304xx-libgl')
+  provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-304xx-libgl')
+  replaces=('nvidia-304xx-gl')
   optdepends=('gtk2: nvidia-settings'
   'pkg-config: nvidia-xconfig'
   'opencl-nvidia-304xx: OpenCL support')
@@ -113,22 +85,22 @@
   install -D -m755 "libGL.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"
 
   # OpenGL core library
-  install -D -m755 "libnvidia-glcore.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
+  install -D -m755 "libnvidia-glcore.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libnvidia-glcore.so.${pkgver}"
 
   # XvMC
-  install -D -m755 "libXvMCNVIDIA.so.${pkgver}" 
"${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}"
+  install -D -m755 "libXvMCNVIDIA.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libXvMCNVIDIA.so.${pkgver}"
 
   # VDPAU
   install -D -m755 "libvdpau_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
 
   # nvidia-tls library
-  install -D -m755 "tls/libnvidia-tls.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}"
-  install -D -m755 "libnvidia-cfg.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}"
-  install -D -m755 "libnvidia-ml.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}"
+  install -D -m755 "tls/libnvidia-tls.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libnvidia-tls.so.${pkgver}"
+  install -D -m755 "libnvidia-cfg.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libnvidia-cfg.so.${pkgver}"
+  install -D -m755 "libnvidia-ml.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libnvidia-ml.so.${pkgver}"
   
   # CUDA
-  install -D -m755 "libcuda.so.${pkgver}" 
"${pkgdir}/usr/lib/libcuda.so.${pkgver}"
-  install -D -m755 "libnvcuvid.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
+  install -D -m755 "libcuda.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libcuda.so.${pkgver}"
+  install -D -m755 "libnvcuvid.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libnvcuvid.so.${pkgver}"
 
   # DEBUG
   install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
@@ -158,9 +130,25 @@
   install -D -m644 NVIDIA_Changelog 
"${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog"
   ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"
 
+  # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
+  ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0"
+  ln -s libEGL.so.1.0.0  "${pkgdir}/usr/lib/nvidi

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-02-12 Thread Laurent Carlier 
Date: Sunday, February 12, 2017 @ 14:29:20
  Author: lcarlier
Revision: 288748

upgpkg: nvidia-304xx-utils 304.134-2

remove glx symlink support

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-12 14:20:39 UTC (rev 288747)
+++ PKGBUILD2017-02-12 14:29:20 UTC (rev 288748)
@@ -5,16 +5,18 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.134
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
 makedepends=('zlib')
 options=('!strip')
-source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-md5sums_i686=('9abd7e9272382bd0e6939c3a367cc1a6')
-md5sums_x86_64=('2ecfa6bd145f673264f7977e0366e259')
+source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";
 nvidia-drm-outputclass.conf)
+source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";
 nvidia-drm-outputclass.conf)
+md5sums_i686=('9abd7e9272382bd0e6939c3a367cc1a6'
+  '44bdaa2fdaec5cdcf72961e9aa71f971')
+md5sums_x86_64=('2ecfa6bd145f673264f7977e0366e259'
+'44bdaa2fdaec5cdcf72961e9aa71f971')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'
@@ -65,10 +67,7 @@
 
   cd ${_pkg}
 
-  mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions"
-  ln -s "../../../nvidia/xorg/modules/extensions/libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
-  ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1"
-  ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+  mkdir -p "${pkgdir}/usr/lib/"
 
   ln -s nvidia/libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.${pkgver}"
   ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.1"
@@ -106,8 +105,9 @@
   install -D -m755 nvidia_drv.so 
"${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
 
   # GLX extension module for X
-  install -D -m755 "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}"
-  ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so"# X doesn't 
find glx otherwise
+  install -D -m755 "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/libglx.so.${pkgver}"
+  ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.1"# 
X doesn't find glx otherwise
+  ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so"# X 
doesn't find glx otherwise
   
   # OpenGL libraries
   install -D -m755 "libGL.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"
@@ -160,7 +160,7 @@
 
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
   install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
-  install -m644 nvidia-drm-outputclass.conf 
"${pkgdir}/usr/share/X11/xorg.conf.d/"
+  install -m644 "${srcdir}/nvidia-drm-outputclass.conf" 
"${pkgdir}/usr/share/X11/xorg.conf.d/"
 
   create_links
 }

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2017-01-12 Thread Laurent Carlier 
Date: Thursday, January 12, 2017 @ 20:15:53
  Author: lcarlier
Revision: 286093

upgpkg: nvidia-304xx-utils 304.134-1

upstream update 304.134

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-12 20:15:47 UTC (rev 286092)
+++ PKGBUILD2017-01-12 20:15:53 UTC (rev 286093)
@@ -4,8 +4,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.132
-pkgrel=2
+pkgver=304.134
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -13,8 +13,8 @@
 options=('!strip')
 
source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
 
source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-sha512sums_i686=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f')
-sha512sums_x86_64=('990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c')
+md5sums_i686=('9abd7e9272382bd0e6939c3a367cc1a6')
+md5sums_x86_64=('2ecfa6bd145f673264f7977e0366e259')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2016-12-02 Thread Laurent Carlier 
Date: Friday, December 2, 2016 @ 08:58:05
  Author: lcarlier
Revision: 282519

upgpkg: nvidia-304xx-utils 304.132-2

opencl-304xx-nvidia now provides opencl-driver and doesn't depend anymore on an 
icd loader

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-02 08:46:29 UTC (rev 282518)
+++ PKGBUILD2016-12-02 08:58:05 UTC (rev 282519)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.132
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -40,9 +40,9 @@
 
 package_opencl-nvidia-304xx() {
   pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch"
-  depends=('libcl' 'zlib')
+  depends=('zlib')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-nvidia')
+  provides=('opencl-nvidia' 'opencl-driver')
   conflicts=('opencl-nvidia')
 
   cd ${_pkg}

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2016-10-21 Thread Felix Yan 
Date: Friday, October 21, 2016 @ 07:32:56
  Author: felixonmars
Revision: 279080

upgpkg: nvidia-304xx-utils 304.132-1

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-21 07:30:42 UTC (rev 279079)
+++ PKGBUILD2016-10-21 07:32:56 UTC (rev 279080)
@@ -4,8 +4,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.131
-pkgrel=2
+pkgver=304.132
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -13,8 +13,8 @@
 options=('!strip')
 
source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
 
source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-sha512sums_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
-sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
+sha512sums_i686=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f')
+sha512sums_x86_64=('990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2016-08-27 Thread Felix Yan 
Date: Sunday, August 28, 2016 @ 05:25:03
  Author: felixonmars
Revision: 274765

upgpkg: nvidia-304xx-utils 304.131-2

provides also libegl and libgles

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-28 01:57:23 UTC (rev 274764)
+++ PKGBUILD2016-08-28 05:25:03 UTC (rev 274765)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.131
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -60,8 +60,8 @@
 package_nvidia-304xx-libgl() {
   pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch"
   depends=('nvidia-304xx-utils' 'mesa')
-  conflicts=('libgl' 'nvidia-libgl')
-  provides=('libgl' 'nvidia-libgl')
+  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
+  provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
 
   cd ${_pkg}

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2015-11-10 Thread Felix Yan 
Date: Tuesday, November 10, 2015 @ 14:59:59
  Author: fyan
Revision: 250549

felixify source arrays and fix xorg.conf installation

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-10 13:57:19 UTC (rev 250548)
+++ PKGBUILD2015-11-10 13:59:59 UTC (rev 250549)
@@ -11,8 +11,10 @@
 license=('custom')
 makedepends=('zlib')
 options=('!strip')
+source=(nvidia-drm-outputclass.conf)
 
source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
 
source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
+sha512sums=('06c649df3b02c6ccf5491fecd06f4c979656aaba2bb366e6197e96bb0eecd8d0a46245e69628d507ddc8c5fc6d5f1cac694f036bc45ba51f82a092ebd6097bf5')
 
sha512sums_i686=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90')
 
sha512sums_x86_64=('fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2')
 
@@ -157,10 +159,10 @@
   install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README"
   install -D -m644 NVIDIA_Changelog 
"${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog"
   ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"
-  
+
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+  install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
   install -m644 "${srcdir}/nvidia-drm-outputclass.conf" 
"${pkgdir}/usr/share/X11/xorg.conf.d/"
-
+
   create_links
 }

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2015-09-02 Thread Felix Yan 
Date: Wednesday, September 2, 2015 @ 10:40:00
  Author: fyan
Revision: 245189

upgpkg: nvidia-304xx-utils 304.128-1

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-02 00:16:15 UTC (rev 245188)
+++ PKGBUILD2015-09-02 08:40:00 UTC (rev 245189)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: Felix Yan 
+# Maintainer: Felix Yan 
 # Contributor: Andreas Radke 
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.125
+pkgver=304.128
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
@@ -11,17 +11,17 @@
 license=('custom')
 makedepends=('zlib')
 options=('!strip')
+source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
+source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
+sha512sums_i686=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90')
+sha512sums_x86_64=('fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-  
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-  md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4')
 elif [ "$CARCH" = "x86_64" ]; then
   _arch='x86_64'
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-  
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-  md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0')
 fi
 
 create_links() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-12-05 Thread Felix Yan 
Date: Friday, December 5, 2014 @ 19:04:34
  Author: fyan
Revision: 227301

upgpkg: nvidia-304xx-utils 304.125-1

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-05 18:04:33 UTC (rev 227300)
+++ PKGBUILD2014-12-05 18:04:34 UTC (rev 227301)
@@ -4,7 +4,7 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.123
+pkgver=304.125
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
@@ -16,12 +16,12 @@
   _arch='x86'
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
   
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-  md5sums=('52307054483f5c40391608ce69114d48')
+  md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4')
 elif [ "$CARCH" = "x86_64" ]; then
   _arch='x86_64'
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
   
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-  md5sums=('9d461e9e00e473f458aee96cd6d85101')
+  md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0')
 fi
 
 create_links() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-09-19 Thread Felix Yan 
Date: Saturday, September 20, 2014 @ 07:59:53
  Author: fyan
Revision: 222142

cleanup makedepends (FS#42020)

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-20 05:47:22 UTC (rev 222141)
+++ PKGBUILD2014-09-20 05:59:53 UTC (rev 222142)
@@ -9,7 +9,7 @@
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
-makedepends=('libcl' 'libxvmc' 'xorg-server' 'zlib' 'mesa')
+makedepends=('zlib')
 options=('!strip')
 
 if [ "$CARCH" = "i686" ]; then

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-07-11 Thread Felix Yan 
Date: Friday, July 11, 2014 @ 18:43:43
  Author: fyan
Revision: 216803

upgpkg: nvidia-304xx-utils 304.123-1

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-11 15:20:34 UTC (rev 216802)
+++ PKGBUILD2014-07-11 16:43:43 UTC (rev 216803)
@@ -4,8 +4,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.121
-pkgrel=3
+pkgver=304.123
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -16,12 +16,12 @@
   _arch='x86'
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
   
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-  md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9')
+  md5sums=('52307054483f5c40391608ce69114d48')
 elif [ "$CARCH" = "x86_64" ]; then
   _arch='x86_64'
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
   
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-  md5sums=('41e6d2b6325e5b0ae9889cfbd6bec696')
+  md5sums=('9d461e9e00e473f458aee96cd6d85101')
 fi
 
 create_links() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-06-29 Thread Sven-Hendrik Haase 
Date: Sunday, June 29, 2014 @ 17:00:25
  Author: svenstaro
Revision: 215572

upgpkg: nvidia-304xx-utils 304.121-3

fix FS#31389

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-29 14:53:04 UTC (rev 215571)
+++ PKGBUILD2014-06-29 15:00:25 UTC (rev 215572)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.121
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -26,11 +26,12 @@
 
 create_links() {
   # create soname links
-  while read -d '' _lib; do
-_soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 
's/.*Library soname: \[(.*)\].*/\1/p')"
-[[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}"
-[[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" 
"${_soname/.[0-9]*/}"
-  done < <(find "${pkgdir}" -type f -name '*.so*' -print0)
+  for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do
+_soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: 
\[\K[^]]*' || true)
+_base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/')
+[[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}"
+[[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}"
+  done
 }
 
 build() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-03-12 Thread Felix Yan 
Date: Thursday, March 13, 2014 @ 05:07:41
  Author: fyan
Revision: 207675

upgpkg: nvidia-304xx-utils 304.121-2

- update link target for new mesa package

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |  217 ++---
 1 file changed, 110 insertions(+), 107 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-13 00:16:21 UTC (rev 207674)
+++ PKGBUILD2014-03-13 04:07:41 UTC (rev 207675)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.121
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -13,146 +13,149 @@
 options=('!strip')
 
 if [ "$CARCH" = "i686" ]; then
-_arch='x86'
-_pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9')
+  _arch='x86'
+  _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+  
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
+  md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9')
 elif [ "$CARCH" = "x86_64" ]; then
-_arch='x86_64'
-_pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('41e6d2b6325e5b0ae9889cfbd6bec696')
+  _arch='x86_64'
+  _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+  
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
+  md5sums=('41e6d2b6325e5b0ae9889cfbd6bec696')
 fi
 
 create_links() {
-# create soname links
-while read -d '' _lib; do
-_soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed 
-nr 's/.*Library soname: \[(.*)\].*/\1/p')"
-[[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}"
-[[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" 
"${_soname/.[0-9]*/}"
-done < <(find "${pkgdir}" -type f -name '*.so*' -print0)
+  # create soname links
+  while read -d '' _lib; do
+_soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 
's/.*Library soname: \[(.*)\].*/\1/p')"
+[[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}"
+[[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" 
"${_soname/.[0-9]*/}"
+  done < <(find "${pkgdir}" -type f -name '*.so*' -print0)
 }
 
 build() {
-cd "${srcdir}"
-sh "${_pkg}.run" --extract-only
+  sh "${_pkg}.run" --extract-only
 }
 
 package_opencl-nvidia-304xx() {
-pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch"
-depends=('libcl' 'zlib')
-optdepends=('opencl-headers: headers necessary for OpenCL development')
-provides=('opencl-nvidia')
-conflicts=('opencl-nvidia')
- 
-cd "${srcdir}/${_pkg}"
+  pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch"
+  depends=('libcl' 'zlib')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+  provides=('opencl-nvidia')
+  conflicts=('opencl-nvidia')
 
-# OpenCL
-install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
-install -D -m755 "libnvidia-compiler.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
-install -D -m755 "libnvidia-opencl.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
+  cd ${_pkg}
 
-create_links
-
-install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE"
+  # OpenCL
+  install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
+  install -D -m755 "libnvidia-compiler.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
+  install -D -m755 "libnvidia-opencl.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
+
+  create_links
+  
+  install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE"
 }
 
 package_nvidia-304xx-libgl() {
-pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch"
-depends=('nvidia-304xx-utils' 'mesa')
-conflicts=('libgl' 'nvidia-libgl')
-provides=('libgl' 'nvidia-libgl')
-cd "${srcdir}/${_pkg}"
+  pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch"
+  depends=('nvidia-304xx-utils' 'mesa')
+  conflicts=('libgl' 'nvidia-libgl')
+  provides=('libgl' 'nvidia-libgl')
 
-mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions"
-ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
-ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1"
-ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+  cd ${_pkg}
 
-ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" 
"${pkgdir}/usr/lib/libGL.so.${pkgver}"
-ln -s "libGL.so.${pkgver}"

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-03-12 Thread Felix Yan 
Date: Wednesday, March 12, 2014 @ 18:19:42
  Author: fyan
Revision: 207591

upgpkg: nvidia-304xx-utils 304.121-1

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-12 17:16:54 UTC (rev 207590)
+++ PKGBUILD2014-03-12 17:19:42 UTC (rev 207591)
@@ -4,8 +4,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.119
-pkgrel=3
+pkgver=304.121
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -15,13 +15,13 @@
 if [ "$CARCH" = "i686" ]; then
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('a2acb8066ac296005dbf560ee83ae6d9')
+
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
+md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9')
 elif [ "$CARCH" = "x86_64" ]; then
 _arch='x86_64'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('fb93002115c99f15b6ca393a90a9c9ec')
+
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
+md5sums=('41e6d2b6325e5b0ae9889cfbd6bec696')
 fi
 
 create_links() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-03-09 Thread Laurent Carlier 
Date: Sunday, March 9, 2014 @ 12:39:38
  Author: lcarlier
Revision: 207439

upgpkg: nvidia-304xx-utils 304.119-3

fix circular dependency

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-09 11:20:17 UTC (rev 207438)
+++ PKGBUILD2014-03-09 11:39:38 UTC (rev 207439)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.119
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -90,7 +90,7 @@
 
 package_nvidia-304xx-utils() {
 pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
-depends=('xorg-server' 'libxvmc' 'nvidia-304xx-libgl')
+depends=('xorg-server' 'libxvmc')
 optdepends=('gtk2: nvidia-settings'
 'pkg-config: nvidia-xconfig'
 'opencl-nvidia-304xx: OpenCL support')

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-03-08 Thread Felix Yan 
Date: Sunday, March 9, 2014 @ 02:58:56
  Author: fyan
Revision: 207427

upgpkg: nvidia-304xx-utils 304.119-2

- split nvidia-304xx-libgl to make the -utils package work with bumblebee 
(dependency on nvidia-304xx-utils will be removed in next release, I keep this 
dependency to give current user a clean upgrade)
- add symlinks to mesa libEGL & libGLES libraries, since nvidia 304xx doesn't 
ship them

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   69 +
 1 file changed, 56 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-09 00:19:31 UTC (rev 207426)
+++ PKGBUILD2014-03-09 01:58:56 UTC (rev 207427)
@@ -1,14 +1,15 @@
 # $Id$
-# Maintainer: Andreas Radke 
+# Maintainer: Felix Yan 
+# Contributor: Andreas Radke 
 
 pkgbase=nvidia-304xx-utils
-pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
+pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.119
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
-makedepends=('libcl' 'libxvmc' 'xorg-server' 'zlib')
+makedepends=('libcl' 'libxvmc' 'xorg-server' 'zlib' 'mesa')
 options=('!strip')
 
 if [ "$CARCH" = "i686" ]; then
@@ -56,42 +57,82 @@
 install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE"
 }
 
+package_nvidia-304xx-libgl() {
+pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch"
+depends=('nvidia-304xx-utils' 'mesa')
+conflicts=('libgl' 'nvidia-libgl')
+provides=('libgl' 'nvidia-libgl')
+cd "${srcdir}/${_pkg}"
+
+mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions"
+ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
+ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1"
+ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" 
"${pkgdir}/usr/lib/libGL.so.${pkgver}"
+ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1"
+ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so"
+
+# We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
+ln -s mesa-libEGL.so.1.0.0"${pkgdir}/usr/lib/libEGL.so"
+ln -s mesa-libEGL.so.1.0.0"${pkgdir}/usr/lib/libEGL.so.1"
+ln -s mesa-libEGL.so.1.0.0"${pkgdir}/usr/lib/libEGL.so.1.0.0"
+ln -s mesa-libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib/libGLESv1_CM.so"
+ln -s mesa-libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
+ln -s mesa-libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0"
+ln -s mesa-libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so"
+ln -s mesa-libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2"
+ln -s mesa-libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0"
+
+mkdir -p "${pkgdir}/usr/share/licenses"
+ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-libgl"
+}
+
 package_nvidia-304xx-utils() {
 pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
-depends=('xorg-server' 'libxvmc')
+depends=('xorg-server' 'libxvmc' 'nvidia-304xx-libgl')
 optdepends=('gtk2: nvidia-settings'
 'pkg-config: nvidia-xconfig'
 'opencl-nvidia-304xx: OpenCL support')
-conflicts=('libgl' 'nvidia-utils')
-provides=('libgl' 'nvidia-utils')
+conflicts=('nvidia-utils')
+provides=('nvidia-utils')
 cd "${srcdir}/${_pkg}"
 
 # X driver
 install -D -m755 nvidia_drv.so 
"${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
 # GLX extension module for X
-install -D -m755 "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
-ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"  # X doesn't find glx 
otherwise
-# OpenGL library
-install -D -m755 "libGL.so.${pkgver}" 
"${pkgdir}/usr/lib/libGL.so.${pkgver}"
+install -D -m755 "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}"
+ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so"# X doesn't 
find glx otherwise
+
+# OpenGL libraries
+install -D -m755 "libGL.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"
+
 # OpenGL core library
 install -D -m755 "libnvidia-glcore.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
+
 # XvMC
-#install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a"
 install -D -m755 "libXvMCNVIDIA.so.${pkgver}" 
"${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}"
+
 # VDPAU
 install -D -m755 "libvdpau_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
+
 #

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2014-02-21 Thread Eric Bélanger 
Date: Saturday, February 22, 2014 @ 00:15:29
  Author: eric
Revision: 206226

upgpkg: nvidia-304xx-utils 304.119-1

Upstream update

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-21 23:14:08 UTC (rev 206225)
+++ PKGBUILD2014-02-21 23:15:29 UTC (rev 206226)
@@ -3,7 +3,7 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.117
+pkgver=304.119
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
@@ -15,12 +15,12 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('023eb03da304a1842fc503c81e3c5694')
+md5sums=('a2acb8066ac296005dbf560ee83ae6d9')
 elif [ "$CARCH" = "x86_64" ]; then
 _arch='x86_64'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('8ee9f672028971c6d36118894d0e2c59')
+md5sums=('fb93002115c99f15b6ca393a90a9c9ec')
 fi
 
 create_links() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2013-12-16 Thread Eric Bélanger 
Date: Tuesday, December 17, 2013 @ 05:50:06
  Author: eric
Revision: 201620

upgpkg: nvidia-304xx-utils 304.117-1

Upstream update

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-17 02:11:33 UTC (rev 201619)
+++ PKGBUILD2013-12-17 04:50:06 UTC (rev 201620)
@@ -3,8 +3,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.116
-pkgrel=2
+pkgver=304.117
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -15,12 +15,12 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('0626e8582fd81f14e7fbd906fbca1d51')
+md5sums=('023eb03da304a1842fc503c81e3c5694')
 elif [ "$CARCH" = "x86_64" ]; then
 _arch='x86_64'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('8b89d14e717ce7dd78c4d38cab930d1e')
+md5sums=('8ee9f672028971c6d36118894d0e2c59')
 fi
 
 create_links() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2013-11-27 Thread Eric Bélanger 
Date: Wednesday, November 27, 2013 @ 20:32:45
  Author: eric
Revision: 200392

upgpkg: nvidia-304xx-utils 304.116-2

Fix license conflict (close FS#37929)

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-27 19:30:19 UTC (rev 200391)
+++ PKGBUILD2013-11-27 19:32:45 UTC (rev 200392)
@@ -4,7 +4,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.116
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -104,8 +104,9 @@
 install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi"
 install -D -m644 nvidia-smi.1.gz 
"${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
 
+install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE"
+ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils"
 
-install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/nvidia-304xx-utils/LICENSE"
 install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README"
 install -D -m644 NVIDIA_Changelog 
"${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog"
 ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2013-11-24 Thread Eric Bélanger 
Date: Monday, November 25, 2013 @ 01:04:41
  Author: eric
Revision: 200293

upgpkg: nvidia-304xx-utils 304.116-1

Upstream update, Fix license

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-24 23:23:43 UTC (rev 200292)
+++ PKGBUILD2013-11-25 00:04:41 UTC (rev 200293)
@@ -3,11 +3,12 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.108
-pkgrel=2
+pkgver=304.116
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
+makedepends=('libcl' 'libxvmc' 'xorg-server' 'zlib')
 options=('!strip')
 
 if [ "$CARCH" = "i686" ]; then
@@ -14,12 +15,12 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('ef453e32515c2176c67ebd95c770dc0e')
+md5sums=('0626e8582fd81f14e7fbd906fbca1d51')
 elif [ "$CARCH" = "x86_64" ]; then
 _arch='x86_64'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('4e0e54de6735023f44c858a3006b3e18')
+md5sums=('8b89d14e717ce7dd78c4d38cab930d1e')
 fi
 
 create_links() {
@@ -104,8 +105,7 @@
 install -D -m644 nvidia-smi.1.gz 
"${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
 
 
-install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE"
-ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils"
+install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/nvidia-304xx-utils/LICENSE"
 install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README"
 install -D -m644 NVIDIA_Changelog 
"${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog"
 ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2013-10-26 Thread Andreas Radke 
Date: Saturday, October 26, 2013 @ 12:18:58
  Author: andyrtr
Revision: 197509

upgpkg: nvidia-304xx-utils 304.108-2

put license to proper path and symlinks; FS#33315

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 08:40:50 UTC (rev 197508)
+++ PKGBUILD2013-10-26 10:18:58 UTC (rev 197509)
@@ -4,7 +4,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.108
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -52,7 +52,7 @@
 
 create_links
 
-install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/opencl-nvidia/LICENSE"
+install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE"
 }
 
 package_nvidia-304xx-utils() {
@@ -104,11 +104,11 @@
 install -D -m644 nvidia-smi.1.gz 
"${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
 
 
-install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE"
-ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils"
-install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README"
-install -D -m644 NVIDIA_Changelog 
"${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog"
-ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
+install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE"
+ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils"
+install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README"
+install -D -m644 NVIDIA_Changelog 
"${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog"
+ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"
 
 create_links
 }

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2013-08-19 Thread Andreas Radke 
Date: Monday, August 19, 2013 @ 18:55:38
  Author: andyrtr
Revision: 193401

upgpkg: nvidia-304xx-utils 304.108-1

upstream update 304.108; add license to opencl pkg

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-19 16:42:38 UTC (rev 193400)
+++ PKGBUILD2013-08-19 16:55:38 UTC (rev 193401)
@@ -3,7 +3,7 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.88
+pkgver=304.108
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
@@ -14,12 +14,12 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('f60d4aef766029c98914ed665235029a')
+md5sums=('ef453e32515c2176c67ebd95c770dc0e')
 elif [ "$CARCH" = "x86_64" ]; then
 _arch='x86_64'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('35e0c7d30de795cccb6b95bda991fb77')
+md5sums=('4e0e54de6735023f44c858a3006b3e18')
 fi
 
 create_links() {
@@ -51,6 +51,8 @@
 install -D -m755 "libnvidia-opencl.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
 
 create_links
+
+install -D -m644 LICENSE 
"${pkgdir}/usr/share/licenses/opencl-nvidia/LICENSE"
 }
 
 package_nvidia-304xx-utils() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2013-04-05 Thread Andreas Radke 
Date: Friday, April 5, 2013 @ 21:47:45
  Author: andyrtr
Revision: 182046

upgpkg: nvidia-304xx-utils 304.88-1

upstream update 304.88

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-05 19:28:13 UTC (rev 182045)
+++ PKGBUILD2013-04-05 19:47:45 UTC (rev 182046)
@@ -3,7 +3,7 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.84
+pkgver=304.88
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
@@ -14,12 +14,12 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('3f9f724c5448e5b6952ad22092bdda83')
+md5sums=('f60d4aef766029c98914ed665235029a')
 elif [ "$CARCH" = "x86_64" ]; then
 _arch='x86_64'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('c26461c11170d8447d1464c37ff7c66b')
+md5sums=('35e0c7d30de795cccb6b95bda991fb77')
 fi
 
 create_links() {

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2013-03-07 Thread Andreas Radke 
Date: Thursday, March 7, 2013 @ 18:42:40
  Author: andyrtr
Revision: 179596

upgpkg: nvidia-304xx-utils 304.84-1

upstream update 304.84

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-07 17:09:31 UTC (rev 179595)
+++ PKGBUILD2013-03-07 17:42:40 UTC (rev 179596)
@@ -3,8 +3,8 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
-pkgver=304.64
-pkgrel=2
+pkgver=304.84
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -14,12 +14,12 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('6964415cf648a5f4f38117b168369de2')
+md5sums=('3f9f724c5448e5b6952ad22092bdda83')
 elif [ "$CARCH" = "x86_64" ]; then
 _arch='x86_64'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";)
-md5sums=('76007ed4b72afd334e26377b646f5f7e')
+md5sums=('c26461c11170d8447d1464c37ff7c66b')
 fi
 
 create_links() {
@@ -57,7 +57,6 @@
 pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
 depends=('xorg-server' 'libxvmc')
 optdepends=('gtk2: nvidia-settings'
-'pangox-compat: nvidia-settings'
 'pkg-config: nvidia-xconfig'
 'opencl-nvidia-304xx: OpenCL support')
 conflicts=('libgl' 'nvidia-utils')

[arch-commits] Commit in nvidia-304xx-utils/trunk (PKGBUILD)

2012-12-02 Thread andyrtr 
Date: Sunday, December 2, 2012 @ 06:34:08
  Author: andyrtr
Revision: 172446

upgpkg: nvidia-304xx-utils 304.64-2

split pkg into utils and opencl pkg, fix conflicts and provides FS#32869; stop 
shipping static libXvMCNVIDIA.a

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

--+
 PKGBUILD |   49 -
 1 file changed, 32 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-02 11:27:31 UTC (rev 172445)
+++ PKGBUILD2012-12-02 11:34:08 UTC (rev 172446)
@@ -1,17 +1,12 @@
 # $Id$
-# Maintainer: Thomas Baechler 
-# Contributor: James Rayner 
-pkgname=nvidia-304xx-utils
+# Maintainer: Andreas Radke 
+
+pkgbase=nvidia-304xx-utils
+pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.64
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
-pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
-depends=('xorg-server' 'libxvmc')
-optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 
'pkg-config: nvidia-xconfig'
-   'opencl-nvidia: OpenCL support')
-conflicts=('libgl' 'nvidia-utils')
-provides=('libgl')
 license=('custom')
 options=('!strip')
 
@@ -41,9 +36,34 @@
 sh "${_pkg}.run" --extract-only
 }
 
-package() {
+package_opencl-nvidia-304xx() {
+pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch"
+depends=('libcl' 'zlib')
+optdepends=('opencl-headers: headers necessary for OpenCL development')
+provides=('opencl-nvidia')
+conflicts=('opencl-nvidia')
+ 
 cd "${srcdir}/${_pkg}"
 
+# OpenCL
+install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
+install -D -m755 "libnvidia-compiler.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
+install -D -m755 "libnvidia-opencl.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
+
+create_links
+}
+
+package_nvidia-304xx-utils() {
+pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
+depends=('xorg-server' 'libxvmc')
+optdepends=('gtk2: nvidia-settings'
+'pangox-compat: nvidia-settings'
+'pkg-config: nvidia-xconfig'
+'opencl-nvidia-304xx: OpenCL support')
+conflicts=('libgl' 'nvidia-utils')
+provides=('libgl' 'nvidia-utils')
+cd "${srcdir}/${_pkg}"
+
 # X driver
 install -D -m755 nvidia_drv.so 
"${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
 # GLX extension module for X
@@ -54,7 +74,7 @@
 # OpenGL core library
 install -D -m755 "libnvidia-glcore.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
 # XvMC
-install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a"
+#install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a"
 install -D -m755 "libXvMCNVIDIA.so.${pkgver}" 
"${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}"
 # VDPAU
 install -D -m755 "libvdpau_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
@@ -81,13 +101,8 @@
 # nvidia-smi
 install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi"
 install -D -m644 nvidia-smi.1.gz 
"${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
-# OpenCL
-install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
-install -D -m755 "libnvidia-compiler.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
-install -D -m755 "libnvidia-opencl.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
 
 
-
 install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE"
 ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils"
 install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README"