Date: Friday, February 2, 2018 @ 20:45:58
  Author: heftig
Revision: 315776

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/PKGBUILD
    (from rev 315775, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/fix-abi.patch
    (from rev 315775, nvidia/trunk/fix-abi.patch)
Deleted:
  nvidia/repos/testing-x86_64/PKGBUILD
  nvidia/repos/testing-x86_64/fix-abi.patch

---------------+
 PKGBUILD      |  158 ++++++++++++++++++++++++++++----------------------------
 fix-abi.patch |   24 ++++----
 2 files changed, 93 insertions(+), 89 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-02-02 20:42:55 UTC (rev 315775)
+++ PKGBUILD    2018-02-02 20:45:58 UTC (rev 315776)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Thomas Baechler <tho...@archlinux.org>
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=390.25
-_extramodules=extramodules-4.15-ARCH
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux"
-arch=('x86_64')
-url="http://www.nvidia.com/";
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 
'linux-headers>=4.15' 'linux-headers<4.16')
-license=('custom')
-options=('!strip')
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-sha256sums=('02263bc81b66e68fc8224447b249f4f0ca4ae201c467e236d917be2fe187f3d6')
-
-_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
-prepare() {
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}"
-
-    cp -a kernel kernel-dkms
-    cd kernel-dkms
-    sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
-    sed -i 's/__JOBS/`nproc`/' dkms.conf
-    sed -i 's/__DKMS_MODULES//' dkms.conf
-    sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[2]="nvidia-modeset"\
-DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[3]="nvidia-drm"\
-DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
-
-    # Gift for linux-rt guys
-    sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
-}
-
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${_pkg}"/kernel
-    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
-    pkgdesc="NVIDIA drivers for linux"
-    depends=('linux>=4.15' 'linux<4.16' "nvidia-utils=${pkgver}" 'libgl')
-
-    install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
-      "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
-    echo "blacklist nouveau" |
-      install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
-
-package_nvidia-dkms() {
-    pkgdesc="NVIDIA driver sources for linux"
-    depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
-    optdepends=('linux-headers: Build the module for Arch kernel'
-                'linux-lts-headers: Build the module for LTS Arch kernel')
-    conflicts+=('nvidia')
-
-    cd ${_pkg}
-
-    install -dm 755 "${pkgdir}"/usr/src
-    cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
-
-    echo "blacklist nouveau" |
-      install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 315775, 
nvidia/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-02-02 20:45:58 UTC (rev 315776)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Thomas Baechler <tho...@archlinux.org>
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=390.25
+_extramodules=extramodules-4.15-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/";
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 
'linux-headers>=4.15' 'linux-headers<4.16')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
+sha256sums=('02263bc81b66e68fc8224447b249f4f0ca4ae201c467e236d917be2fe187f3d6')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+
+    cp -a kernel kernel-dkms
+    cd kernel-dkms
+    sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+    sed -i 's/__JOBS/`nproc`/' dkms.conf
+    sed -i 's/__DKMS_MODULES//' dkms.conf
+    sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+    # Gift for linux-rt guys
+    sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${_pkg}"/kernel
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+    pkgdesc="NVIDIA drivers for linux"
+    depends=('linux>=4.15' 'linux<4.16' "nvidia-utils=${pkgver}" 'libgl')
+
+    install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+      "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+    find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+    echo "blacklist nouveau" |
+      install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+    install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+    pkgdesc="NVIDIA driver sources for linux"
+    depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
+    optdepends=('linux-headers: Build the module for Arch kernel'
+                'linux-lts-headers: Build the module for LTS Arch kernel')
+    conflicts+=('nvidia')
+
+    cd ${_pkg}
+
+    install -dm 755 "${pkgdir}"/usr/src
+    cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+    echo "blacklist nouveau" |
+      install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+
+    install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Deleted: fix-abi.patch
===================================================================
--- fix-abi.patch       2018-02-02 20:42:55 UTC (rev 315775)
+++ fix-abi.patch       2018-02-02 20:45:58 UTC (rev 315776)
@@ -1,12 +0,0 @@
-diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c 
kernel-patched/nvidia-drm/nvidia-drm-fence.c
---- kernel/nvidia-drm/nvidia-drm-fence.c       2016-08-09 01:43:19.000000000 
+0200
-+++ kernel-patched/nvidia-drm/nvidia-drm-fence.c       2016-08-25 
14:31:34.419655564 +0200
-@@ -325,7 +325,7 @@
-     struct nvidia_drm_gem_object *nv_gem;
- };
- 
--static void nvidia_drm_gem_prime_soft_fence_event
-+static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event
- (
-     void *dataPtr,
-     NvU32 dataU32

Copied: nvidia/repos/testing-x86_64/fix-abi.patch (from rev 315775, 
nvidia/trunk/fix-abi.patch)
===================================================================
--- fix-abi.patch                               (rev 0)
+++ fix-abi.patch       2018-02-02 20:45:58 UTC (rev 315776)
@@ -0,0 +1,12 @@
+diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c 
kernel-patched/nvidia-drm/nvidia-drm-fence.c
+--- kernel/nvidia-drm/nvidia-drm-fence.c       2016-08-09 01:43:19.000000000 
+0200
++++ kernel-patched/nvidia-drm/nvidia-drm-fence.c       2016-08-25 
14:31:34.419655564 +0200
+@@ -325,7 +325,7 @@
+     struct nvidia_drm_gem_object *nv_gem;
+ };
+ 
+-static void nvidia_drm_gem_prime_soft_fence_event
++static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event
+ (
+     void *dataPtr,
+     NvU32 dataU32

Reply via email to