diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-15 00:04:20 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-15 00:04:20 -0700 |
| commit | eebfa6ebe1522831767019e496b0c094b2e15a5c (patch) | |
| tree | 935fa3d9bddae6c8181a7025516e24875e35f9d2 /community/oss | |
| parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) | |
Fri Mar 15 00:04:19 PDT 2013
Diffstat (limited to 'community/oss')
| -rw-r--r-- | community/oss/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/oss/linux-3.8.patch | 40 |
2 files changed, 48 insertions, 2 deletions
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index bd792bbde..e50a44366 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76238 2012-09-14 22:52:02Z kkeen $ +# $Id: PKGBUILD 86302 2013-03-14 21:30:53Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -8,7 +8,7 @@ pkgbase=oss 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 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_ "rc-script" "soundon.patch" "remove-hal.patch" + "linux-3.8.patch" "oss.service" ) md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' @@ -25,6 +26,7 @@ md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' 'cd7f1dc6166bba8c94d96f3a28e948a5' + 'effecefb774f1d08ef9f0af0ad205c34' '8db0255b380dc6672993e627d1cd8ca6') _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl @@ -56,6 +58,10 @@ build() { 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 diff --git a/community/oss/linux-3.8.patch b/community/oss/linux-3.8.patch new file mode 100644 index 000000000..46200e01a --- /dev/null +++ b/community/oss/linux-3.8.patch @@ -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 |