Update patch and fetch it directly from source, misc cleanups

1 files changed, 14 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1064f13534e3..b5acd0adf019 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _basekernel=5.2
 _sub=5
 _k_pkgver=${_basekernel}.${_sub}
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="The snd_hda_intel kernel driver, patched to remove crackling on AMD HD-audio controller"
 arch=('x86_64')
 url="https://bugzilla.kernel.org/show_bug.cgi?id=195303"
@@ -16,36 +16,31 @@ conflicts=(snd_hda_intel-alc1220-dkms)
 replaces=(snd_hda_intel-alc1220-dkms)
 source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.xz"
 	"https://www.kernel.org/pub/linux/kernel/v5.x/patch-${_k_pkgver}.xz"
-	"hda_intel.diff"
-	"hdac_stream.diff"
+	"patch-7.diff::https://bugzilla.kernel.org/attachment.cgi?id=284221"
         'dkms.conf'
-        'Makefile')
+        'Makefile'
+	'Makefile.diff')
 md5sums=('ddf994de00d7b18395886dd9b30b9262'
          '0bfed20acab24d45232983b54339a3c9'
-         '867d3d27fb1716290c76d90ffb739343'
-         'b5f5cf9b9a7e0c5852d290992eb73b68'
-         '20495ab7a2c425ba786c44d53d458909'
-         '4cf63656de83b4321d6261289735d1e1')
+         'e0d0c2c46caaff7039d74b6c54360af9'
+         '8239975d93c5b07c11b092386ba9aa86'
+         '7168339cf224bcd7927614fd608435a6'
+         '77d3d06692c18e1504163a0a05521ac0')
 
 prepare() {
-  mkdir -p "${srcdir}/${_pkgbase}" && cd "${srcdir}/${_pkgbase}"
-
-  cp ../dkms.conf ../hda*.diff ../Makefile .
+  mkdir -p "${srcdir}/${_pkgbase}"
 
   cd "${srcdir}/linux-${_basekernel}"
   # add upstream patch
   patch -p1 -i ../patch-"${_k_pkgver}"
 
-  mkdir -p "${srcdir}"/hda-src/{hdacore,include/dkms/{sound,uapi/sound}}
-  cp -r sound/hda/* "${srcdir}/hda-src/hdacore"
-  cp sound/pci/hda/* "${srcdir}/hda-src"
-  cp -r include/{sound/hda*,sound/tlv.h} "${srcdir}/hda-src/include/dkms/sound"
-  cp include/uapi/sound/* "${srcdir}/hda-src/include/dkms/uapi/sound" || true
+  mkdir -p "${srcdir}"/hda-src
+  cp sound/pci/hda/hda_{auto_parser.{c,h},beep.h,codec.c,controller{.c,.h,_trace.h},hwdep.c,intel{.c,.h,_trace.h},jack.{c,h},local.h,proc.c,sysfs.c} "${srcdir}"/hda-src
+  cp sound/pci/hda/Makefile "${srcdir}"/hda-src
 
   cd "${srcdir}/hda-src"
-  patch  -Np4 < ../hda_intel.diff
-  patch  -Np1 < ../hdac_stream.diff
-
+  patch -Np1 < ../Makefile.diff Makefile
+  patch  -Np4 < ../patch-7.diff
 }
 
 package() {
@@ -57,8 +52,6 @@ package() {
       -e "s/@PKGVER@/${pkgver}/" \
       -i "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
 
-#  readlink -f .
-#  exit
   # Copy sources (including Makefile)
   cp -r "${srcdir}"/{hda*,Makefile} "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/"
 }