Clean up patch allow compilation with kernel 4.6

3 files changed, 25 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6233f51f8d4f..72fed35a932e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = oss-nonfree
 	pkgver = 4.2_2011
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.opensound.com/oss.html
 	arch = i686
 	arch = x86_64
@@ -17,7 +17,7 @@ pkgbase = oss-nonfree
 	sha512sums = 51fd86b3b6265cd6e29eda29722019774881bda2cf3381288e7e65b9ed857d898101b5b8f3775ecff84e8d375f3f3a9117c09192c28f329d646702bc06e97c72
 	sha512sums = 75632fd1052834ccef32c72a30b2d2fd97448332ac1152962f6aaa29eac98a53b354dd2c3336312b760d88070d5165fef0f7f8e3ee3b8a2a3634d6fc5f56c995
 	sha512sums = 72c3ccffba392064bd387e0459ddeff5f95c970af64c9eb9b29a55ff530abd54e69b213f3669b75d8ca89379554d25601b1daeed51ab39bbf5bd06b46344965f
-	sha512sums = 6927126fa49f073fa27642ff04432232cc8bfcc58c3ea98ca3bb89045ae567eba10a0cfbb1cf9a97735fa8b36fbfb3e59d5d1e88ca4a777d3913170e52d2ce82
+	sha512sums = b9fedffd63f033377ce7aa1e1163ae9c39a150079a5af1cc2fb71212268e93fe9b17ca7ec122439c407e86e1a3e455de18dfc5713faf2d7dc746ef094a5c6432
 	sha512sums = 355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e
 	sha512sums = 6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be
 	sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690
diff --git a/PKGBUILD b/PKGBUILD
index 2467f2b447c3..9d6b0c786277 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=oss-nonfree
 pkgname=oss-nonfree
 true && pkgname=(oss-nonfree libflashsupport-oss-nonfree)
 pkgver=4.2_2011
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://www.opensound.com/oss.html"
 license=('custom:4Front Commercial License')
@@ -30,7 +30,7 @@ noextract=("oss-linux-v${pkgver/_*}-${pkgver/*_}-$_pkgarch.tar.bz2")
 sha512sums=('51fd86b3b6265cd6e29eda29722019774881bda2cf3381288e7e65b9ed857d898101b5b8f3775ecff84e8d375f3f3a9117c09192c28f329d646702bc06e97c72'
             '75632fd1052834ccef32c72a30b2d2fd97448332ac1152962f6aaa29eac98a53b354dd2c3336312b760d88070d5165fef0f7f8e3ee3b8a2a3634d6fc5f56c995'
             '72c3ccffba392064bd387e0459ddeff5f95c970af64c9eb9b29a55ff530abd54e69b213f3669b75d8ca89379554d25601b1daeed51ab39bbf5bd06b46344965f'
-	    '6927126fa49f073fa27642ff04432232cc8bfcc58c3ea98ca3bb89045ae567eba10a0cfbb1cf9a97735fa8b36fbfb3e59d5d1e88ca4a777d3913170e52d2ce82'
+	    'b9fedffd63f033377ce7aa1e1163ae9c39a150079a5af1cc2fb71212268e93fe9b17ca7ec122439c407e86e1a3e455de18dfc5713faf2d7dc746ef094a5c6432'
             '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e'
             '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be'
             '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
diff --git a/linux-4.6.patch b/linux-4.6.patch
index 475c25fadf96..e4bb599353f4 100644
--- a/linux-4.6.patch
+++ b/linux-4.6.patch
@@ -1,5 +1,5 @@
 --- /oss/build/pci_wrapper.inc	2014-08-31 19:40:14.000000000 +0100
-+++ /oss/build/pci_wrapper.inc	2016-06-14 23:50:17.138446865 +0100
++++ /oss/build/pci_wrapper.inc	2016-06-15 06:51:46.402770996 +0100
 @@ -71,8 +71,10 @@
  
  #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
@@ -12,3 +12,23 @@
  #endif
  osspci_remove (struct pci_dev *pcidev)
  {
+@@ -88,11 +90,19 @@
+ 	pci_disable_device (dev_map[i].pcidev);
+ 	osdev_delete (osdev);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+ 	return 0;
++#else
++	return;
++#endif
+       }
+ 
+   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+   return -EIO;
++#else
++  return;
++#endif
+ }
+ 
+ void