diff --git a/community/tachyon/PKGBUILD b/community/tachyon/PKGBUILD index 6136aed64..d3978f4fb 100644 --- a/community/tachyon/PKGBUILD +++ b/community/tachyon/PKGBUILD @@ -6,8 +6,8 @@ # - sed to remove -m32 and -m64 from CFLAGS pkgname=tachyon -pkgver=0.98.9 -pkgrel=8 +pkgver=0.99.2 +pkgrel=1 pkgdesc="Multithreaded ray tracing software" arch=(x86_64) url="http://jedi.ks.uiuc.edu/~johns/raytracer/" @@ -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=('c6a3298ded4dc3e9390447819e1dac59b62c3d2d46d4154312ffe71549ee40d7' - 'ecd6ab6274879e0f971e2eba17871fffe2e24dcc9a332013a0b100ee4857cc2c' - '34f703af96afe117c851a5825b7fd6b71211c09e4a8c3b836d012d250bb6918f') +sha256sums=('d40a5752fe78b84c5ca913bf55e5707c310526f9eebd8269d1583359d8415798' + 'fba8ac0aaa9dd6fe8b4737f5ae95d7795751e15d88bff3ec09ed665673d126b9' + '84108222d5daa60285111b69e9ee086aad3818f2fa8d706b4bd9811656682f2c') case "$CARCH" in arm*) _target=linux-thr ;; @@ -54,7 +54,6 @@ package() { cd "$srcdir"/$pkgname/scenes install -d "$pkgdir"/usr/share/tachyon/scenes/imaps install -m 644 README *.dat *.cam *.ac "$pkgdir"/usr/share/tachyon/scenes - install -m 644 imaps/* "$pkgdir"/usr/share/tachyon/scenes/imaps install -d "$pkgdir"/usr/share/licenses/tachyon install "$srcdir"/$pkgname/Copyright "$pkgdir"/usr/share/licenses/tachyon diff --git a/community/tachyon/enable-jpeg-png.patch b/community/tachyon/enable-jpeg-png.patch index f63cbc4bd..498f18f48 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 -@@ -108,14 +108,14 @@ +@@ -181,14 +181,14 @@ # http://www.ijg.org/files/ ########################################################################## # Uncomment the following lines to disable JPEG support @@ -21,7 +21,7 @@ ########################################################################## -@@ -128,14 +128,14 @@ +@@ -201,14 +201,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 cf37f4506..e4c4229dc 100644 --- a/community/tachyon/tachyon-system-cflags.patch +++ b/community/tachyon/tachyon-system-cflags.patch @@ -1,11 +1,11 @@ --- 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 -@@ -1217,12 +1217,12 @@ +@@ -1278,12 +1278,12 @@ $(MAKE) all \ "ARCH = linux-64-thr" \ "CC = gcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \ -+ "CFLAGS = $(CFLAGS) -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = $(CFLAGS) -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ "STRIP = strip" \