bump version to 12.1

4 files changed, 12 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ead8754d7487..acb9f70110a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = decklink
 	pkgdesc = Drivers for Blackmagic Design DeckLink, Intensity or Multibridge video editing cards
-	pkgver = 12.0
+	pkgver = 12.1
 	pkgrel = 1
 	url = https://www.blackmagicdesign.com/support/family/capture-and-playback
 	arch = i686
@@ -9,12 +9,8 @@ pkgbase = decklink
 	makedepends = curl
 	options = !strip
 	options = staticlibs
-	source = decklink-12.0.tar.gz::https://www.blackmagicdesign.com/api/register/us/download/9e696d8929c44646a381855bf5c24d32
-	source = 01-fix-get_user_pages.patch
-	source = 02-fix-have_unlocked_ioctl.patch
-	sha256sums = e5a586ee705513cf5e6b024e1ec68621ab91d50b370981023e0bff73a19169c2
-	sha256sums = bc392840141bc983603092dffe53fafe6fd1e0e92d06d792c4b55a920f606dc8
-	sha256sums = d0ee2eb1c20107440cb95280186c395adfa346f59f730437fb87c7560b91e765
+	source = decklink-12.1.tar.gz::https://www.blackmagicdesign.com/api/register/us/download/114f976c4d3642168d24344d5f5b2afc
+	sha256sums = 51febf247d22412beea2d637fcc34cc19b1a46df9a5bf0e157d95705bf7c7b73
 
 pkgname = decklink
 	install = decklink.install
diff --git a/01-fix-get_user_pages.patch b/01-fix-get_user_pages.patch
deleted file mode 100644
index 90e87f14a80d..000000000000
--- a/01-fix-get_user_pages.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/blackmagic-12.0a14/blackmagic_lib.c b/blackmagic-12.0a14/blackmagic_lib.c.orig
-index 5494372..d1685e2 100644
---- a/blackmagic-12.0a14/blackmagic_lib.c
-+++ b/blackmagic-12.0a14/blackmagic_lib.c.orig
-@@ -676,7 +676,12 @@ dl_get_user_pages(void *task_ptr, void *ptr, unsigned long size, unsigned long *
- #else
- 	down_read(&current_task->mm->mmap_sem);
- #endif
--#if KERNEL_VERSION_OR_LATER(4, 10, 0)
-+#if KERNEL_VERSION_OR_LATER(5, 9, 0)
-+		if (current_task == current)
-+			ret = get_user_pages((unsigned long)ptr & PAGE_MASK, *nr_pages, write ? FOLL_WRITE : 0, pages, NULL);
-+		else
-+			ret = get_user_pages_remote(current_task->mm, (unsigned long)ptr & PAGE_MASK, *nr_pages, write ? FOLL_WRITE : 0, pages, NULL, NULL);
-+#elif KERNEL_VERSION_OR_LATER(4, 10, 0)
- 		if (current_task == current)
- 			ret = get_user_pages((unsigned long)ptr & PAGE_MASK, *nr_pages, write ? FOLL_WRITE : 0, pages, NULL);
- 		else
diff --git a/02-fix-have_unlocked_ioctl.patch b/02-fix-have_unlocked_ioctl.patch
deleted file mode 100644
index 18ded8682087..000000000000
--- a/02-fix-have_unlocked_ioctl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/blackmagic-12.0a14/blackmagic_core.c b/blackmagic-12.0a14/blackmagic_core.c
-index 2acbdd6..8d4f332 100644
---- a/blackmagic-12.0a14/blackmagic_core.c
-+++ b/blackmagic-12.0a14/blackmagic_core.c
-@@ -41,6 +41,12 @@
- 
- #include "blackmagic_core.h"
- 
-+
-+/* HAVE_UNLOCKED_IOCTL has been removed in kernel 5.9 */
-+#if KERNEL_VERSION_OR_LATER(5, 9, 0)
-+# define HAVE_UNLOCKED_IOCTL 1
-+#endif
-+
- unsigned long blackmagic_flags = 0;
- module_param(blackmagic_flags, ulong, S_IRUGO | S_IWUSR);
- 
diff --git a/PKGBUILD b/PKGBUILD
index f4b52c1acbad..61058116faf4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgbase=decklink
 pkgname=(decklink mediaexpress)
 _pkgname=decklink
-pkgver=12.0
+pkgver=12.1
 pkgrel=1
 pkgdesc="Drivers for Blackmagic Design DeckLink, Intensity or Multibridge video editing cards"
 arch=('i686' 'x86_64')
@@ -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/9e696d8929c44646a381855bf5c24d32"
+_pkgsrc_url="https://www.blackmagicdesign.com/api/register/us/download/114f976c4d3642168d24344d5f5b2afc"
 _pkgsrc_file=${_pkgname}-${pkgver}.tar.gz
 
 DLAGENTS=("https::/usr/bin/curl \
@@ -29,12 +29,8 @@ DLAGENTS=("https::/usr/bin/curl \
               )"
 )
 
-source=("${_pkgsrc_file}"::"${_pkgsrc_url}"
-        "01-fix-get_user_pages.patch"
-        "02-fix-have_unlocked_ioctl.patch")
-sha256sums=('e5a586ee705513cf5e6b024e1ec68621ab91d50b370981023e0bff73a19169c2'
-            'bc392840141bc983603092dffe53fafe6fd1e0e92d06d792c4b55a920f606dc8'
-            'd0ee2eb1c20107440cb95280186c395adfa346f59f730437fb87c7560b91e765')
+source=("${_pkgsrc_file}"::"${_pkgsrc_url}")
+sha256sums=('51febf247d22412beea2d637fcc34cc19b1a46df9a5bf0e157d95705bf7c7b73')
 
 prepare() {
   cd $srcdir/Blackmagic_Desktop_Video_Linux_$pkgver/other/${_arch}
@@ -43,11 +39,11 @@ prepare() {
 
   cd desktopvideo-*/usr/src
 
-  for p in ${srcdir}/*.patch;
-  do
-    echo "Applying ${p}"
-    patch --forward --strip=1 --input="${p}"
-  done
+  # for p in ${srcdir}/*.patch;
+  # do
+  #   echo "Applying ${p}"
+  #   patch --forward --strip=1 --input="${p}"
+  # done
 }
 
 package_decklink() {