[arch-commits] Commit in oss/trunk (PKGBUILD linux-3.8.patch)

[Kyle Keen]

    Date: Thursday, March 14, 2013 @ 22:26:13
  Author: kkeen
Revision: 86299

upgpkg: oss 4.2_2007-2, fix FS#33969

Added:
  oss/trunk/linux-3.8.patch
Modified:
  oss/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    8 +++++++-
 linux-3.8.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-14 20:56:19 UTC (rev 86298)
+++ PKGBUILD	2013-03-14 21:26:13 UTC (rev 86299)
@@ -8,7 +8,7 @@
 pkgname=oss
 true && pkgname=(oss libflashsupport-oss)
 pkgver=4.2_2007
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://developer.opensound.com/"
 license=('GPL2')
@@ -18,6 +18,7 @@
 	"rc-script"
 	"soundon.patch"
 	"remove-hal.patch"
+        "linux-3.8.patch"
 	"oss.service"
 	)
 md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7'
@@ -25,6 +26,7 @@
          'cbcbce5c03b127df5eafa8faa091492c'
          '65f07fe241bfbf912f76d8b6d8f276b5'
          'cd7f1dc6166bba8c94d96f3a28e948a5'
+         'effecefb774f1d08ef9f0af0ad205c34'
          '8db0255b380dc6672993e627d1cd8ca6')
 _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
 
@@ -56,6 +58,10 @@
 	sed -i 's|/lib/modules|/usr&|' \
 			os_cmd/Linux/ossvermagic/ossvermagic.c
 
+        pushd "$srcdir/$_dir"
+	patch -p0 -i "${srcdir}/linux-3.8.patch"
+        popd
+
 	msg "Building OSS."
 	make build
 

Added: linux-3.8.patch
===================================================================
--- linux-3.8.patch	                        (rev 0)
+++ linux-3.8.patch	2013-03-14 21:26:13 UTC (rev 86299)
@@ -0,0 +1,40 @@
+--- setup/Linux/oss/build/pci_wrapper.inc	2009-08-27 05:19:07.000000000 +0300
++++ setup/Linux/oss/build/pci_wrapper.inc	2013-02-08 13:56:10.519794975 +0200
+@@ -17,7 +17,11 @@
+ static dev_map_t dev_map[MAX_INSTANCE];
+ static int n_devmap = 0;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+ static int __devinit
++#else
++static int
++#endif
+ osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid)
+ {
+   oss_device_t *osdev;
+@@ -65,7 +69,11 @@
+   return 0;
+ }
+ 
+-static void __devexit
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
++static int __devexit
++#else
++static int
++#endif
+ osspci_remove (struct pci_dev *pcidev)
+ {
+   int i;
+@@ -80,10 +88,11 @@
+ 	pci_disable_device (dev_map[i].pcidev);
+ 	osdev_delete (osdev);
+ 
+-	return;
++	return 0;
+       }
+ 
+   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
++  return -EIO;
+ }
+ 
+ void