Freshen up package, remove unnecessary patch

3 files changed, 13 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54adc460c1f8..147323769a7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aptdec-git
 	pkgdesc = NOAA APT satellite imagery decoder
-	pkgver = r184.794d69c
-	pkgrel = 2
+	pkgver = r190.b1cc748
+	pkgrel = 1
 	url = https://github.com/Xerbo/aptdec
 	arch = x86_64
 	arch = arm
@@ -14,8 +14,6 @@ pkgbase = aptdec-git
 	provides = aptdec
 	conflicts = aptdec
 	source = git+https://github.com/Xerbo/aptdec
-	source = 0001-Fix-GCC-A-may-be-used-uninitialized-warning.patch
 	md5sums = SKIP
-	md5sums = 129dbf2c66891cb179482a6e2539676f
 
 pkgname = aptdec-git
diff --git a/0001-Fix-GCC-A-may-be-used-uninitialized-warning.patch b/0001-Fix-GCC-A-may-be-used-uninitialized-warning.patch
deleted file mode 100644
index ed045984f415..000000000000
--- a/0001-Fix-GCC-A-may-be-used-uninitialized-warning.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4b84fee81f47cd2ae7c1a64b96a2f967a6545dcd Mon Sep 17 00:00:00 2001
-From: Shuyuan Liu <>
-Date: Thu, 1 Jul 2021 09:53:07 +0800
-Subject: [PATCH] Fix GCC 'A' may be used uninitialized warning
-
----
- src/libs/reg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libs/reg.c b/src/libs/reg.c
-index 975993f..5881074 100644
---- a/src/libs/reg.c
-+++ b/src/libs/reg.c
-@@ -20,7 +20,7 @@ static void FactPiv(int N, double A[DMAX][DMAX], double B[], double Cf[]);
- 
- void polyreg(const int M, const int N, const double X[], const double Y[], double C[]) {
- 	int R, K, J;			/* Loop counters */
--	double A[DMAX][DMAX];	/* A */
-+	double A[DMAX][DMAX] = { 0 };	/* A */
- 	double B[DMAX];
- 	double P[2 * DMAX + 1];
- 	double x, y;
--- 
-2.32.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 9ee85d752094..29911faa7861 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Shuyuan Liu (AUR)
 
 pkgname=aptdec-git
-pkgver=r184.794d69c
-pkgrel=2
+pkgver=r190.b1cc748
+pkgrel=1
 pkgdesc='NOAA APT satellite imagery decoder'
 arch=('x86_64' 'arm' 'aarch64')
 url="https://github.com/Xerbo/aptdec"
@@ -11,11 +11,10 @@ depends=('libsndfile' 'libpng')
 makedepends=('git' 'cmake')
 provides=('aptdec')
 conflicts=('aptdec')
-md5sums=('SKIP'
-         '129dbf2c66891cb179482a6e2539676f')
-
-source=('git+https://github.com/Xerbo/aptdec'
-        '0001-Fix-GCC-A-may-be-used-uninitialized-warning.patch')
+source=(
+	"git+$url"
+)
+md5sums=('SKIP')
 
 pkgver() {
 	cd aptdec
@@ -24,19 +23,16 @@ pkgver() {
 
 prepare() {
     cd aptdec
-    patch --forward --strip=1 --input="$srcdir/0001-Fix-GCC-A-may-be-used-uninitialized-warning.patch"
 }
 
 build() {
-	cd aptdec
-	mkdir -p build
-	cd build
-	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr' ..
-	make
+	cmake -B build -S aptdec \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX='/usr'
+	make -C build
 }
 
 package() {
-	cd aptdec/build
-	make DESTDIR="$pkgdir/" install
+	make -C build DESTDIR="$pkgdir/" install
 }