Added patch to allow compilation with kernel 4.6

3 files changed, 22 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84f9c133ea86..36830c632710 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = oss
 	pkgver = 4.2_2011
-	pkgrel = 3
+	pkgrel = 4
 	url = http://developer.opensound.com/
 	arch = i686
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = oss
 	source = http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2011-src-gpl.tar.bz2
 	source = linux-4.0.patch::http://www.4front-tech.com/forum/download/file.php?id=164
 	source = gcc-5.patch
+	source = linux-4.6.patch
 	source = oss.service
 	source = remove-hal.patch
 	source = rm-init-scripts.patch
@@ -18,6 +19,7 @@ pkgbase = oss
 	sha512sums = 2e48bf5fa14521feedb18bc3b4c96ba996c5ef9d54f00f1e39c9412152db65972438b7408cb8161e32609af2c56207251d14e1106668cde32a8f0b56a98311fb
 	sha512sums = 504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5
 	sha512sums = 762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835
+	sha512sums = a9b97ff0884868a51d3a317d06b6e3df4ccd201d1284f8cd545252cebc6f20e9735a2768cb74bf74dc09cacbb4b3909341797e30d03804ab05a6b3b6e40484ec
 	sha512sums = 355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e
 	sha512sums = 6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be
 	sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690
diff --git a/PKGBUILD b/PKGBUILD
index d7ba89a9d835..f91e8432e0b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,15 @@ pkgbase=oss
 pkgname=oss
 true && pkgname=(oss libflashsupport-oss)
 pkgver=4.2_2011
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://developer.opensound.com/"
 license=(GPL2)
 makedepends=(gtk2)
 source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
-	linux-4.0.patch::http://www.4front-tech.com/forum/download/file.php?id=164
+	linux-4.0.patch::http://www.4front-tech.com/forum/download/file.php?id=164	
 	gcc-5.patch
+	linux-4.6.patch
         oss.service
         remove-hal.patch
         rm-init-scripts.patch
@@ -28,6 +29,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_
 sha512sums=('2e48bf5fa14521feedb18bc3b4c96ba996c5ef9d54f00f1e39c9412152db65972438b7408cb8161e32609af2c56207251d14e1106668cde32a8f0b56a98311fb'
 	    '504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5'
 	    '762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835'
+	    'a9b97ff0884868a51d3a317d06b6e3df4ccd201d1284f8cd545252cebc6f20e9735a2768cb74bf74dc09cacbb4b3909341797e30d03804ab05a6b3b6e40484ec'
             '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e'
             '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be'
             '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
@@ -46,6 +48,7 @@ prepare() {
   # make OSS compile with current Linux kernels
   patch -p1 < "$srcdir/linux-4.0.patch"
   # patch -p0 < "$srcdir/linux-3.14.0.patch"
+  patch -p0 < "$srcdir/linux-4.6.patch"
   patch -p0 < "$srcdir/ossvermagic.patch"
 
   # make OSS compile with gcc-5
diff --git a/linux-4.6.patch b/linux-4.6.patch
new file mode 100644
index 000000000000..703b9e2edf29
--- /dev/null
+++ b/linux-4.6.patch
@@ -0,0 +1,14 @@
+--- setup/Linux/oss/build/pci_wrapper.inc	2014-08-31 19:40:14.000000000 +0100
++++ setup/Linux/oss/build/pci_wrapper.inc	2016-06-14 23:50:17.138446865 +0100
+@@ -71,8 +71,10 @@
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+  static int __devexit
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+  static int
++#else
++ void
+ #endif
+ osspci_remove (struct pci_dev *pcidev)
+ {