[arch-commits] Commit in nvidia-340xx-utils/trunk (2 files)

2017-02-27 Thread Laurent Carlier
Date: Monday, February 27, 2017 @ 17:39:10
  Author: lcarlier
Revision: 289634

upgpkg: nvidia-340xx-utils 340.102-8

Use a better default configuration file especially for optimus systems

Modified:
  nvidia-340xx-utils/trunk/PKGBUILD
  nvidia-340xx-utils/trunk/nvidia-drm-outputclass.conf

-+
 PKGBUILD|4 ++--
 nvidia-drm-outputclass.conf |8 
 2 files changed, 10 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-27 17:37:13 UTC (rev 289633)
+++ PKGBUILD2017-02-27 17:39:10 UTC (rev 289634)
@@ -6,7 +6,7 @@
 pkgbase=nvidia-340xx-utils
 pkgname=('nvidia-340xx-utils' 'opencl-nvidia-340xx')
 pkgver=340.102
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
@@ -14,7 +14,7 @@
 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=('bf7e27b2f3c815f5e21ba3b17cb9f4e76360bb2c41b30face591834d82d786fee93546a469e30ebcb89f64a17a7e79e0b7ed6fd9f26438dfaa48899fce3ddf33')
+sha512sums=('cfea06a816ac4a8b728b1ec728d667cdcca604abb038e8b5313b434021caad06a586856b8b3a6c79f8c925629360f5a051ca3de5ab46a42af76b9d0615d2bbbe')
 
sha512sums_i686=('bea700c925a6044fcded40324bb389c5fa1aadc40831f685a76e7b0ded11161f492960950c201467e564d157dcbe0c330d13a2014f51d0073002c5a262a6f0ca')
 
sha512sums_x86_64=('2a29e6418244ea384e4237d74057bd8e56247b1c503cf623dea34a3b1065d8783879aa7e6a802dd31f0a10cf81cfcab2a1b1a8269b97996f15fa1838c0a3a44b')
 

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2017-02-27 17:37:13 UTC (rev 289633)
+++ nvidia-drm-outputclass.conf 2017-02-27 17:39:10 UTC (rev 289634)
@@ -1,6 +1,14 @@
 Section "OutputClass"
+Identifier "intel"
+MatchDriver "i915"
+Driver "modesetting"
+EndSection
+
+Section "OutputClass"
 Identifier "nvidia"
 MatchDriver "nvidia-drm"
 Driver "nvidia"
+Option "AllowEmptyInitialConfiguration"
+Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 EndSection


[arch-commits] Commit in nvidia-340xx-utils/trunk (2 files)

2017-02-12 Thread Laurent Carlier
Date: Sunday, February 12, 2017 @ 16:40:11
  Author: lcarlier
Revision: 288754

upgpkg: nvidia-340xx-utils 340.101-2

remove glx symlink support

Modified:
  nvidia-340xx-utils/trunk/PKGBUILD
  nvidia-340xx-utils/trunk/nvidia-drm-outputclass.conf

-+
 PKGBUILD|   14 ++
 nvidia-drm-outputclass.conf |8 
 2 files changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-12 16:11:59 UTC (rev 288753)
+++ PKGBUILD2017-02-12 16:40:11 UTC (rev 288754)
@@ -6,7 +6,7 @@
 pkgbase=nvidia-340xx-utils
 pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx')
 pkgver=340.101
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
@@ -14,7 +14,7 @@
 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=('bf7e27b2f3c815f5e21ba3b17cb9f4e76360bb2c41b30face591834d82d786fee93546a469e30ebcb89f64a17a7e79e0b7ed6fd9f26438dfaa48899fce3ddf33')
 
sha512sums_i686=('5866f2b4e6e22863c54d9fc08c9c88c9c911df2396d0ceaca653ded04589ea3a9e4550ed58f4b182b0a42cfe205ef643fe43ea709478e5df5360a7f74fa87f41')
 
sha512sums_x86_64=('d5bea7315346e93a7cccd3d99900f4dad51dfa6e93382d4d61c314d0ab97dea063169b8d666d3a3373dea33b4322f945c3a18ed0fc3308e3f89af6f22f373abc')
 
@@ -63,10 +63,7 @@
 provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
 cd "${_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"
+mkdir -p "${pkgdir}/usr/lib/"
 
 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"
@@ -103,8 +100,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}"

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2017-02-12 16:11:59 UTC (rev 288753)
+++ nvidia-drm-outputclass.conf 2017-02-12 16:40:11 UTC (rev 288754)
@@ -1,6 +1,6 @@
 Section "OutputClass"
-   Identifier "nvidia"
-   MatchDriver "nvidia-drm"
-   Driver "nvidia"
+Identifier "nvidia"
+MatchDriver "nvidia-drm"
+Driver "nvidia"
+ModulePath "/usr/lib/nvidia/xorg"
 EndSection
-


[arch-commits] Commit in nvidia-340xx-utils/trunk (2 files)

2015-11-10 Thread Andreas Radke
Date: Tuesday, November 10, 2015 @ 14:30:25
  Author: andyrtr
Revision: 250540

prepare next Xorg-server release; move nvidia-drm-outputclass.conf to the 
driver packages FS#45973

Added:
  nvidia-340xx-utils/trunk/nvidia-drm-outputclass.conf
Modified:
  nvidia-340xx-utils/trunk/PKGBUILD

-+
 PKGBUILD|   12 +---
 nvidia-drm-outputclass.conf |6 ++
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-10 13:27:54 UTC (rev 250539)
+++ PKGBUILD2015-11-10 13:30:25 UTC (rev 250540)
@@ -12,9 +12,11 @@
 license=('custom')
 options=('!strip')
 
source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run;
-
"ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;)
+
"ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+nvidia-drm-outputclass.conf)
 sha1sums=('650564caa2937c8306cfdcfb6c97b1e206fdffb3'
-  '05ef4b8b01aa532d89cef309f268ae1c7beffdc0')
+  '05ef4b8b01aa532d89cef309f268ae1c7beffdc0'
+  '4ca2fbb2389d0bcb7a2c6f614860522d9ddf58ab')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -179,6 +181,10 @@
 install -D -m644 NVIDIA_Changelog 
"${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog"
 cp -r html "${pkgdir}/usr/share/doc/nvidia/"
 ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
-
+
+# distro specific files must be installed in /usr/share/X11/xorg.conf.d
+install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+install -m644 "${srcdir}/nvidia-drm-outputclass.conf" 
"${pkgdir}/usr/share/X11/xorg.conf.d/"
+
 create_links
 }

Added: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf (rev 0)
+++ nvidia-drm-outputclass.conf 2015-11-10 13:30:25 UTC (rev 250540)
@@ -0,0 +1,6 @@
+Section "OutputClass"
+   Identifier "nvidia"
+   MatchDriver "nvidia-drm"
+   Driver "nvidia"
+EndSection
+


[arch-commits] Commit in nvidia-340xx-utils/trunk (2 files)

2015-03-01 Thread Sven-Hendrik Haase
Date: Sunday, March 1, 2015 @ 14:26:18
  Author: svenstaro
Revision: 232355

upgpkg: nvidia-340xx-utils 340.76-2

Fix permissions handling

Modified:
  nvidia-340xx-utils/trunk/PKGBUILD
  nvidia-340xx-utils/trunk/nvidia-340xx-utils.install

+
 PKGBUILD   |2 +-
 nvidia-340xx-utils.install |   15 ++-
 2 files changed, 3 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-01 13:20:08 UTC (rev 232354)
+++ PKGBUILD2015-03-01 13:26:18 UTC (rev 232355)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-340xx-utils
 pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx')
 pkgver=340.76
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://www.nvidia.com/;
 license=('custom')

Modified: nvidia-340xx-utils.install
===
--- nvidia-340xx-utils.install  2015-03-01 13:20:08 UTC (rev 232354)
+++ nvidia-340xx-utils.install  2015-03-01 13:26:18 UTC (rev 232355)
@@ -2,20 +2,9 @@
   echo If you run into trouble with CUDA not being available, run 
nvidia-modprobe first.
 }
 
-
 post_install() {
-  if ! getent group nvidia-persistenced /dev/null; then
-groupadd -g 143 nvidia-persistenced
-  fi
-  if ! getent passwd nvidia-persistenced /dev/null; then
-useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d 
'/' -s /sbin/nologin nvidia-persistenced
-  fi
+  getent group nvidia-persistenced /dev/null || groupadd -g 143 
nvidia-persistenced
+  getent passwd nvidia-persistenced /dev/null || useradd -c 'NVIDIA 
Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin 
nvidia-persistenced
 
   post_upgrade
 }
-
-post_remove() {
-  if getent group nvidia-persistenced /dev/null; then
-userdel -f nvidia-persistenced
-  fi
-}