bump version to 12.2.2

3 files changed, 11 insertions, 127 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53321ffdcbc3..fe9a16f39f2a 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.2
+	pkgver = 12.2.2
 	pkgrel = 1
 	url = https://www.blackmagicdesign.com/support/family/capture-and-playback
 	arch = i686
@@ -9,10 +9,8 @@ pkgbase = decklink
 	makedepends = curl
 	options = !strip
 	options = staticlibs
-	source = decklink-12.2.tar.gz::https://www.blackmagicdesign.com/api/register/us/download/f3106b481e2b4cd5934a650c869be25f
-	source = 01-fix-alloc_tty_driver.patch
-	sha256sums = 62954a18b60d9040aa4a959dff30ac9c260218ef78d6a63cbb243788f7abc05f
-	sha256sums = ede66414652d5bb669bf32eb8aa870d8e91889db23919a454606daa1a4c2cd73
+	source = decklink-12.2.2.tar.gz::https://www.blackmagicdesign.com/api/register/us/download/d58607f0c29d4e17a6813f5d06ab2959
+	sha256sums = 8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35
 
 pkgname = decklink
 	install = decklink.install
diff --git a/01-fix-alloc_tty_driver.patch b/01-fix-alloc_tty_driver.patch
deleted file mode 100644
index 25f6729abbc3..000000000000
--- a/01-fix-alloc_tty_driver.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-*** a/blackmagic-io-12.2a12/bmio_serial.c	2021-11-10 13:53:06.486238131 +0100
---- b/blackmagic-io-12.2a12/bmio_serial.c	2021-11-10 13:53:12.872862463 +0100
-*************** int bmio_serial_driver_init(void)
-*** 304,310 ****
-  {
-  	int ret;
-
-! 	struct tty_driver* serial = alloc_tty_driver(MAX_SERIAL_LINES);
-  	if (!serial)
-  		return -ENOMEM;
-
---- 304,316 ----
-  {
-  	int ret;
-
-! 	struct tty_driver* serial;
-! #if KERNEL_VERSION_OR_LATER(5, 15, 0)
-!     serial = tty_alloc_driver(MAX_SERIAL_LINES, 0);
-! #else
-! 	serial = alloc_tty_driver(MAX_SERIAL_LINES);
-! #endif
-!
-  	if (!serial)
-  		return -ENOMEM;
-
-*************** int bmio_serial_driver_init(void)
-*** 324,330 ****
---- 330,340 ----
-  	ret = tty_register_driver(serial);
-  	if (ret)
-  	{
-+ #if KERNEL_VERSION_OR_LATER(5, 15, 0)
-+         tty_driver_kref_put(serial);
-+ #else
-  		put_tty_driver(serial);
-+ #endif
-  		return ret;
-  	}
-
-*************** void bmio_serial_driver_exit(void)
-*** 340,346 ****
---- 350,362 ----
-  	if (serial_driver)
-  	{
-  		tty_unregister_driver(serial_driver);
-+
-+ #if KERNEL_VERSION_OR_LATER(5, 15, 0)
-+ 		tty_driver_kref_put(serial_driver);
-+ #else
-  		put_tty_driver(serial_driver);
-+ #endif
-+
-  		serial_driver = NULL;
-  	}
-  }
-
-*** a/blackmagic-12.2a12/blackmagic_serial.c	2021-11-10 13:52:55.462977861 +0100
---- b/blackmagic-12.2a12/blackmagic_serial.c	2021-11-10 13:53:12.872862463 +0100
-*************** int __init blackmagic_serial_init(void)
-*** 613,619 ****
---- 613,623 ----
-  	int ret;
-  	struct tty_driver *driver;
-
-+ #if KERNEL_VERSION_OR_LATER(5, 15, 0)
-+     driver = tty_alloc_driver(BLACKMAGIC_SERIAL_MINORS, 0);
-+ #else
-  	driver = alloc_tty_driver(BLACKMAGIC_SERIAL_MINORS);
-+ #endif
-  	if (!driver)
-  		return -ENOMEM;
-
-*************** int __init blackmagic_serial_init(void)
-*** 639,645 ****
-
-  abort:
-  	printk(KERN_ERR "failed to register blackmagic serial driver");
-! 	put_tty_driver(driver);
-  	return ret;
-  }
-
---- 643,653 ----
-
-  abort:
-  	printk(KERN_ERR "failed to register blackmagic serial driver");
-! #if KERNEL_VERSION_OR_LATER(5, 15, 0)
-!     tty_driver_kref_put(driver);
-! #else
-!     put_tty_driver(driver);
-! #endif
-  	return ret;
-  }
-
-*************** void __exit blackmagic_serial_exit(void)
-*** 648,653 ****
-  	if (blackmagic_tty_driver)
-  	{
-  		tty_unregister_driver(blackmagic_tty_driver);
-! 		put_tty_driver(blackmagic_tty_driver);
-  	}
-  }
---- 656,665 ----
-  	if (blackmagic_tty_driver)
-  	{
-  		tty_unregister_driver(blackmagic_tty_driver);
-! #if KERNEL_VERSION_OR_LATER(5, 15, 0)
-!         tty_driver_kref_put(blackmagic_tty_driver);
-! #else
-!         put_tty_driver(blackmagic_tty_driver);
-! #endif
-  	}
-  }
diff --git a/PKGBUILD b/PKGBUILD
index 607a2d8d04ae..f4c2dc3f2199 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgbase=decklink
 pkgname=(decklink mediaexpress)
 _pkgname=decklink
-pkgver=12.2
+pkgver=12.2.2
 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/f3106b481e2b4cd5934a650c869be25f"
+_pkgsrc_url="https://www.blackmagicdesign.com/api/register/us/download/d58607f0c29d4e17a6813f5d06ab2959"
 _pkgsrc_file=${_pkgname}-${pkgver}.tar.gz
 
 DLAGENTS=("https::/usr/bin/curl \
@@ -30,10 +30,8 @@ DLAGENTS=("https::/usr/bin/curl \
 )
 
 source=("${_pkgsrc_file}"::"${_pkgsrc_url}"
-        "01-fix-alloc_tty_driver.patch"
     )
-sha256sums=('62954a18b60d9040aa4a959dff30ac9c260218ef78d6a63cbb243788f7abc05f'
-            'ede66414652d5bb669bf32eb8aa870d8e91889db23919a454606daa1a4c2cd73')
+sha256sums=('8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35')
 
 prepare() {
   cd $srcdir/Blackmagic_Desktop_Video_Linux_$pkgver/other/${_arch}
@@ -42,11 +40,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
 
 }