add patch to use arch LDFLAGS

3 files changed, 34 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc4f9f580faf..8bc14983b4b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qoi-git
 	pkgdesc = The 'Quite OK Image' format for fast, lossless image compression
-	pkgver = r276.660839c
+	pkgver = r321.9c487be
 	pkgrel = 1
 	url = https://qoiformat.org/
 	arch = x86_64
@@ -10,7 +10,9 @@ pkgbase = qoi-git
 	makedepends = stb
 	makedepends = libpng
 	source = qoi::git+https://github.com/phoboslab/qoi.git
+	source = 010-qoi-use-arch-flags.patch
 	sha256sums = SKIP
+	sha256sums = 3c5aed75c5560fe782cdb47b713be7292291b37fa311f74a01ec88561f0e321f
 
 pkgname = qoi-headers-git
 	pkgdesc = The 'Quite OK Image' format for fast, lossless image compression - headers
diff --git a/010-qoi-use-arch-flags.patch b/010-qoi-use-arch-flags.patch
new file mode 100644
index 000000000000..30c53c261fc0
--- /dev/null
+++ b/010-qoi-use-arch-flags.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,8 @@
+ CC ?= gcc
+ CFLAGS_BENCH ?= -std=gnu99 -O3
+-LFLAGS_BENCH ?= -lpng
++LFLAGS_BENCH ?= -lpng $(LDFLAGS)
+ CFLAGS_CONV ?= -std=c99 -O3
++LFLAGS_CONV ?= $(LDFLAGS)
+ 
+ TARGET_BENCH ?= qoibench
+ TARGET_CONV ?= qoiconv
+@@ -15,7 +16,7 @@ $(TARGET_BENCH):$(TARGET_BENCH).c
+ 
+ conv: $(TARGET_CONV)
+ $(TARGET_CONV):$(TARGET_CONV).c
+-	$(CC) $(CFLAGS_CONV) $(CFLAGS) $(TARGET_CONV).c -o $(TARGET_CONV)
++	$(CC) $(CFLAGS_CONV) $(CFLAGS) $(TARGET_CONV).c -o $(TARGET_CONV) $(LFLAGS_CONV)
+ 
+ .PHONY: clean
+ clean:
diff --git a/PKGBUILD b/PKGBUILD
index d4547a6646e9..bc34b717ad52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,19 +7,25 @@ pkgname=(qoi-headers-git
          qoibench-git
         )
 pkgbase=qoi-git
-pkgver=r276.660839c
+pkgver=r321.9c487be
 pkgrel=1
 pkgdesc="The 'Quite OK Image' format for fast, lossless image compression"
 arch=('x86_64')
 url='https://qoiformat.org/'
 license=('MIT')
-source=("$source_dir::git+https://github.com/phoboslab/qoi.git")
+source=("$source_dir::git+https://github.com/phoboslab/qoi.git"
+        "010-qoi-use-arch-flags.patch")
 makedepends=('git'
              'gcc-libs'
              'stb'
              'libpng'
              )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '3c5aed75c5560fe782cdb47b713be7292291b37fa311f74a01ec88561f0e321f')
+
+prepare() {
+    patch -d $source_dir -Np1 -i "${srcdir}/010-qoi-use-arch-flags.patch"
+}
 
 pkgver() {
   cd $source_dir
@@ -28,7 +34,7 @@ pkgver() {
 
 build() {
   cd $source_dir
-  make CFLAGS="-I /usr/include/stb/"
+  make CFLAGS+="-I /usr/include/stb/"
 }
 
 package_qoi-headers-git() {