[arch-commits] Commit in tachyon/repos (4 files)

[Felix Yan]

    Date: Tuesday, July 7, 2020 @ 12:58:44
  Author: felixonmars
Revision: 658308

archrelease: copy trunk to community-staging-x86_64

Added:
  tachyon/repos/community-staging-x86_64/
  tachyon/repos/community-staging-x86_64/PKGBUILD
    (from rev 658307, tachyon/trunk/PKGBUILD)
  tachyon/repos/community-staging-x86_64/enable-jpeg-png.patch
    (from rev 658307, tachyon/trunk/enable-jpeg-png.patch)
  tachyon/repos/community-staging-x86_64/tachyon-system-cflags.patch
    (from rev 658307, tachyon/trunk/tachyon-system-cflags.patch)

-----------------------------+
 PKGBUILD                    |   47 ++++++++++++++++++++++++++++++++++++++++++
 enable-jpeg-png.patch       |   44 +++++++++++++++++++++++++++++++++++++++
 tachyon-system-cflags.patch |   17 +++++++++++++++
 3 files changed, 108 insertions(+)

Copied: tachyon/repos/community-staging-x86_64/PKGBUILD (from rev 658307, tachyon/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 12:58:44 UTC (rev 658308)
@@ -0,0 +1,47 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <remy at archlinux.org>
+
+pkgname=tachyon
+pkgver=0.98.9
+pkgrel=8
+pkgdesc="Multithreaded ray tracing software"
+arch=(x86_64)
+url="http://jedi.ks.uiuc.edu/~johns/raytracer/"
+license=(BSD)
+depends=(libjpeg-turbo libpng)
+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')
+_target=linux-64-thr
+
+prepare(){
+  cd $pkgname
+# enable JPEG and PNG support
+  patch -p0 -i ../enable-jpeg-png.patch
+# use system build flags
+  patch -p1 -i ../tachyon-system-cflags.patch
+  sed -e 's|${CC} ${CFLAGS}|${CC} ${CFLAGS} ${LDFLAGS}|g' -i unix/Makefile
+}
+
+build() {
+  cd $pkgname/unix
+  make $_target CC="gcc ${CFLAGS} ${LDFLAGS}"
+}
+
+package() {
+  cd $pkgname/compile/$_target
+  install -D -m 755 tachyon "$pkgdir"/usr/bin/tachyon
+  install -D -m 644 libtachyon.a "$pkgdir"/usr/lib/libtachyon.a
+
+  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
+}

Copied: tachyon/repos/community-staging-x86_64/enable-jpeg-png.patch (from rev 658307, tachyon/trunk/enable-jpeg-png.patch)
===================================================================
--- community-staging-x86_64/enable-jpeg-png.patch	                        (rev 0)
+++ community-staging-x86_64/enable-jpeg-png.patch	2020-07-07 12:58:44 UTC (rev 658308)
@@ -0,0 +1,44 @@
+--- 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 @@
+ #   http://www.ijg.org/files/
+ ##########################################################################
+ # Uncomment the following lines to disable JPEG support
+-USEJPEG=
+-JPEGINC=
+-JPEGLIB=
++#USEJPEG=
++#JPEGINC=
++#JPEGLIB=
+ 
+ # Uncomment the following lines to enable JPEG support
+-#USEJPEG= -DUSEJPEG
+-#JPEGINC= -I/usr/local/include
+-#JPEGLIB= -L/usr/local/lib -ljpeg
++USEJPEG= -DUSEJPEG
++JPEGINC= -I/usr/include
++JPEGLIB= -L/usr/lib -ljpeg
+ 
+ 
+ ##########################################################################
+@@ -128,14 +128,14 @@
+ #   http://www.libpng.org/
+ ##########################################################################
+ # Uncomment the following lines to disable PNG support
+-USEPNG=
+-PNGINC=
+-PNGLIB=
++#USEPNG=
++#PNGINC=
++#PNGLIB=
+ 
+ # Uncomment the following lines to enable PNG support
+-#USEPNG= -DUSEPNG
+-#PNGINC= -I/usr/local/include
+-#PNGLIB= -L/usr/local/lib -lpng -lz
++USEPNG= -DUSEPNG
++PNGINC= -I/usr/include
++PNGLIB= -L/usr/lib -lpng -lz
+ 
+ 
+ ##########################################################################

Copied: tachyon/repos/community-staging-x86_64/tachyon-system-cflags.patch (from rev 658307, tachyon/trunk/tachyon-system-cflags.patch)
===================================================================
--- community-staging-x86_64/tachyon-system-cflags.patch	                        (rev 0)
+++ community-staging-x86_64/tachyon-system-cflags.patch	2020-07-07 12:58:44 UTC (rev 658308)
@@ -0,0 +1,17 @@
+--- 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 @@
+ 	$(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)" \
+ 	"AR = ar" \
+ 	"ARFLAGS = r" \
+ 	"STRIP = strip" \
+ 	"RANLIB = ranlib" \
+-	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" "LDFLAGS = $(LDFLAGS)"
+ 
+ # Linux x86, on AMD Athlon, using gcc
+ linux-p4: