[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2020-01-01 Thread Giancarlo Razzolini via arch-commits 
Date: Wednesday, January 1, 2020 @ 14:41:23
  Author: grazzolini
Revision: 372428

upgpkg: nvidia-utils 440.44-2

Fix for F#S64805

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

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

Modified: PKGBUILD
===
--- PKGBUILD2020-01-01 14:29:01 UTC (rev 372427)
+++ PKGBUILD2020-01-01 14:41:23 UTC (rev 372428)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=440.44
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
@@ -14,7 +14,7 @@
 source=('nvidia-drm-outputclass.conf'
 'nvidia-utils.sysusers'
 
"https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;)
-sha512sums=('c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48'
+sha512sums=('de7116c09f282a27920a1382df84aa86f559e537664bb30689605177ce37dc5067748acf9afd66a3269a6e323461356592fdfc624c86523bf105ff8fe47d3770'
 
'4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499'
 
'c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b')
 

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2020-01-01 14:29:01 UTC (rev 372427)
+++ nvidia-drm-outputclass.conf 2020-01-01 14:41:23 UTC (rev 372428)
@@ -1,15 +1,8 @@
 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"
 ModulePath "/usr/lib/xorg/modules"
 EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2018-10-04 Thread Sven-Hendrik Haase via arch-commits 
Date: Thursday, October 4, 2018 @ 22:44:58
  Author: svenstaro
Revision: 335773

upgpkg: nvidia-utils 410.57-3

Revert latest changes

This is because that break for people with laptops with a dGPU and an Intel one.

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

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

Modified: PKGBUILD
===
--- PKGBUILD2018-10-04 22:24:04 UTC (rev 335772)
+++ PKGBUILD2018-10-04 22:44:58 UTC (rev 335773)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=410.57
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
@@ -14,7 +14,7 @@
 source=('nvidia-drm-outputclass.conf'
 'nvidia-utils.sysusers'
 
"https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;)
-sha512sums=('4b7ee569b4f7e5d8c8e17bcc3d25ae78ab859abbf51cded9179ee723f41570a3d4c57af8649b8b1a24689374921bdf45c8fb4689149f3ee254ff093d71e662e7'
+sha512sums=('c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48'
 
'4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499'
 
'2ba6b4b7829410152e0fa57772969ca59f134995ef93d08c12cc6a7a97e081c1d718600a25f541444ce66603ed84b99e66b0ced6fb773ca40f98cd5dc1348d79')
 

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2018-10-04 22:24:04 UTC (rev 335772)
+++ nvidia-drm-outputclass.conf 2018-10-04 22:44:58 UTC (rev 335773)
@@ -9,6 +9,7 @@
 MatchDriver "nvidia-drm"
 Driver "nvidia"
 Option "AllowEmptyInitialConfiguration"
+Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 ModulePath "/usr/lib/xorg/modules"
 EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2018-09-24 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, September 24, 2018 @ 06:52:01
  Author: svenstaro
Revision: 335290

upgpkg: nvidia-utils 410.57-2

Remove PrimaryGPU from OutputClass due to FS#60102

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

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

Modified: PKGBUILD
===
--- PKGBUILD2018-09-24 06:14:22 UTC (rev 335289)
+++ PKGBUILD2018-09-24 06:52:01 UTC (rev 335290)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=410.57
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
@@ -14,7 +14,7 @@
 source=('nvidia-drm-outputclass.conf'
 'nvidia-utils.sysusers'
 
"https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;)
-sha512sums=('c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48'
+sha512sums=('4b7ee569b4f7e5d8c8e17bcc3d25ae78ab859abbf51cded9179ee723f41570a3d4c57af8649b8b1a24689374921bdf45c8fb4689149f3ee254ff093d71e662e7'
 
'4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499'
 
'2ba6b4b7829410152e0fa57772969ca59f134995ef93d08c12cc6a7a97e081c1d718600a25f541444ce66603ed84b99e66b0ced6fb773ca40f98cd5dc1348d79')
 
@@ -76,8 +76,9 @@
 # Ensure that X finds glx
 ln -s "libglxserver_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1"
 ln -s "libglxserver_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so"
+
 # X wrapped software rendering
-enstall -D -m755 "libnvidia-wfb.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-wfb.so.${pkgver}"
+install -D -m755 "libnvidia-wfb.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-wfb.so.${pkgver}"
 
 install -D -m755 "libGLX_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/libGLX_nvidia.so.${pkgver}"
 

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2018-09-24 06:14:22 UTC (rev 335289)
+++ nvidia-drm-outputclass.conf 2018-09-24 06:52:01 UTC (rev 335290)
@@ -9,7 +9,6 @@
 MatchDriver "nvidia-drm"
 Driver "nvidia"
 Option "AllowEmptyInitialConfiguration"
-Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 ModulePath "/usr/lib/xorg/modules"
 EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2017-02-27 Thread Laurent Carlier 
Date: Monday, February 27, 2017 @ 17:23:43
  Author: lcarlier
Revision: 289630

upgpkg: nvidia-utils 378.13-5

Use a better default configuration file especially for optimus systems

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

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

Modified: PKGBUILD
===
--- PKGBUILD2017-02-27 16:56:49 UTC (rev 289629)
+++ PKGBUILD2017-02-27 17:23:43 UTC (rev 289630)
@@ -6,7 +6,7 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=378.13
-pkgrel=4
+pkgrel=5
 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;)
-md5sums=('158fc0ff11167957884768cfdc3dd77a')
+md5sums=('a433deeb5f9cc661e537f42bde2f1df7')
 md5sums_i686=('dd1077750af9a067739ec291fb24175f')
 md5sums_x86_64=('fe4d25b19a780a690cafc8e3b7c0113f')
 

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2017-02-27 16:56:49 UTC (rev 289629)
+++ nvidia-drm-outputclass.conf 2017-02-27 17:23:43 UTC (rev 289630)
@@ -1,4 +1,10 @@
 Section "OutputClass"
+Identifier "intel"
+MatchDriver "i915"
+Driver "modesetting"
+EndSection
+
+Section "OutputClass"
 Identifier "nvidia"
 MatchDriver "nvidia-drm"
 Driver "nvidia"
@@ -6,9 +12,3 @@
 Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 EndSection
-
-Section "OutputClass"
-Identifier "intel"
-MatchDriver "i915"
-Driver "modesetting"
-EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2017-02-27 Thread Laurent Carlier 
Date: Monday, February 27, 2017 @ 12:16:46
  Author: lcarlier
Revision: 289616

upgpkg: nvidia-utils 378.13-4

update libglvnd rebuild package

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

-+
 PKGBUILD|   36 +++-
 nvidia-drm-outputclass.conf |8 
 2 files changed, 15 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-27 10:30:10 UTC (rev 289615)
+++ PKGBUILD2017-02-27 12:16:46 UTC (rev 289616)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner 
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
+pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=378.13
-pkgrel=3
+pkgrel=4
 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;)
-md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums=('158fc0ff11167957884768cfdc3dd77a')
 md5sums_i686=('dd1077750af9a067739ec291fb24175f')
 md5sums_x86_64=('fe4d25b19a780a690cafc8e3b7c0113f')
 
@@ -55,31 +55,6 @@
 ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
 }
 
-package_nvidia-libgl() {
-pkgdesc="NVIDIA drivers libraries symlinks"
-depends=('nvidia-utils')
-conflicts=('libgl' 'libegl' 'libgles')
-provides=('libgl' 'libegl' 'libgles')
-cd "${_pkg}"
-
-mkdir -p "${pkgdir}/usr/lib/"
-
-ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
-ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
-
-ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
-ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
-
-ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
-
-ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
-ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
-
-mkdir -p "${pkgdir}/usr/share/licenses"
-ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
-}
-
 package_nvidia-utils() {
 pkgdesc="NVIDIA drivers utilities"
 depends=('xorg-server' 'libglvnd')
@@ -86,8 +61,11 @@
 optdepends=('nvidia-settings: configuration tool'
 'xorg-server-devel: nvidia-xconfig'
 'opencl-nvidia: OpenCL support')
-provides=('vulkan-driver')
+conflicts=('nvidia-libgl')
+provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
+replaces=('nvidia-libgl')
 install="${pkgname}.install"
+
 cd "${_pkg}"
 
 # X driver

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2017-02-27 10:30:10 UTC (rev 289615)
+++ nvidia-drm-outputclass.conf 2017-02-27 12:16:46 UTC (rev 289616)
@@ -2,5 +2,13 @@
 Identifier "nvidia"
 MatchDriver "nvidia-drm"
 Driver "nvidia"
+Option "AllowEmptyInitialConfiguration"
+Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 EndSection
+
+Section "OutputClass"
+Identifier "intel"
+MatchDriver "i915"
+Driver "modesetting"
+EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2017-02-27 Thread Laurent Carlier 
Date: Monday, February 27, 2017 @ 09:31:02
  Author: lcarlier
Revision: 289602

upgpkg: nvidia-utils 378.13-2

rebuild without libglvnd update, not yet merged

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

-+
 PKGBUILD|   36 +---
 nvidia-drm-outputclass.conf |8 
 2 files changed, 29 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-27 09:13:11 UTC (rev 289601)
+++ PKGBUILD2017-02-27 09:31:02 UTC (rev 289602)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner 
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'opencl-nvidia')
+pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
 pkgver=378.13
-pkgrel=3
+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;)
-md5sums=('158fc0ff11167957884768cfdc3dd77a')
+md5sums=('4f5562ee8f3171769e4638b35396c55d')
 md5sums_i686=('dd1077750af9a067739ec291fb24175f')
 md5sums_x86_64=('fe4d25b19a780a690cafc8e3b7c0113f')
 
@@ -55,6 +55,31 @@
 ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
 }
 
+package_nvidia-libgl() {
+pkgdesc="NVIDIA drivers libraries symlinks"
+depends=('nvidia-utils')
+conflicts=('libgl' 'libegl' 'libgles')
+provides=('libgl' 'libegl' 'libgles')
+cd "${_pkg}"
+
+mkdir -p "${pkgdir}/usr/lib/"
+
+ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
+ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
+
+ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
+ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
+
+ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
+ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
+
+ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
+ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
+
+mkdir -p "${pkgdir}/usr/share/licenses"
+ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
+}
+
 package_nvidia-utils() {
 pkgdesc="NVIDIA drivers utilities"
 depends=('xorg-server' 'libglvnd')
@@ -61,11 +86,8 @@
 optdepends=('nvidia-settings: configuration tool'
 'xorg-server-devel: nvidia-xconfig'
 'opencl-nvidia: OpenCL support')
-conflicts=('nvidia-libgl')
-provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
-replaces=('nvidia-libgl')
+provides=('vulkan-driver')
 install="${pkgname}.install"
-
 cd "${_pkg}"
 
 # X driver

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2017-02-27 09:13:11 UTC (rev 289601)
+++ nvidia-drm-outputclass.conf 2017-02-27 09:31:02 UTC (rev 289602)
@@ -2,13 +2,5 @@
 Identifier "nvidia"
 MatchDriver "nvidia-drm"
 Driver "nvidia"
-Option "AllowEmptyInitialConfiguration"
-Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 EndSection
-
-Section "OutputClass"
-Identifier "intel"
-MatchDriver "i915"
-Driver "modesetting"
-EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2017-02-23 Thread Laurent Carlier 
Date: Thursday, February 23, 2017 @ 10:10:00
  Author: lcarlier
Revision: 289417

upgpkg: nvidia-utils 378.13-2

update libglvnd driver to 378.13

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

-+
 PKGBUILD|   36 +++-
 nvidia-drm-outputclass.conf |8 
 2 files changed, 15 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-23 09:26:44 UTC (rev 289416)
+++ PKGBUILD2017-02-23 10:10:00 UTC (rev 289417)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner 
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
+pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=378.13
-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;)
-md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums=('158fc0ff11167957884768cfdc3dd77a')
 md5sums_i686=('dd1077750af9a067739ec291fb24175f')
 md5sums_x86_64=('fe4d25b19a780a690cafc8e3b7c0113f')
 
@@ -55,31 +55,6 @@
 ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
 }
 
-package_nvidia-libgl() {
-pkgdesc="NVIDIA drivers libraries symlinks"
-depends=('nvidia-utils')
-conflicts=('libgl' 'libegl' 'libgles')
-provides=('libgl' 'libegl' 'libgles')
-cd "${_pkg}"
-
-mkdir -p "${pkgdir}/usr/lib/"
-
-ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
-ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
-
-ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
-ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
-
-ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
-
-ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
-ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
-
-mkdir -p "${pkgdir}/usr/share/licenses"
-ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
-}
-
 package_nvidia-utils() {
 pkgdesc="NVIDIA drivers utilities"
 depends=('xorg-server' 'libglvnd')
@@ -86,8 +61,11 @@
 optdepends=('nvidia-settings: configuration tool'
 'xorg-server-devel: nvidia-xconfig'
 'opencl-nvidia: OpenCL support')
-provides=('vulkan-driver')
+conflicts=('nvidia-libgl')
+provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
+replaces=('nvidia-libgl')
 install="${pkgname}.install"
+
 cd "${_pkg}"
 
 # X driver

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2017-02-23 09:26:44 UTC (rev 289416)
+++ nvidia-drm-outputclass.conf 2017-02-23 10:10:00 UTC (rev 289417)
@@ -2,5 +2,13 @@
 Identifier "nvidia"
 MatchDriver "nvidia-drm"
 Driver "nvidia"
+Option "AllowEmptyInitialConfiguration"
+Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 EndSection
+
+Section "OutputClass"
+Identifier "intel"
+MatchDriver "i915"
+Driver "modesetting"
+EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2017-02-14 Thread Laurent Carlier 
Date: Tuesday, February 14, 2017 @ 18:53:08
  Author: lcarlier
Revision: 288982

upgpkg: nvidia-utils 378.13-1

upstream update 378.13

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

-+
 PKGBUILD|   68 +-
 nvidia-drm-outputclass.conf |8 
 2 files changed, 34 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-14 18:10:50 UTC (rev 288981)
+++ PKGBUILD2017-02-14 18:53:08 UTC (rev 288982)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner 
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=375.26
-pkgrel=4
+pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
+pkgver=378.13
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
@@ -14,9 +14,9 @@
 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;)
-md5sums=('158fc0ff11167957884768cfdc3dd77a')
-md5sums_i686=('b0706e88ad173f6b9c7bd2e5a838c163')
-md5sums_x86_64=('5595fb385e41638c5118784114b03d9a')
+md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums_i686=('dd1077750af9a067739ec291fb24175f')
+md5sums_x86_64=('fe4d25b19a780a690cafc8e3b7c0113f')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -55,31 +55,31 @@
 ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
 }
 
-#package_nvidia-libgl() {
-#pkgdesc="NVIDIA drivers libraries symlinks"
-#depends=('nvidia-utils')
-#conflicts=('libgl' 'libegl' 'libgles')
-#provides=('libgl' 'libegl' 'libgles')
-#cd "${_pkg}"
-#
-#mkdir -p "${pkgdir}/usr/lib/"
-#
-#ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
-#ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
-#
-#ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
-#ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
-#
-#ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-#ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
-#
-#ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
-#ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
-#
-#mkdir -p "${pkgdir}/usr/share/licenses"
-#ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
-#}
+package_nvidia-libgl() {
+pkgdesc="NVIDIA drivers libraries symlinks"
+depends=('nvidia-utils')
+conflicts=('libgl' 'libegl' 'libgles')
+provides=('libgl' 'libegl' 'libgles')
+cd "${_pkg}"
 
+mkdir -p "${pkgdir}/usr/lib/"
+
+ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
+ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
+
+ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
+ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
+
+ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
+ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
+
+ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
+ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
+
+mkdir -p "${pkgdir}/usr/share/licenses"
+ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
+}
+
 package_nvidia-utils() {
 pkgdesc="NVIDIA drivers utilities"
 depends=('xorg-server' 'libglvnd')
@@ -86,8 +86,7 @@
 optdepends=('nvidia-settings: configuration tool'
 'xorg-server-devel: nvidia-xconfig'
 'opencl-nvidia: OpenCL support')
-conflicts=('nvidia-libgl')
-provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
+provides=('vulkan-driver')
 install="${pkgname}.install"
 cd "${_pkg}"
 
@@ -103,8 +102,9 @@
 ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0"
 
 # Wayland stuff
-install -D -m755 "libnvidia-egl-wayland.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-egl-wayland.so.${pkgver}"
-ln -s "libnvidia-egl-wayland.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-egl-wayland.so.0"
+install -D -m755 "libnvidia-egl-wayland.so.1.0.1" 
"${pkgdir}/usr/lib/libnvidia-egl-wayland.so.1.0.1"
+ln -s "libnvidia-egl-wayland.so.1.0.1" 
"${pkgdir}/usr/lib/libnvidia-egl-wayland.so.1"
+install -D -m644 "10_nvidia_wayland.json" 
"${pkgdir}/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json"
 
 # OpenGL libraries
 install -D -m755 "libEGL_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/libEGL_nvidia.so.${pkgver}"

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2017-02-13 Thread Laurent Carlier 
Date: Monday, February 13, 2017 @ 09:49:30
  Author: lcarlier
Revision: 288861

upgpkg: nvidia-utils 375.26-4

libglvnd rebuild

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

-+
 PKGBUILD|   57 +-
 nvidia-drm-outputclass.conf |8 +
 2 files changed, 37 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-13 09:36:49 UTC (rev 288860)
+++ PKGBUILD2017-02-13 09:49:30 UTC (rev 288861)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner 
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
+pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=375.26
-pkgrel=3
+pkgrel=4
 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;)
-md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums=('158fc0ff11167957884768cfdc3dd77a')
 md5sums_i686=('b0706e88ad173f6b9c7bd2e5a838c163')
 md5sums_x86_64=('5595fb385e41638c5118784114b03d9a')
 
@@ -55,31 +55,31 @@
 ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
 }
 
-package_nvidia-libgl() {
-pkgdesc="NVIDIA drivers libraries symlinks"
-depends=('nvidia-utils')
-conflicts=('libgl' 'libegl' 'libgles')
-provides=('libgl' 'libegl' 'libgles')
-cd "${_pkg}"
+#package_nvidia-libgl() {
+#pkgdesc="NVIDIA drivers libraries symlinks"
+#depends=('nvidia-utils')
+#conflicts=('libgl' 'libegl' 'libgles')
+#provides=('libgl' 'libegl' 'libgles')
+#cd "${_pkg}"
+#
+#mkdir -p "${pkgdir}/usr/lib/"
+#
+#ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
+#ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
+#
+#ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
+#ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
+#
+#ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
+#ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
+#
+#ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
+#ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
+#
+#mkdir -p "${pkgdir}/usr/share/licenses"
+#ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
+#}
 
-mkdir -p "${pkgdir}/usr/lib/"
-
-ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
-ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
-
-ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
-ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
-
-ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
-
-ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
-ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
-
-mkdir -p "${pkgdir}/usr/share/licenses"
-ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
-}
-
 package_nvidia-utils() {
 pkgdesc="NVIDIA drivers utilities"
 depends=('xorg-server' 'libglvnd')
@@ -86,7 +86,8 @@
 optdepends=('nvidia-settings: configuration tool'
 'xorg-server-devel: nvidia-xconfig'
 'opencl-nvidia: OpenCL support')
-provides=('vulkan-driver')
+conflicts=('nvidia-libgl')
+provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
 install="${pkgname}.install"
 cd "${_pkg}"
 

Modified: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2017-02-13 09:36:49 UTC (rev 288860)
+++ nvidia-drm-outputclass.conf 2017-02-13 09:49:30 UTC (rev 288861)
@@ -2,5 +2,13 @@
 Identifier "nvidia"
 MatchDriver "nvidia-drm"
 Driver "nvidia"
+Option "AllowEmptyInitialConfiguration"
+Option "PrimaryGPU" "yes"
 ModulePath "/usr/lib/nvidia/xorg"
 EndSection
+
+Section "OutputClass"
+Identifier "intel"
+MatchDriver "i915"
+Driver "modesetting"
+EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2017-02-12 Thread Laurent Carlier 
Date: Sunday, February 12, 2017 @ 17:35:14
  Author: lcarlier
Revision: 288756

upgpkg: nvidia-utils 375.26-3

remove glx symlink support

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

-+
 PKGBUILD|   21 +++--
 nvidia-drm-outputclass.conf |6 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-12 16:40:19 UTC (rev 288755)
+++ PKGBUILD2017-02-12 17:35:14 UTC (rev 288756)
@@ -6,15 +6,17 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
 pkgver=375.26
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
 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_i686=('3bc859a95469a45f3c627018248d83e178d160385c3d17d9f890b0d142ecd1220fb21c442e4fe7755b831227a9c820736f447b162acd9699819c6e8145d6d841')
-sha512sums_x86_64=('f52f6597daa1eaf4cbd934d785da6028ef23ecef98e14746143e3738504f8d65b73788abbcf9fd812317fc2c53cdf1c4d4839de57fafdea1930a08c6b21f1992')
+md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums_i686=('b0706e88ad173f6b9c7bd2e5a838c163')
+md5sums_x86_64=('5595fb385e41638c5118784114b03d9a')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -60,10 +62,7 @@
 provides=('libgl' 'libegl' 'libgles')
 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.1" "${pkgdir}/usr/lib/libGL.so.1"
 ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
@@ -95,8 +94,10 @@
 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
+
 install -D -m755 "libGLX_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/libGLX_nvidia.so.${pkgver}"
 ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0"
 
@@ -184,7 +185,7 @@
 ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
 
 # distro specific files must be installed in /usr/share/X11/xorg.conf.d
-install -D -m644 nvidia-drm-outputclass.conf 
"${pkgdir}/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf"
+install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" 
"${pkgdir}/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf"
 
 create_links
 }

Added: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf (rev 0)
+++ nvidia-drm-outputclass.conf 2017-02-12 17:35:14 UTC (rev 288756)
@@ -0,0 +1,6 @@
+Section "OutputClass"
+Identifier "nvidia"
+MatchDriver "nvidia-drm"
+Driver "nvidia"
+ModulePath "/usr/lib/nvidia/xorg"
+EndSection

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2015-11-20 Thread Felix Yan 
Date: Saturday, November 21, 2015 @ 04:01:14
  Author: fyan
Revision: 251757

upgpkg: nvidia-utils 358.16-1

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

-+
 PKGBUILD|   18 --
 nvidia-drm-outputclass.conf |6 --
 2 files changed, 8 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-21 00:43:20 UTC (rev 251756)
+++ PKGBUILD2015-11-21 03:01:14 UTC (rev 251757)
@@ -5,18 +5,16 @@
 
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
-pkgver=355.11
-pkgrel=2
+pkgver=358.16
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/;
 license=('custom')
 options=('!strip')
-source=(nvidia-drm-outputclass.conf)
-source_i686=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run;)
-source_x86_64=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;)
-sha1sums=('4ca2fbb2389d0bcb7a2c6f614860522d9ddf58ab')
-sha1sums_i686=('5e944003366c2ec701ba5e0faf897cc1fd0defbf')
-sha1sums_x86_64=('e21f03e2f641e8b36ac6f2df0f632b1ce5b83d63')
+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=('a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20')
+sha512sums_x86_64=('eb1abeebbfa807c784e9019afaa3f238d2142b28467c80dcac8d5199cf1082d72ab417e39660bda076023aecb7d04d9c3c91a2d494f1513cfe82b617b17a2297')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -46,7 +44,7 @@
 # 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 -m755 "libnvidia-opencl.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}"
 
 create_links
 
@@ -184,7 +182,7 @@
 ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
 
 # distro specific files must be installed in /usr/share/X11/xorg.conf.d
-install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" 
"${pkgdir}/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf"
+install -D -m644 nvidia-drm-outputclass.conf 
"${pkgdir}/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf"
 
 create_links
 }

Deleted: nvidia-drm-outputclass.conf
===
--- nvidia-drm-outputclass.conf 2015-11-21 00:43:20 UTC (rev 251756)
+++ nvidia-drm-outputclass.conf 2015-11-21 03:01:14 UTC (rev 251757)
@@ -1,6 +0,0 @@
-Section "OutputClass"
-   Identifier "nvidia"
-   MatchDriver "nvidia-drm"
-   Driver "nvidia"
-EndSection
-

[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

2015-11-10 Thread Andreas Radke 
Date: Tuesday, November 10, 2015 @ 14:27:54
  Author: andyrtr
Revision: 250539

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

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

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

Modified: PKGBUILD
===
--- PKGBUILD2015-11-10 13:26:56 UTC (rev 250538)
+++ PKGBUILD2015-11-10 13:27:54 UTC (rev 250539)
@@ -11,9 +11,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=('5e944003366c2ec701ba5e0faf897cc1fd0defbf'
-  'e21f03e2f641e8b36ac6f2df0f632b1ce5b83d63')
+  'e21f03e2f641e8b36ac6f2df0f632b1ce5b83d63'
+  '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:27:54 UTC (rev 250539)
@@ -0,0 +1,6 @@
+Section "OutputClass"
+   Identifier "nvidia"
+   MatchDriver "nvidia-drm"
+   Driver "nvidia"
+EndSection
+