summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--linux-4.0.patch29
-rw-r--r--linux-4.6.patch34
4 files changed, 4 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea65e5f1d79..026a58dcdd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = oss-nonfree
pkgver = 4.2_2017
- pkgrel = 1
+ pkgrel = 2
url = http://www.opensound.com/oss.html
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 557f910f49b..e1bc971f88e 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_2017
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url="http://www.opensound.com/oss.html"
license=('custom:4Front Commercial License')
@@ -32,9 +32,9 @@ sha512sums=('73f101e99aebc715232a5b85c70b9d48b0532e49d50a14a07d2e226783818ff2118
'64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
'5b91a4f3477db1bdbc40c891aaa8bc384f5a690e8290bc4db7bdb4a715a858b2f42780bfeb14281560a0e1a73d1cd4022ed738f01b74c26456dcf0b9952981b5')
if [[ "$CARCH" == i686 ]]; then
- sha512sums[0]=SKIP
+ sha512sums[0]='1bba0bbee9b7cbdcc5bf07f2c5a1b3863e3057908099bebb2f4347735e8183341e2ac71ac06a633d1f6300b9d9f7dac64dc7397b226168e346b4be47cb6313d3'
else
- sha512sums[0]=73f101e99aebc715232a5b85c70b9d48b0532e49d50a14a07d2e226783818ff2118663308f663735cd69ceb4a85120bcd09ee96a0d295733283df29d68ce72db
+ sha512sums[0]='73f101e99aebc715232a5b85c70b9d48b0532e49d50a14a07d2e226783818ff2118663308f663735cd69ceb4a85120bcd09ee96a0d295733283df29d68ce72db'
fi
build() {
diff --git a/linux-4.0.patch b/linux-4.0.patch
deleted file mode 100644
index 3a313729274..00000000000
--- a/linux-4.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN /oss/build/osscore.c /oss/build/osscore.c
---- /oss/build/osscore.c 2014-09-04 00:15:31.000000000 +0200
-+++ /oss/build/osscore.c 2015-04-25 23:16:19.502116503 +0200
-@@ -1950,8 +1950,13 @@
- }
- else
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
- flags[1] = read_cr4 ();
- write_cr4 (flags[1] | 0x600); /* Set OSFXSR & OSXMMEXCEPT */
-+#else
-+ flags[1] = __read_cr4 ();
-+ __write_cr4 (flags[1] | 0x600); /* Set OSFXSR & OSXMMEXCEPT */
-+#endif
- FX_SAVE (envbuf);
- asm ("fninit");
- asm ("fwait");
-@@ -1971,7 +1976,11 @@
- else
- {
- FX_RESTORE (envbuf);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
- write_cr4 (flags[1]); /* Restore cr4 */
-+#else
-+ __write_cr4 (flags[1]); /* Restore cr4 */
-+#endif
- }
- write_cr0 (flags[0]); /* Restore cr0 */
- }
diff --git a/linux-4.6.patch b/linux-4.6.patch
deleted file mode 100644
index e4bb599353f..00000000000
--- a/linux-4.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- /oss/build/pci_wrapper.inc 2014-08-31 19:40:14.000000000 +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)
- static int __devexit
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
- static int
-+#else
-+ void
- #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