- fix building with kernel 5.13, rel 7

diff --git a/kernel-5.13.patch b/kernel-5.13.patch
new file mode 100644 (file)
index 0000000..b65e8df
--- /dev/null
+++ b/kernel-5.13.patch
@@ -0,0 +1,34 @@
+--- vpb-driver-4.2.58/src/vtcore/vtcommon.h~   2014-09-28 20:02:28.000000000 +0200
++++ vpb-driver-4.2.58/src/vtcore/vtcommon.h    2021-07-04 13:33:05.236176514 +0200
+@@ -50,12 +50,14 @@
+ #endif
+ 
+ #ifdef MODVERSIONS
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,13,0))
+  #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,4))
+   #include <config/modversions.h>
+  #else
+   #include <linux/modversions.h>
+  #endif
+ #endif
++#endif
+ 
+ #include <linux/slab.h>
+ 
+--- vpb-driver-4.2.58/src/vpb/vpb.c~   2021-07-04 13:29:04.000000000 +0200
++++ vpb-driver-4.2.58/src/vpb/vpb.c    2021-07-04 13:33:38.639839452 +0200
+@@ -98,12 +98,14 @@
+ #endif
+ 
+ #ifdef MODVERSIONS
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,13,0))
+ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,4))
+ #include <config/modversions.h>
+ #else
+ #include <linux/modversions.h>
+ #endif
+ #endif
++#endif
+ 
+ #include <linux/ioport.h>
+ #include <linux/errno.h>

diff --git a/vpb-driver.spec b/vpb-driver.spec
index 98f6d6d37bf3e7ba4ba712f24bc5b7c9bd3ec5f3..38dad07238248dab21b71177ea7a86feaee4a9bb 100644 (file)
--- a/vpb-driver.spec
+++ b/vpb-driver.spec
@@ -21,7 +21,7 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define                rel     6
+%define                rel     7
 %define                pname   vpb-driver
 Summary:       Voicetronix voice processing board (VPB) driver software
 Summary(pl.UTF-8):     Oprogramowanie sterowników dla kart przetwarzających głos (VPB) Voicetronix
@@ -38,6 +38,7 @@ Patch2:               linux-4.12.patch
 Patch3:                kernel-4.14.patch
 Patch4:                gcc8.patch
 Patch5:                kernel-5.6.patch
+Patch6:                kernel-5.13.patch
 URL:           http://www.voicetronix.com.au/downloads.htm#linux
 BuildRequires: rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -151,6 +152,7 @@ p=`pwd`\
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %if %{without kernel}
 %{__sed} -i -e 's,subdirs += $(srcdir)/vtcore $(srcdir)/vpb,,' src/Makefile.in