[arch-commits] Commit in tachyon/repos/community-x86_64 (6 files)

Antonio Rojas arojas at archlinux.org
Mon Sep 16 16:24:10 UTC 2019


    Date: Monday, September 16, 2019 @ 16:24:09
  Author: arojas
Revision: 510893

archrelease: copy trunk to community-x86_64

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

-----------------------------+
 PKGBUILD                    |   88 ++++++++++++++++++++++--------------------
 enable-jpeg-png.patch       |   88 +++++++++++++++++++++---------------------
 tachyon-system-cflags.patch |   34 ++++++++--------
 3 files changed, 108 insertions(+), 102 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-16 16:23:47 UTC (rev 510892)
+++ PKGBUILD	2019-09-16 16:24:09 UTC (rev 510893)
@@ -1,41 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <remy at archlinux.org>
-
-pkgname=tachyon
-pkgver=0.98.9
-pkgrel=6
-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')
-source=("https://mirrors.mit.edu/sage/spkg/upstream/tachyon/tachyon-$pkgver.tar.bz2" enable-jpeg-png.patch tachyon-system-cflags.patch)
-sha256sums=('e8888a410610e2726dca32f40f31ff34a83cb474b41e5a1e0ac8bbb175e1a466'
-            'ecd6ab6274879e0f971e2eba17871fffe2e24dcc9a332013a0b100ee4857cc2c'
-            '34f703af96afe117c851a5825b7fd6b71211c09e4a8c3b836d012d250bb6918f')
-_target=linux-64-thr
-
-prepare(){
-  cd $pkgname-$pkgver
-# 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-$pkgver/unix
-  make $_target CC="gcc ${CFLAGS} ${LDFLAGS}"
-}
-
-package() {
-  cd $pkgname-$pkgver/compile/$_target
-  install -D -m 755 tachyon $pkgdir/usr/bin/tachyon
-  install -D -m 644 libtachyon.a $pkgdir/usr/lib/libtachyon.a
-
-  install -d "$pkgdir"/usr/share/licenses/tachyon
-  install "$srcdir"/$pkgname-$pkgver/Copyright "$pkgdir"/usr/share/licenses/tachyon
-}

Copied: tachyon/repos/community-x86_64/PKGBUILD (from rev 510892, tachyon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-16 16:24:09 UTC (rev 510893)
@@ -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=7
+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
+}

Deleted: enable-jpeg-png.patch
===================================================================
--- enable-jpeg-png.patch	2019-09-16 16:23:47 UTC (rev 510892)
+++ enable-jpeg-png.patch	2019-09-16 16:24:09 UTC (rev 510893)
@@ -1,44 +0,0 @@
---- 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-x86_64/enable-jpeg-png.patch (from rev 510892, tachyon/trunk/enable-jpeg-png.patch)
===================================================================
--- enable-jpeg-png.patch	                        (rev 0)
+++ enable-jpeg-png.patch	2019-09-16 16:24:09 UTC (rev 510893)
@@ -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
+ 
+ 
+ ##########################################################################

Deleted: tachyon-system-cflags.patch
===================================================================
--- tachyon-system-cflags.patch	2019-09-16 16:23:47 UTC (rev 510892)
+++ tachyon-system-cflags.patch	2019-09-16 16:24:09 UTC (rev 510893)
@@ -1,17 +0,0 @@
---- 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:

Copied: tachyon/repos/community-x86_64/tachyon-system-cflags.patch (from rev 510892, tachyon/trunk/tachyon-system-cflags.patch)
===================================================================
--- tachyon-system-cflags.patch	                        (rev 0)
+++ tachyon-system-cflags.patch	2019-09-16 16:24:09 UTC (rev 510893)
@@ -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:


More information about the arch-commits mailing list