Updated to v2.2.1.1.HEADmaster

Moved Cmake configure step to the PKGBUILD prepare() function.
This makes makepkg -e happy.

2 files changed, 108 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0c0956e..e5875ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Peter Strapp <peter@strapp.co.uk>
 
 pkgname=indi-3rdparty-libs
-pkgver=2.2.0
+pkgver=2.2.1.1
 pkgrel=1
 pkgdesc="dependencies for INDI 3rd party drivers"
 url="http://www.indilib.org/index.php?title=Main_Page"
@@ -15,17 +15,19 @@ makedepends_x86_64=(cmake)
 makedepends_aarch64=(cmake libgpiod)
 conflicts=()
 source=(
-	"indi-3rdparty-${pkgver}.tar.gz::https://github.com/indilib/indi-3rdparty/archive/v${pkgver}.tar.gz" 
+	"indi-3rdparty-${pkgver}.tar.gz::https://github.com/indilib/indi-3rdparty/archive/v${pkgver}.tar.gz"
+	"indi-3rdparty-2.2.1.1-unused_variables.patch"
 	)
 sha256sums=(
-	"2f5f329326bf6e468e6313724679e2934314dcee234715cbc5cac39279142f04" 
+	"b336df05a4e4313b02264e6cd59ecc78f0b37ac68eb895ffb617ae553a7db12a"
+	"db22ecc3f8733a899ba5fde5f78201334a97ef8c7af2c11f1f475aecde92074c"
 	)
 
 prepare() {
+  cd indi-3rdparty-${pkgver}
+  patch -Np1 -i ../indi-3rdparty-2.2.1.1-unused_variables.patch
+  cd ..
   mkdir -p build
-}
-
-build() {
   cd build
   cmake \
     -DCMAKE_BUILD_TYPE=Release \
@@ -37,6 +39,10 @@ build() {
     -DQHY_FIRMWARE_INSTALL_DIR=/usr/lib/firmware \
     -DBUILD_LIBS=On \
     ../indi-3rdparty-${pkgver}
+}
+
+build() {
+  cd build
   make -j$(nproc)
 }
 
diff --git a/indi-3rdparty-2.2.1.1-unused_variables.patch b/indi-3rdparty-2.2.1.1-unused_variables.patch
new file mode 100644
index 0000000..19493e0
--- /dev/null
+++ b/indi-3rdparty-2.2.1.1-unused_variables.patch
@@ -0,0 +1,96 @@
+diff -u -r indi-3rdparty-2.2.1.1/libpktriggercord/src/pktriggercord-cli.c indi-3rdparty-2.2.1.1-ing/libpktriggercord/src/pktriggercord-cli.c
+--- indi-3rdparty-2.2.1.1/libpktriggercord/src/pktriggercord-cli.c	2026-04-23 21:37:33.000000000 +0000
++++ indi-3rdparty-2.2.1.1-ing/libpktriggercord/src/pktriggercord-cli.c	2026-05-14 19:48:54.066000000 +0000
+@@ -124,7 +124,6 @@
+     pslr_buffer_type imagetype;
+     uint8_t buf[65536];
+     uint32_t length;
+-    uint32_t current;
+ 
+     if (filefmt == USER_FILE_FORMAT_PEF) {
+         imagetype = PSLR_BUF_PEF;
+@@ -142,7 +141,6 @@
+ 
+     length = pslr_buffer_get_size(camhandle);
+     DPRINT("Buffer length: %d\n", length);
+-    current = 0;
+ 
+     while (true) {
+         uint32_t bytes;
+@@ -158,7 +156,6 @@
+         } else if ((uint32_t)r < bytes) {
+             DPRINT("write(buf): only write %zu bytes, should be %d bytes.\n", r, bytes);
+         }
+-        current += bytes;
+     }
+     pslr_buffer_close(camhandle);
+     return 0;
+diff -u -r indi-3rdparty-2.2.1.1/libpktriggercord/src/pktriggercord-servermode.c indi-3rdparty-2.2.1.1-ing/libpktriggercord/src/pktriggercord-servermode.c
+--- indi-3rdparty-2.2.1.1/libpktriggercord/src/pktriggercord-servermode.c	2026-04-23 21:37:33.000000000 +0000
++++ indi-3rdparty-2.2.1.1-ing/libpktriggercord/src/pktriggercord-servermode.c	2026-05-14 19:37:56.215950378 +0000
+@@ -344,7 +344,6 @@
+                         imageSize = pslr_buffer_get_size(camhandle);
+                         sprintf(buf, "%d %d\n", 0, imageSize);
+                         write_socket_answer(buf);
+-                        uint32_t current = 0;
+                         while (1) {
+                             uint32_t bytes;
+                             uint8_t buf[65536];
+@@ -353,7 +352,6 @@
+                                 break;
+                             }
+                             write_socket_answer_bin( buf, bytes);
+-                            current += bytes;
+                         }
+                         pslr_buffer_close(camhandle);
+                     }
+diff -u -r indi-3rdparty-2.2.1.1/libpktriggercord/src/pslr.c indi-3rdparty-2.2.1.1-ing/libpktriggercord/src/pslr.c
+--- indi-3rdparty-2.2.1.1/libpktriggercord/src/pslr.c	2026-04-23 21:37:33.000000000 +0000
++++ indi-3rdparty-2.2.1.1-ing/libpktriggercord/src/pslr.c	2026-05-14 19:37:56.216000000 +0000
+@@ -1002,7 +1002,6 @@
+     DPRINT("[C]\tpslr_buffer_open(#%X, type=%X, res=%X)\n", bufno, buftype, bufres);
+     pslr_buffer_segment_info info;
+     uint16_t bufs;
+-    uint32_t buf_total = 0;
+     int i, j;
+     int ret;
+     int retry = 0;
+@@ -1063,7 +1062,6 @@
+             j++;
+         }
+         CHECK(ipslr_next_segment(p));
+-        buf_total += info.length;
+         i++;
+     } while (i < 9 && info.b != 2);
+     p->segment_count = j;
+diff -u -r indi-3rdparty-2.2.1.1/libqsi/SimpleIni.h indi-3rdparty-2.2.1.1-ing/libqsi/SimpleIni.h
+--- indi-3rdparty-2.2.1.1/libqsi/SimpleIni.h	2026-04-23 21:37:33.000000000 +0000
++++ indi-3rdparty-2.2.1.1-ing/libqsi/SimpleIni.h	2026-05-14 19:37:56.216748395 +0000
+@@ -1809,8 +1809,7 @@
+ void
+ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::GetAllSections( TNamesDepend & a_names  ) const
+ {
+-    typename TSection::const_iterator i = m_data.begin();
+-    for (int n = 0; i != m_data.end(); ++i, ++n ) 
++    for (typename TSection::const_iterator i = m_data.begin(); i != m_data.end(); ++i) 
+ 	{
+         a_names.push_back(i->first);
+     }
+@@ -1833,13 +1832,12 @@
+ 
+     const TKeyVal & section = iSection->second;
+     const SI_CHAR * pLastKey = NULL;
+-    typename TKeyVal::const_iterator iKeyVal = section.begin();
+-    for (int n = 0; iKeyVal != section.end(); ++iKeyVal, ++n ) 
++    for (typename TKeyVal::const_iterator i = section.begin(); i != section.end(); ++i ) 
+ 	{
+-        if (!pLastKey || IsLess(pLastKey, iKeyVal->first.pItem)) 
++        if (!pLastKey || IsLess(pLastKey, i->first.pItem)) 
+ 		{
+-            a_names.push_back(iKeyVal->first);
+-            pLastKey = iKeyVal->first.pItem;
++            a_names.push_back(i->first);
++            pLastKey = i->first.pItem;
+         }
+     }
+ }