bump version to 11.5.1

4 files changed, 91 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a6934199eb9..a5ee9fef7816 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = decklink
 	pkgdesc = Drivers for Blackmagic Design DeckLink, Intensity or Multibridge video editing cards
-	pkgver = 11.5
-	pkgrel = 2
+	pkgver = 11.5.1
+	pkgrel = 1
 	url = https://www.blackmagicdesign.com/support/family/capture-and-playback
 	arch = i686
 	arch = x86_64
@@ -9,8 +9,12 @@ pkgbase = decklink
 	makedepends = curl
 	options = !strip
 	options = staticlibs
-	source = decklink-11.5.tar.gz::https://www.blackmagicdesign.com/api/register/us/download/9a205dd8b075460b8a021c519258d6cd
-	sha256sums = ebe79003bbe61a97449c93066616be7aa71caa8ddc6c348d9e5c47bc1eacd725
+	source = decklink-11.5.1.tar.gz::https://www.blackmagicdesign.com/api/register/us/download/5f9af2c067674ed98d54bf67dcf7a9b6
+	source = fix-ioremap.patch
+	source = fix-timespec.patch
+	sha256sums = efd7c0ab58482ac1ba63fb71181a6e88538f5fbc33f5ac02057fbd3b5212d0a5
+	sha256sums = 5f7f36467ab0bc86647bd59e08d6b98289545e5a07a5b90103b9fef1068fa99a
+	sha256sums = d96a747054cdc9e58c79ef22e184238881a7a97cb9914ececcbade9b30a418be
 
 pkgname = decklink
 	install = decklink.install
diff --git a/PKGBUILD b/PKGBUILD
index 0d494f2b420f..819ece2b5900 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 pkgbase=decklink
 pkgname=(decklink mediaexpress)
 _pkgname=decklink
-pkgver=11.5
-pkgrel=2
+pkgver=11.5.1
+pkgrel=1
 pkgdesc="Drivers for Blackmagic Design DeckLink, Intensity or Multibridge video editing cards"
 arch=('i686' 'x86_64')
 url="https://www.blackmagicdesign.com/support/family/capture-and-playback"
@@ -14,7 +14,7 @@ options=('!strip' 'staticlibs')
 [ "$CARCH" = "i686" ] && _arch='i386'
 [ "$CARCH" = "x86_64" ] && _arch='x86_64'
 
-_pkgsrc_url="https://www.blackmagicdesign.com/api/register/us/download/9a205dd8b075460b8a021c519258d6cd"
+_pkgsrc_url="https://www.blackmagicdesign.com/api/register/us/download/5f9af2c067674ed98d54bf67dcf7a9b6"
 _pkgsrc_file=${_pkgname}-${pkgver}.tar.gz
 
 DLAGENTS=("https::/usr/bin/curl \
@@ -29,8 +29,26 @@ DLAGENTS=("https::/usr/bin/curl \
               )"
 )
 
-source=("${_pkgsrc_file}"::"${_pkgsrc_url}")
-sha256sums=('ebe79003bbe61a97449c93066616be7aa71caa8ddc6c348d9e5c47bc1eacd725')
+source=("${_pkgsrc_file}"::"${_pkgsrc_url}"
+        "fix-ioremap.patch"
+        "fix-timespec.patch")
+sha256sums=('efd7c0ab58482ac1ba63fb71181a6e88538f5fbc33f5ac02057fbd3b5212d0a5'
+            '5f7f36467ab0bc86647bd59e08d6b98289545e5a07a5b90103b9fef1068fa99a'
+            'd96a747054cdc9e58c79ef22e184238881a7a97cb9914ececcbade9b30a418be')
+
+prepare() {
+  cd $srcdir/Blackmagic_Desktop_Video_Linux_$pkgver/other/${_arch}
+
+  tar xf desktopvideo-*-${_arch}.tar.gz
+
+  cd desktopvideo-*/usr/src
+
+  for p in ${srcdir}/*.patch;
+  do
+    echo "Applying ${p}"
+    patch --forward --strip=1 --input="${p}"
+  done
+}
 
 package_decklink() {
   install=decklink.install
@@ -42,7 +60,6 @@ package_decklink() {
 
   cd $srcdir/Blackmagic_Desktop_Video_Linux_$pkgver/other/${_arch}
 
-  tar xf desktopvideo-*-${_arch}.tar.gz
   cp -a desktopvideo-*-${_arch}/* $pkgdir
   rm -rf $pkgdir/usr/sbin
 
diff --git a/fix-ioremap.patch b/fix-ioremap.patch
new file mode 100644
index 000000000000..df3afc8af6a1
--- /dev/null
+++ b/fix-ioremap.patch
@@ -0,0 +1,13 @@
+diff --git a/blackmagic-11.5.1a14/blackmagic_lib.c b/blackmagic-11.5.1a14/blackmagic_lib.c
+index 397c585..6843c09 100644
+--- a/blackmagic-11.5.1a14/blackmagic_lib.c
++++ b/blackmagic-11.5.1a14/blackmagic_lib.c
+@@ -418,7 +418,7 @@ dl_pci_map_bar(void *pci_dev, int bar)
+ 	dma_addr_t base;
+     
+ 	base = pci_resource_start(dev, bar);
+-	return ioremap_nocache(base, pci_resource_len(dev, bar));
++	return ioremap(base, pci_resource_len(dev, bar));
+ }
+ 
+ inline void
diff --git a/fix-timespec.patch b/fix-timespec.patch
new file mode 100644
index 000000000000..4d29fbc8cd04
--- /dev/null
+++ b/fix-timespec.patch
@@ -0,0 +1,47 @@
+diff --git a/blackmagic-11.5.1a14/blackmagic_lib.c b/blackmagic-11.5.1a14/blackmagic_lib.c
+index 397c585..bbd4d6c 100644
+--- a/blackmagic-11.5.1a14/blackmagic_lib.c
++++ b/blackmagic-11.5.1a14/blackmagic_lib.c
+@@ -322,7 +322,11 @@ int dl_printk(const char *fmt, ...)
+ inline unsigned long long
+ dl_uptime(void)
+ {
+-#if KERNEL_VERSION_OR_LATER(2, 6, 28)
++#if KERNEL_VERSION_OR_LATER(5, 6, 0)
++	struct timespec64 ts;
++	ktime_get_raw_ts64(&ts);
++	return ((ts.tv_sec * 1000000000ULL) + ts.tv_nsec);
++#elif KERNEL_VERSION_OR_LATER(2, 6, 28)
+ 	struct timespec ts;
+ 	getrawmonotonic(&ts);
+ 	return ((ts.tv_sec * 1000000000ULL) + ts.tv_nsec);
+@@ -333,7 +337,11 @@ dl_uptime(void)
+ 
+ inline unsigned long long dl_get_time_us()
+ {
+-#if KERNEL_VERSION_OR_LATER(5, 0, 0)
++#if KERNEL_VERSION_OR_LATER(5, 6, 0)
++	struct timespec64 t;
++	ktime_get_real_ts64(&t);
++	return (t.tv_sec * USEC_PER_SEC + t.tv_nsec / 1000);
++#elif KERNEL_VERSION_OR_LATER(5, 0, 0)
+ 	struct timespec t;
+ 	getnstimeofday(&t);
+ 	return (t.tv_sec * USEC_PER_SEC + t.tv_nsec / 1000);
+diff --git a/blackmagic-io-11.5.1a14/bm_util.c b/blackmagic-io-11.5.1a14/bm_util.c
+index e6a7856..ada1836 100644
+--- a/blackmagic-io-11.5.1a14/bm_util.c
++++ b/blackmagic-io-11.5.1a14/bm_util.c
+@@ -916,7 +916,11 @@ uint32_t bm_random32(void)
+ 
+ uint64_t bm_uptime(void)
+ {
+-#if KERNEL_VERSION_OR_LATER(2, 6, 28)
++#if KERNEL_VERSION_OR_LATER(5, 6, 0)
++	struct timespec64 t;
++	ktime_get_raw_ts64(&t);
++	return ((uint64_t)t.tv_sec * NSEC_PER_SEC) + t.tv_nsec;
++#elif KERNEL_VERSION_OR_LATER(2, 6, 28)
+ 	struct timespec t;
+ 	getrawmonotonic(&t);
+ 	return ((uint64_t)t.tv_sec * NSEC_PER_SEC) + t.tv_nsec;