[arch-commits] Commit in r8168/repos (3 files)
Date: Sunday, April 1, 2018 @ 03:00:31
Author: heftig
Revision: 313695
archrelease: copy trunk to community-staging-x86_64
Added:
r8168/repos/community-staging-x86_64/
r8168/repos/community-staging-x86_64/PKGBUILD
(from rev 313694, r8168/trunk/PKGBUILD)
r8168/repos/community-staging-x86_64/linux-4.15.patch
(from rev 313694, r8168/trunk/linux-4.15.patch)
--+
PKGBUILD | 49
linux-4.15.patch | 81 +
2 files changed, 130 insertions(+)
Copied: r8168/repos/community-staging-x86_64/PKGBUILD (from rev 313694,
r8168/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2018-04-01 03:00:31 UTC (rev 313695)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip , Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.045.08
+pkgrel=45
+pkgdesc="A kernel module for Realtek 8168 network cards"
+url="http://www.realtek.com.tw";
+license=("GPL")
+arch=('x86_64')
+depends=('glibc' 'linux')
+makedepends=('linux-headers')
+source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz
+linux-4.15.patch)
+sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31'
+'6434f0d1fcb08e3605a17859d3b8946c65bcf14737e223315b6468b3394c5cd7')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../linux-4.15.patch
+}
+
+build() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ KERNEL_VERSION=$(cat
/usr/lib/modules/extramodules-$_kernver-ARCH/version)
+ msg2 "Kernel = $KERNEL_VERSION"
+
+ cd "$pkgname-$pkgver"
+ # avoid using the Makefile directly -- it doesn't understand
+ # any kernel but the current.
+ make -C /usr/lib/modules/$KERNEL_VERSION/build \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+package() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/*.}
+ 1)")
+
+ cd "$pkgname-$pkgver"
+ install -Dt "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH" -m644
src/*.ko
+ find "$pkgdir" -name '*.ko' -exec xz {} +
+
+ echo "blacklist r8169" | \
+ install -Dm644 /dev/stdin
"$pkgdir/usr/lib/modprobe.d/r8168.conf"
+}
Copied: r8168/repos/community-staging-x86_64/linux-4.15.patch (from rev 313694,
r8168/trunk/linux-4.15.patch)
===
--- community-staging-x86_64/linux-4.15.patch (rev 0)
+++ community-staging-x86_64/linux-4.15.patch 2018-04-01 03:00:31 UTC (rev
313695)
@@ -0,0 +1,81 @@
+diff -u -r r8168-8.045.08/src/r8168_n.c r8168-8.045.08-4.15/src/r8168_n.c
+--- r8168-8.045.08/src/r8168_n.c 2017-09-22 17:31:17.0 +0200
r8168-8.045.08-4.15/src/r8168_n.c 2018-01-29 12:33:34.283394438 +0100
+@@ -407,8 +407,13 @@
+ static void rtl8168_sleep_rx_enable(struct net_device *dev);
+ static void rtl8168_dsm(struct net_device *dev, int dev_state);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void rtl8168_esd_timer(unsigned long __opaque);
+ static void rtl8168_link_timer(unsigned long __opaque);
++#else
++static void rtl8168_esd_timer(struct timer_list *timer_list);
++static void rtl8168_link_timer(struct timer_list *timer_list);
++#endif
+ static void rtl8168_tx_clear(struct rtl8168_private *tp);
+ static void rtl8168_rx_clear(struct rtl8168_private *tp);
+
+@@ -22964,7 +22969,11 @@
+ struct rtl8168_private *tp = netdev_priv(dev);
+ struct timer_list *timer = &tp->esd_timer;
+
+-setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
++setup_timer(timer, rtl8168_esd_timer, (unsigned long)tp);
++#else
++timer_setup(timer, rtl8168_esd_timer, 0);
++#endif
+ mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT);
+ }
+
+@@ -22978,7 +22987,11 @@
+ struct rtl8168_private *tp = netdev_priv(dev);
+ struct timer_list *timer = &tp->link_timer;
+
+-setup_timer(timer, rtl8168_link_timer, (unsigned long)dev);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
++setup_timer(timer, rtl8168_link_timer, (unsigned long)tp);
++#else
++timer_setup(timer, rtl8168_link_timer, 0);
++#endif
+ mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT);
+ }
+
+@@ -24717,10 +24730,16 @@
+ #define PCI_DEVICE_SERIAL_NUMBER (0x0164)
+
+ static void
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ rtl8168_esd_timer(unsigned long __opaque)
+ {
+-
[arch-commits] Commit in acpi_call/repos (3 files)
Date: Sunday, April 1, 2018 @ 03:01:26
Author: heftig
Revision: 313697
archrelease: copy trunk to community-staging-x86_64
Added:
acpi_call/repos/community-staging-x86_64/
acpi_call/repos/community-staging-x86_64/PKGBUILD
(from rev 313696, acpi_call/trunk/PKGBUILD)
acpi_call/repos/community-staging-x86_64/dkms.conf
(from rev 313696, acpi_call/trunk/dkms.conf)
---+
PKGBUILD | 62
dkms.conf |9
2 files changed, 71 insertions(+)
Copied: acpi_call/repos/community-staging-x86_64/PKGBUILD (from rev 313696,
acpi_call/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2018-04-01 03:01:26 UTC (rev 313697)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Maxime Gauduin
+# Contributor: mortzu
+# Contributor: fnord0
+
+pkgbase=acpi_call
+pkgname=(acpi_call acpi_call-dkms)
+pkgver=1.1.0
+pkgrel=117
+pkgdesc='A linux kernel module that enables calls to ACPI methods through
/proc/acpi/call'
+url='https://github.com/mkottman/acpi_call'
+arch=('x86_64')
+license=('GPL')
+depends=('linux>=4.15' 'linux<4.16')
+makedepends=('linux-headers>=4.15' 'linux-headers<4.16')
+_extramodules=extramodules-4.15-ARCH
+source=("acpi_call-${pkgver}.tar.gz::https://github.com/mkottman/acpi_call/archive/v${pkgver}.tar.gz";
+dkms.conf)
+sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0'
+'32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a')
+
+prepare() {
+ cd $pkgbase-$pkgver
+
+ # Fix build with Linux >= 3.17
+ sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c
+
+ # Fix build with Linux >= 4.12
+ sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ make KVERSION="$(cat /usr/lib/modules/$_extramodules/version)"
+}
+
+package_acpi_call() {
+ cd $pkgbase-$pkgver
+ install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *.ko
+ find "$pkgdir" -name '*.ko' -exec xz {} +
+
+ echo acpi_call | install -Dm644 /dev/stdin
"$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
+
+ mkdir -p "$pkgdir/usr/share/acpi_call"
+ cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples
support
+}
+
+package_acpi_call-dkms() {
+ depends=(dkms)
+ provides=("acpi_call=$pkgver-$pkgrel")
+ conflicts=(acpi_call)
+
+ cd $pkgbase-$pkgver
+ install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c
../dkms.conf
+
+ echo acpi_call | install -Dm644 /dev/stdin
"$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
+
+ mkdir -p "$pkgdir/usr/share/acpi_call"
+ cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples
support
+}
+
+# vim:set ts=2 sw=2 et:
Copied: acpi_call/repos/community-staging-x86_64/dkms.conf (from rev 313696,
acpi_call/trunk/dkms.conf)
===
--- community-staging-x86_64/dkms.conf (rev 0)
+++ community-staging-x86_64/dkms.conf 2018-04-01 03:01:26 UTC (rev 313697)
@@ -0,0 +1,9 @@
+PACKAGE_NAME="acpi_call"
+PACKAGE_VERSION="#MODULE_VERSION#"
+AUTOINSTALL="yes"
+
+MAKE[0]="make KVERSION=$kernelver"
+CLEAN="make clean"
+
+BUILT_MODULE_NAME[0]="acpi_call"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
[arch-commits] Commit in vhba-module/repos (4 files)
Date: Sunday, April 1, 2018 @ 03:01:02
Author: heftig
Revision: 313696
archrelease: copy trunk to community-staging-x86_64
Added:
vhba-module/repos/community-staging-x86_64/
vhba-module/repos/community-staging-x86_64/60-vhba.rules
(from rev 313695, vhba-module/trunk/60-vhba.rules)
vhba-module/repos/community-staging-x86_64/PKGBUILD
(from rev 313695, vhba-module/trunk/PKGBUILD)
vhba-module/repos/community-staging-x86_64/dkms.conf
(from rev 313695, vhba-module/trunk/dkms.conf)
---+
60-vhba.rules |1 +
PKGBUILD | 52
dkms.conf |9 +
3 files changed, 62 insertions(+)
Copied: vhba-module/repos/community-staging-x86_64/60-vhba.rules (from rev
313695, vhba-module/trunk/60-vhba.rules)
===
--- community-staging-x86_64/60-vhba.rules (rev 0)
+++ community-staging-x86_64/60-vhba.rules 2018-04-01 03:01:02 UTC (rev
313696)
@@ -0,0 +1 @@
+ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root",
GROUP="cdemu", TAG+="uaccess"
Copied: vhba-module/repos/community-staging-x86_64/PKGBUILD (from rev 313695,
vhba-module/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2018-04-01 03:01:02 UTC (rev 313696)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Ray Rashif
+# Contributor: Mateusz Herych
+# Contributor: Charles Lindsay
+
+pkgbase=vhba-module
+pkgname=(vhba-module vhba-module-dkms)
+pkgver=20170610
+pkgrel=58
+pkgdesc="Kernel module that emulates SCSI devices"
+url="http://cdemu.sourceforge.net/";
+arch=(x86_64)
+license=(GPL)
+depends=('linux>=4.15' 'linux<4.16')
+makedepends=('linux-headers>=4.15' 'linux-headers<4.16')
+_extramodules=extramodules-4.15-ARCH
+source=("https://downloads.sourceforge.net/cdemu/$pkgbase-$pkgver.tar.bz2";
+60-vhba.rules dkms.conf)
+sha256sums=('7970c93f989d9c4f2629371bf5ee7a76f95e4c12342c3320ddc528d0df02d9ec'
+'3052cb1cadbdf4bfb0b588bb8ed80691940d8dd63dc5502943d597eaf9f40c3b'
+'8cab0ebb4fee72069d63616b0983f105b98d1261e72e9bef5509a6e60bc382a7')
+
+prepare() {
+ cd $pkgbase-$pkgver
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ make KERNELRELEASE="$(cat /usr/lib/modules/$_extramodules/version)"
+}
+
+package_vhba-module() {
+ cd $pkgbase-$pkgver
+ install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *.ko
+ install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
+ echo 'g cdemu - -' | install -Dm644 /dev/stdin
"$pkgdir/usr/lib/sysusers.d/cdemu.conf"
+
+ find "$pkgdir" -name '*.ko' -exec xz {} +
+}
+
+package_vhba-module-dkms() {
+ depends=(dkms)
+ provides=("vhba-module=$pkgver-$pkgrel")
+ conflicts=(vhba-module)
+
+ cd $pkgbase-$pkgver
+ install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile vhba.c
../dkms.conf
+ install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
+ echo 'g cdemu - -' | install -Dm644 /dev/stdin
"$pkgdir/usr/lib/sysusers.d/cdemu.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: vhba-module/repos/community-staging-x86_64/dkms.conf (from rev 313695,
vhba-module/trunk/dkms.conf)
===
--- community-staging-x86_64/dkms.conf (rev 0)
+++ community-staging-x86_64/dkms.conf 2018-04-01 03:01:02 UTC (rev 313696)
@@ -0,0 +1,9 @@
+PACKAGE_NAME="vhba-module"
+PACKAGE_VERSION="#MODULE_VERSION#"
+AUTOINSTALL="yes"
+
+MAKE[0]="make KERNELRELEASE=$kernelver"
+CLEAN="make clean"
+
+BUILT_MODULE_NAME[0]="vhba"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/scsi"
[arch-commits] Commit in nvidia/repos (staging-x86_64 staging-x86_64/PKGBUILD)
Date: Sunday, April 1, 2018 @ 03:01:47
Author: heftig
Revision: 320806
archrelease: copy trunk to staging-x86_64
Added:
nvidia/repos/staging-x86_64/
nvidia/repos/staging-x86_64/PKGBUILD
(from rev 320805, nvidia/trunk/PKGBUILD)
--+
PKGBUILD | 81 +
1 file changed, 81 insertions(+)
Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 320805,
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-01 03:01:47 UTC (rev 320806)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase
+# Maintainer: Felix Yan
+# Contributor: Thomas Baechler
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=390.48
+_extramodules=extramodules-4.15-ARCH
+pkgrel=3
+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=('2d4bf72801f101a85df6fd1464021380ad51f5a30df05dadaf1fb546a175a441')
+
+_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/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644
"${srcdir}/${_pkg}/LICENSE"
+}
[arch-commits] Commit in nvidia-340xx/repos (3 files)
Date: Sunday, April 1, 2018 @ 03:02:06
Author: heftig
Revision: 320807
archrelease: copy trunk to staging-x86_64
Added:
nvidia-340xx/repos/staging-x86_64/
nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 320806, nvidia-340xx/trunk/PKGBUILD)
nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 320806, nvidia-340xx/trunk/kernel-4.11.patch)
---+
PKGBUILD | 71
kernel-4.11.patch | 38 +++
2 files changed, 109 insertions(+)
Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 320806,
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-01 03:02:06 UTC (rev 320807)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan
+# Contributor: Thomas Baechler
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=23
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15'
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+ "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >>
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 320806,
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-01 03:02:06 UTC (rev 320807)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:50:46.334075042 +0200
kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _fault(struct vm_fault *vmf)
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, &page, vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, &page, vmf->flags);
++#endif
+
+ vmf->page = page;
+
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;
[arch-commits] Commit in min/trunk (PKGBUILD icon.patch)
Date: Sunday, April 1, 2018 @ 03:46:17
Author: tensor5
Revision: 313698
upgpkg: min 1.7.1-1
Modified:
min/trunk/PKGBUILD
min/trunk/icon.patch
+
PKGBUILD |6 +++---
icon.patch |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-01 03:01:26 UTC (rev 313697)
+++ PKGBUILD2018-04-01 03:46:17 UTC (rev 313698)
@@ -2,7 +2,7 @@
# Maintainer: Nicola Squartini
pkgname=min
-pkgver=1.7.0
+pkgver=1.7.1
pkgrel=1
pkgdesc='A smarter, faster web browser'
arch=('any')
@@ -14,10 +14,10 @@
'min.desktop'
'min.js'
'icon.patch')
-sha256sums=('63d6e636eae7fcc4acf2827c14ebd55670807624cd955ff2b7b900ba67937358'
+sha256sums=('d0922298483069802b24c5a9dcc35d212ab042fafce3f04246719ba680998a40'
'a779a8daff1d684779ebc6d13ea4c2f09e838df018de41fa19fa3f25aa12e32f'
'c22324184b72b3fad5a0aadb4e18182414e0294c5596c26426adc204fd473258'
-'340459e0c61204ed280d96920bab3304b4005b99355e7434fcc4dddece5d687b')
+'1721c0c42da67c16264aa059428e6d5823293587f4ed541171e3cf382a0d48ae')
prepare() {
cd ${pkgname}-${pkgver}
Modified: icon.patch
===
--- icon.patch 2018-04-01 03:01:26 UTC (rev 313697)
+++ icon.patch 2018-04-01 03:46:17 UTC (rev 313698)
@@ -1,9 +1,9 @@
--- a/main/main.js
+++ b/main/main.js
-@@ -82,7 +82,6 @@
+@@ -81,7 +81,6 @@
minWidth: 320,
minHeight: 350,
- titleBarStyle: 'hidden-inset',
+ titleBarStyle: 'hiddenInset',
-icon: __dirname + '/icons/icon256.png',
frame: process.platform !== 'win32'
})
[arch-commits] Commit in min/repos/community-any (8 files)
Date: Sunday, April 1, 2018 @ 03:47:08
Author: tensor5
Revision: 313699
archrelease: copy trunk to community-any
Added:
min/repos/community-any/PKGBUILD
(from rev 313698, min/trunk/PKGBUILD)
min/repos/community-any/icon.patch
(from rev 313698, min/trunk/icon.patch)
min/repos/community-any/min.desktop
(from rev 313698, min/trunk/min.desktop)
min/repos/community-any/min.js
(from rev 313698, min/trunk/min.js)
Deleted:
min/repos/community-any/PKGBUILD
min/repos/community-any/icon.patch
min/repos/community-any/min.desktop
min/repos/community-any/min.js
-+
PKGBUILD| 156 +-
icon.patch | 20 +++
min.desktop | 18 +++---
min.js | 58 ++---
4 files changed, 126 insertions(+), 126 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2018-04-01 03:46:17 UTC (rev 313698)
+++ PKGBUILD2018-04-01 03:47:08 UTC (rev 313699)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Nicola Squartini
-
-pkgname=min
-pkgver=1.7.0
-pkgrel=1
-pkgdesc='A smarter, faster web browser'
-arch=('any')
-url='https://minbrowser.github.io/min'
-license=('Apache')
-depends=('electron')
-makedepends=('nodejs-grunt-cli' 'npm')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/minbrowser/min/archive/v${pkgver}.tar.gz";
-'min.desktop'
-'min.js'
-'icon.patch')
-sha256sums=('63d6e636eae7fcc4acf2827c14ebd55670807624cd955ff2b7b900ba67937358'
-'a779a8daff1d684779ebc6d13ea4c2f09e838df018de41fa19fa3f25aa12e32f'
-'c22324184b72b3fad5a0aadb4e18182414e0294c5596c26426adc204fd473258'
-'340459e0c61204ed280d96920bab3304b4005b99355e7434fcc4dddece5d687b')
-
-prepare() {
-cd ${pkgname}-${pkgver}
-
-patch -Np1 -i "${srcdir}"/icon.patch
-}
-
-build() {
-cd ${pkgname}-${pkgver}
-
-npm install decomment grunt grunt-contrib-concat grunt-contrib-uglify
-mkdir dist
-npm run buildTranslations
-grunt
-rm -r node_modules
-
-npm install --production --no-optional
-}
-
-package() {
-cd ${pkgname}-${pkgver}
-
-appdir=/usr/lib/${pkgname}
-
-install -dm755 "${pkgdir}"${appdir}
-cp -r * "${pkgdir}"${appdir}
-
-install -dm755 "${pkgdir}"/usr/share/icons/hicolor/256x256/apps
-mv icons/icon256.png \
-"${pkgdir}"/usr/share/icons/hicolor/256x256/apps/${pkgname}.png
-
-install -Dm755 "${srcdir}"/${pkgname}.js "${pkgdir}"/usr/bin/${pkgname}
-install -Dm644 "${srcdir}"/${pkgname}.desktop \
-"${pkgdir}"/usr/share/applications/${pkgname}.desktop
-
-# Clean up
-rm "${pkgdir}"${appdir}/dist/{build,webview}.js
-rm -r "${pkgdir}"${appdir}/icons
-rm -r "${pkgdir}"${appdir}/localization
-rm -r "${pkgdir}"${appdir}/main
-rm -r "${pkgdir}"${appdir}/scripts
-find "${pkgdir}"${appdir} \
--name "package.json" \
--exec sed -e "s|${srcdir}/${pkgname}-${pkgver}|${appdir}|" \
--i {} \; \
--or -name ".*" -prune -exec rm -r '{}' \; \
--or -name "Gruntfile.js" -exec rm '{}' \; \
--or -name "Makefile" -exec rm '{}' \; \
--or -name "bower.json" -exec rm '{}' \; \
--or -name "cli.js" -exec rm '{}' \; \
--or -name "cmd.js" -exec rm '{}' \; \
--or -name "coffee" -prune -exec rm -r '{}' \; \
--or -name "example" -prune -exec rm -r '{}' \; \
--or -name "gulpfile.js" -exec rm '{}' \; \
--or -name "scripts" -prune -exec rm -r '{}' \; \
--or -name "test" -prune -exec rm -r '{}' \; \
--or -name "tests" -prune -exec rm -r '{}' \;
-}
Copied: min/repos/community-any/PKGBUILD (from rev 313698, min/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2018-04-01 03:47:08 UTC (rev 313699)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Nicola Squartini
+
+pkgname=min
+pkgver=1.7.1
+pkgrel=1
+pkgdesc='A smarter, faster web browser'
+arch=('any')
+url='https://minbrowser.github.io/min'
+license=('Apache')
+depends=('electron')
+makedepends=('nodejs-grunt-cli' 'npm')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/minbrowser/min/archive/v${pkgver}.tar.gz";
+'min.desktop'
+'min.js'
+'icon.patch')
+sha256sums=('d0922298483069802b24c5a9dcc35d212ab042fafce3f04246719ba680998a40'
+'a779a8daff1d684779ebc6d13ea4c2f09e838df018de41fa19fa3f25aa12e32f'
+'c22324184b72b3fad5a0aadb4e18182414e0294c5596c26426adc204fd473258'
+'1721c0c42da67c16264aa059428e6d5823293587f4ed541171e3cf382a0d48ae')
+
+prepare() {
+cd ${pkgname}-${pkgver}
+
+patch -Np1 -i "${srcdir}"/icon.patch
+}
+
+build() {
+cd ${pkgname}-${pkgver}
+
+npm install decomment grunt grunt-contrib-concat grunt-contrib-uglify
+mkdir dist
+npm run buildTranslations
+grunt
+rm -r node_modules
+
+
[arch-commits] Commit in lib32-mesa/repos/multilib-testing-x86_64 (10 files)
Date: Sunday, April 1, 2018 @ 06:34:59
Author: lcarlier
Revision: 313707
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch
(from rev 313706, lib32-mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch)
lib32-mesa/repos/multilib-testing-x86_64/LICENSE
(from rev 313706, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
(from rev 313706, lib32-mesa/trunk/PKGBUILD)
lib32-mesa/repos/multilib-testing-x86_64/fix-install.diff
(from rev 313706, lib32-mesa/trunk/fix-install.diff)
lib32-mesa/repos/multilib-testing-x86_64/fix-versions.diff
(from rev 313706, lib32-mesa/trunk/fix-versions.diff)
Deleted:
lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch
lib32-mesa/repos/multilib-testing-x86_64/LICENSE
lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
lib32-mesa/repos/multilib-testing-x86_64/fix-install.diff
lib32-mesa/repos/multilib-testing-x86_64/fix-versions.diff
+
0001-glvnd-fix-gl-dot-pc.patch | 24 +-
LICENSE| 166 -
PKGBUILD | 369 +++
fix-install.diff | 58 +++---
fix-versions.diff | 148 +++
5 files changed, 382 insertions(+), 383 deletions(-)
Deleted: 0001-glvnd-fix-gl-dot-pc.patch
===
--- 0001-glvnd-fix-gl-dot-pc.patch 2018-04-01 06:34:52 UTC (rev 313706)
+++ 0001-glvnd-fix-gl-dot-pc.patch 2018-04-01 06:34:59 UTC (rev 313707)
@@ -1,12 +0,0 @@
-diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.0 -0500
-+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400
-@@ -7,7 +7,7 @@ Name: gl
- Description: Mesa OpenGL library
- Requires.private: @GL_PC_REQ_PRIV@
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -l@GL_LIB@
-+Libs: -L${libdir} -lGL
- Libs.private: @GL_PC_LIB_PRIV@
- Cflags: -I${includedir} @GL_PC_CFLAGS@
- glx_tls: @GLX_TLS@
Copied: lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch
(from rev 313706, lib32-mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch)
===
--- 0001-glvnd-fix-gl-dot-pc.patch (rev 0)
+++ 0001-glvnd-fix-gl-dot-pc.patch 2018-04-01 06:34:59 UTC (rev 313707)
@@ -0,0 +1,12 @@
+diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
+--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.0 -0500
mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400
+@@ -7,7 +7,7 @@ Name: gl
+ Description: Mesa OpenGL library
+ Requires.private: @GL_PC_REQ_PRIV@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -l@GL_LIB@
++Libs: -L${libdir} -lGL
+ Libs.private: @GL_PC_LIB_PRIV@
+ Cflags: -I${includedir} @GL_PC_CFLAGS@
+ glx_tls: @GLX_TLS@
Deleted: LICENSE
===
--- LICENSE 2018-04-01 06:34:52 UTC (rev 313706)
+++ LICENSE 2018-04-01 06:34:59 UTC (rev 313707)
@@ -1,83 +0,0 @@
-The Mesa 3D Graphics Library
-
-Disclaimer
-
- Mesa is a 3-D graphics library with an API which is very similar to
- that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an
- OpenGL license from SGI, and makes no claim that Mesa is in any way a
- compatible replacement for OpenGL or associated with SGI. Those who
- want a licensed implementation of OpenGL should contact a licensed
- vendor.
-
- Please do not refer to the library as MesaGL (for legal reasons). It's
- just Mesa or The Mesa 3-D graphics library.
-
- * OpenGL is a trademark of [3]Silicon Graphics Incorporated.
-
-License / Copyright Information
-
- The Mesa distribution consists of several components. Different
- copyrights and licenses apply to different components. For example, the
- GLX client code uses the SGI Free Software License B, and some of the
- Mesa device drivers are copyrighted by their authors. See below for a
- list of Mesa's main components and the license for each.
-
- The core Mesa library is licensed according to the terms of the MIT
- license. This allows integration with the XFree86, Xorg and DRI
- projects.
-
- The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sel
[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD)
Date: Sunday, April 1, 2018 @ 06:34:52
Author: lcarlier
Revision: 313706
upgpkg: lib32-mesa 18.0.0-2
fix FS#58052
Modified:
lib32-mesa/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-01 03:49:46 UTC (rev 313705)
+++ PKGBUILD2018-04-01 06:34:52 UTC (rev 313706)
@@ -6,7 +6,7 @@
pkgbase=lib32-mesa
pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver'
'lib32-mesa-vdpau' 'lib32-mesa')
pkgver=18.0.0
-pkgrel=1
+pkgrel=2
arch=('x86_64')
makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11'
'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage'
'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau'
@@ -108,7 +108,6 @@
_install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
_install fakeinstall/usr/lib32/libvulkan_intel.so
- _install fakeinstall/usr/include/vulkan/vulkan_intel.h
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
