Add patches for osscore and extramodules directory removal for kernel 6.4

4 files changed, 118 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a55f4e5853a..2a4e655b2c05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = oss
 	pkgver = 4.2_2020
-	pkgrel = 1
+	pkgrel = 2
 	url = http://developer.opensound.com/
 	arch = i686
 	arch = x86_64
@@ -11,12 +11,16 @@ pkgbase = oss
 	source = remove-hal.patch
 	source = rm-init-scripts.patch
 	source = soundon.patch
+	source = osscore.patch
+	source = extramodules.patch
 	source = ossvermagic.patch
 	sha512sums = 6b0c5390e92f9c9466669600321140b54d1fde5eeaef2f9938d6bdbc7ae686f4a1ad0fa9669a1505962eb515d61d29d8a677911557a9b245ce039e1ab3b77d69
 	sha512sums = 355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e
 	sha512sums = 6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be
 	sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690
 	sha512sums = a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6
+	sha512sums = 6f074cc61cb2aef98221e95700b79033504bf397b3e5313ebb27069873ead4dbc7a1969b2f04c254a33947af438abbc22cf33446ca20acd14393ef855ae7492d
+	sha512sums = 0742a9400d6b683e3813cf1b1a1fb7f07dff22b6d26d47ca4e3d6179bc099044661c33e2d445a3fef278187d8dab90aae3323b4693e63383e03b9b5213bbc4a5
 	sha512sums = eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad
 
 pkgname = oss
@@ -38,4 +42,3 @@ pkgname = libflashsupport-oss
 	conflicts = libflashsupport-oss-nonfree
 	conflicts = libflashsupport-oss-git
 	conflicts = libflashsupport-pulse
-
diff --git a/PKGBUILD b/PKGBUILD
index 3616d90e4f6d..a96a85a1364c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Alex Wiggins <alex.d.wiggins@gmail.com>
+# Maintainer: Alex Wiggins <aur.dev.ate@etwmail.com>
+# Contributor: Clive Wright <seawright27@gmail.com>
 # Contributor: Damian Nowak <damian.nowak@atlashost.eu>
 # Contributor: Julian Rother <julian@toksik.org>
 # Contributor: Sebastian Schwarz <seschwar@gmail.com>
@@ -11,7 +12,7 @@ pkgbase=oss
 pkgname=oss
 true && pkgname=(oss libflashsupport-oss)
 pkgver=4.2_2020
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://developer.opensound.com/"
 license=(GPL2)
@@ -21,12 +22,16 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_
         remove-hal.patch
         rm-init-scripts.patch
         soundon.patch
+        osscore.patch
+        extramodules.patch
         ossvermagic.patch)
 sha512sums=('6b0c5390e92f9c9466669600321140b54d1fde5eeaef2f9938d6bdbc7ae686f4a1ad0fa9669a1505962eb515d61d29d8a677911557a9b245ce039e1ab3b77d69'
             '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e'
             '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be'
             '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
             'a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6'
+            '6f074cc61cb2aef98221e95700b79033504bf397b3e5313ebb27069873ead4dbc7a1969b2f04c254a33947af438abbc22cf33446ca20acd14393ef855ae7492d'
+            '0742a9400d6b683e3813cf1b1a1fb7f07dff22b6d26d47ca4e3d6179bc099044661c33e2d445a3fef278187d8dab90aae3323b4693e63383e03b9b5213bbc4a5'
             'eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad')
 _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
 
@@ -37,6 +42,8 @@ prepare() {
   rm -rf build
   mkdir build
 
+  patch -p1 < "$srcdir/osscore.patch"
+  patch -p1 < "$srcdir/extramodules.patch"
   patch -p0 < "$srcdir/ossvermagic.patch"
 
   # remove outdated stuff
@@ -49,7 +56,9 @@ prepare() {
 }
 
 build() {
+  export CFLAGS=""
   cd "$_dir/build"
+  touch ../kernel/drv/lynxtwo/.nomake
   ../configure --enable-libsalsa=NO --regparm
   make build
   gcc $CFLAGS -shared -fPIC -Wall -Werror oss/lib/flashsupport.c \
@@ -95,4 +104,3 @@ package_oss() {
   chmod -R a+rX .  # FS#13815
   install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service
 }
-
diff --git a/extramodules.patch b/extramodules.patch
new file mode 100644
index 000000000000..b21d67d816fc
--- /dev/null
+++ b/extramodules.patch
@@ -0,0 +1,24 @@
+diff -ur a/setup/Linux/oss/build/install.sh b/setup/Linux/oss/build/install.sh
+--- a/setup/Linux/oss/build/install.sh	2023-07-12 14:59:51.253990790 +0000
++++ b/setup/Linux/oss/build/install.sh	2023-07-12 14:56:33.394164100 +0000
+@@ -198,7 +198,8 @@
+ 
+ if ! test -d /lib/modules/$UNAME/kernel/oss
+ then
+-  mkdir /lib/modules/$UNAME/kernel/oss
++  # --parents option required if extramodules does not exist.
++  mkdir --parents /lib/modules/$UNAME/kernel/oss
+ fi
+ 
+ if ! test -d /lib/modules/$UNAME/kernel/oss
+diff -ur a/setup/Linux/oss/scripts/restore_drv.sh b/setup/Linux/oss/scripts/restore_drv.sh
+--- a/setup/Linux/oss/scripts/restore_drv.sh	2023-07-12 14:47:07.254120802 +0000
++++ b/setup/Linux/oss/scripts/restore_drv.sh	2023-07-12 18:05:30.938684489 +0000
+@@ -9,6 +9,7 @@
+ /usr/sbin/soundoff
+ 
+ rm -rf /lib/modules/`uname -r`/kernel/oss
++[ $(ls -A /lib/modules/`uname -r`/extramodules) ] || rmdir /lib/modules/`uname -r`/extramodules
+ 
+ if test -x /sbin/chkconfig 
+ then /sbin/chkconfig oss off > /dev/null 2>&1
diff --git a/osscore.patch b/osscore.patch
new file mode 100644
index 000000000000..7b11fc2b141c
--- /dev/null
+++ b/osscore.patch
@@ -0,0 +1,78 @@
+diff -ur a/setup/Linux/oss/build/osscore.c b/setup/Linux/oss/build/osscore.c
+--- a/setup/Linux/oss/build/osscore.c	2023-07-10 19:58:38.043736606 +0000
++++ b/setup/Linux/oss/build/osscore.c	2023-07-10 19:59:11.783142022 +0000
+@@ -14,7 +14,7 @@
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+-#include <stdarg.h>
++#include <linux/stdarg.h>
+ #include <linux/vmalloc.h>
+ #include "timestamp.h"
+ #include "local_config.h"
+@@ -86,7 +86,7 @@
+ oss_get_time (void)
+ {
+ #if 1
+-  return get_seconds ();
++  return ktime_get_real_seconds ();
+ #else
+   return xtime.tv_sec;
+ #endif
+@@ -113,7 +113,7 @@
+   vfree (addr);
+ }
+ 
+-/* oss_pmalloc() moved to os_linux.c */
++/* oss_pmalloc() moved to os_linux.c
+ 
+ extern oss_native_word
+ oss_virt_to_bus (void *addr)
+@@ -121,6 +121,7 @@
+   return virt_to_bus (addr);
+ }
+ 
++ */
+ void *
+ oss_memcpy (void *t_, const void *f_, size_t l)
+ {
+@@ -134,6 +135,9 @@
+   return t;
+ }
+ 
++#ifdef memmove
++#undef memmove
++#endif
+ void *memmove(void *dest, const void *src, size_t n)
+ {
+ 	return oss_memcpy(dest, src, n);
+@@ -908,7 +912,7 @@
+ 			 (oss_native_word) end_addr);
+     }
+ 
+-  *phaddr = virt_to_bus (start_addr);
++  *phaddr = virt_to_phys(start_addr);
+   return start_addr;
+ }
+ 
+@@ -1039,10 +1043,8 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+   fop->owner = osdev_get_owner (osdev);
+ #endif
+-#ifdef HAVE_UNLOCKED_IOCTL
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
+   fop->unlocked_ioctl = tmp_unlocked_ioctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+   fop->compat_ioctl = tmp_compat_ioctl;
+ #endif
+ 
+@@ -2089,7 +2091,7 @@
+ EXPORT_SYMBOL (oss_udelay);
+ EXPORT_FUNC (oss_unregister_device);
+ EXPORT_SYMBOL (oss_unregister_interrupts);
+-EXPORT_SYMBOL (oss_virt_to_bus);
++// EXPORT_SYMBOL (oss_virt_to_bus);
+ EXPORT_FUNC (oss_pci_read_config_byte);
+ EXPORT_FUNC (oss_pci_read_config_word);
+ EXPORT_FUNC (oss_pci_read_config_dword);