From 453f70fb6a26b69c98199baf377db8d67e48c259 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 7 Mar 2022 20:49:10 +0000
Subject: [PATCH] community/tachyon to 0.99.3-1

---
 community/tachyon/PKGBUILD                    | 8 ++++----
 community/tachyon/enable-jpeg-png.patch       | 4 ++--
 community/tachyon/tachyon-system-cflags.patch | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/community/tachyon/PKGBUILD b/community/tachyon/PKGBUILD
index d3978f4fb..e836c5e6b 100644
--- a/community/tachyon/PKGBUILD
+++ b/community/tachyon/PKGBUILD
@@ -6,7 +6,7 @@
 #  - sed to remove -m32 and -m64 from CFLAGS
 
 pkgname=tachyon
-pkgver=0.99.2
+pkgver=0.99.3
 pkgrel=1
 pkgdesc="Multithreaded ray tracing software"
 arch=(x86_64)
@@ -17,9 +17,9 @@ makedepends=()
 source=("http://jedi.ks.uiuc.edu/~johns/raytracer/files/$pkgver/$pkgname-$pkgver.tar.gz"
         enable-jpeg-png.patch
         tachyon-system-cflags.patch)
-sha256sums=('d40a5752fe78b84c5ca913bf55e5707c310526f9eebd8269d1583359d8415798'
-            'fba8ac0aaa9dd6fe8b4737f5ae95d7795751e15d88bff3ec09ed665673d126b9'
-            '84108222d5daa60285111b69e9ee086aad3818f2fa8d706b4bd9811656682f2c')
+sha256sums=('c725913bb9b7e1c4e282e0980bf5a3066ac0dcaaccd97b071a6d6d25e6e72492'
+            '10d96a951c38e3a3a3b2854ad5e0da3fd24ee32446f604baae1a6b1ad6e6dad6'
+            '5d81b5487d231f46eaa05eb3c1dfcc84a961b58d71a8c36d6feee0dce713dc6d')
 
 case "$CARCH" in
   arm*) _target=linux-thr ;;
diff --git a/community/tachyon/enable-jpeg-png.patch b/community/tachyon/enable-jpeg-png.patch
index 498f18f48..9a133e27e 100644
--- a/community/tachyon/enable-jpeg-png.patch
+++ b/community/tachyon/enable-jpeg-png.patch
@@ -1,6 +1,6 @@
 --- unix/Make-config.orig	2015-01-08 20:45:17.968890865 +0100
 +++ unix/Make-config	2015-01-08 20:46:16.223075085 +0100
-@@ -181,14 +181,14 @@
+@@ -188,14 +188,14 @@
  #   http://www.ijg.org/files/
  ##########################################################################
  # Uncomment the following lines to disable JPEG support
@@ -21,7 +21,7 @@
  
  
  ##########################################################################
-@@ -201,14 +201,14 @@
+@@ -208,14 +208,14 @@
  #   http://www.libpng.org/
  ##########################################################################
  # Uncomment the following lines to disable PNG support
diff --git a/community/tachyon/tachyon-system-cflags.patch b/community/tachyon/tachyon-system-cflags.patch
index e4c4229dc..d82c03e04 100644
--- a/community/tachyon/tachyon-system-cflags.patch
+++ b/community/tachyon/tachyon-system-cflags.patch
@@ -1,9 +1,9 @@
 --- tachyon/unix/Make-arch.orig	2019-08-24 23:13:05.136655180 +0000
 +++ tachyon/unix/Make-arch	2019-08-24 23:13:36.057062493 +0000
-@@ -1278,12 +1278,12 @@
+@@ -1273,12 +1273,12 @@
  	$(MAKE) all \
  	"ARCH = linux-64-thr" \
- 	"CC = gcc" \
+ 	"CC = cc" \
 -	"CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux  $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \
 +	"CFLAGS = $(CFLAGS) -DLinux  $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \
  	"AR = ar" \
@@ -13,5 +13,5 @@
 -	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
 +	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" "LDFLAGS = $(LDFLAGS)"
  
- # Linux x86, on AMD Athlon, using gcc
- linux-p4:
+ # Linux on AMD64/EM64T, using gcc
+ linux-64-thr-c11: