[arch-commits] Commit in bbswitch/trunk (0001-proc_ops-struct.patch PKGBUILD)

[Giancarlo Razzolini]

    Date: Wednesday, April 1, 2020 @ 15:07:48
  Author: grazzolini
Revision: 608919

upgpkg: bbswitch 0.8-304

Improve the patch so it also build against older kernels

Modified:
  bbswitch/trunk/0001-proc_ops-struct.patch
  bbswitch/trunk/PKGBUILD

----------------------------+
 0001-proc_ops-struct.patch |   32 +++++++++++++++++++++++---------
 PKGBUILD                   |    4 ++--
 2 files changed, 25 insertions(+), 11 deletions(-)

Modified: 0001-proc_ops-struct.patch
===================================================================
--- 0001-proc_ops-struct.patch	2020-04-01 14:55:28 UTC (rev 608918)
+++ 0001-proc_ops-struct.patch	2020-04-01 15:07:48 UTC (rev 608919)
@@ -1,16 +1,19 @@
 diff --unified --recursive --text bbswitch-0.8.orig/bbswitch.c bbswitch-0.8.new/bbswitch.c
 --- bbswitch-0.8.orig/bbswitch.c	2013-12-04 21:22:06.000000000 -0200
-+++ bbswitch-0.8.new/bbswitch.c	2020-04-01 11:28:02.910890888 -0300
-@@ -375,12 +375,12 @@
++++ bbswitch-0.8.new/bbswitch.c	2020-04-01 12:02:35.518754892 -0300
+@@ -35,6 +35,7 @@
+ #include <linux/suspend.h>
+ #include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
++#include <linux/version.h>
+ 
+ #define BBSWITCH_VERSION "0.8"
+ 
+@@ -375,13 +376,23 @@
      return 0;
  }
  
--static struct file_operations bbswitch_fops = {
--    .open   = bbswitch_proc_open,
--    .read   = seq_read,
--    .write  = bbswitch_proc_write,
--    .llseek = seq_lseek,
--    .release= single_release
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
 +static struct proc_ops bbswitch_fops = {
 +    .proc_open   = bbswitch_proc_open,
 +    .proc_read   = seq_read,
@@ -17,6 +20,17 @@
 +    .proc_write  = bbswitch_proc_write,
 +    .proc_lseek = seq_lseek,
 +    .proc_release= single_release
- };
++};
++#else
+ static struct file_operations bbswitch_fops = {
+     .open   = bbswitch_proc_open,
+     .read   = seq_read,
+     .write  = bbswitch_proc_write,
+     .llseek = seq_lseek,
+     .release= single_release
+-};
++ };
++#endif
  
  static struct notifier_block nb = {
+     .notifier_call = &bbswitch_pm_handler

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-01 14:55:28 UTC (rev 608918)
+++ PKGBUILD	2020-04-01 15:07:48 UTC (rev 608919)
@@ -5,7 +5,7 @@
 pkgbase=bbswitch
 pkgname=(bbswitch bbswitch-dkms)
 pkgver=0.8
-pkgrel=303
+pkgrel=304
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops"
 arch=('x86_64')
 url="http://github.com/Bumblebee-Project/bbswitch"
@@ -14,7 +14,7 @@
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz"
         "0001-proc_ops-struct.patch")
 sha512sums=('11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c'
-            'b4b7e5e2e0b531f30b10c3e92d8d1e7189a13d1fdea55dc9659553f9df54c305addce53c78ecc0dac2e68e002b7f655161b57698bdeaa87e1987c7f7ad6cb629')
+            '993a2895c37ea213c105be668f794af54838d8015d6f561ee6bc7ce65583425515931c83c2487ab97c14454105f233f089e8bdc90ea5ed9576be767335f57ad1')
 
 prepare() {
     cd ${pkgbase}-${pkgver}