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

Antonio Rojas arojas at gemini.archlinux.org
Sat Apr 23 17:16:34 UTC 2022


    Date: Saturday, April 23, 2022 @ 17:16:34
  Author: arojas
Revision: 1187660

archrelease: copy trunk to community-x86_64

Added:
  tachyon/repos/community-x86_64/PKGBUILD
    (from rev 1187659, tachyon/trunk/PKGBUILD)
  tachyon/repos/community-x86_64/enable-jpeg-png.patch
    (from rev 1187659, tachyon/trunk/enable-jpeg-png.patch)
  tachyon/repos/community-x86_64/tachyon-system-cflags.patch
    (from rev 1187659, 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                    |   92 +++++++++++++++++++++---------------------
 enable-jpeg-png.patch       |   88 ++++++++++++++++++++--------------------
 tachyon-system-cflags.patch |   34 +++++++--------
 3 files changed, 107 insertions(+), 107 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-23 17:16:20 UTC (rev 1187659)
+++ PKGBUILD	2022-04-23 17:16:34 UTC (rev 1187660)
@@ -1,46 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <remy at archlinux.org>
-
-pkgname=tachyon
-pkgver=0.99.4
-pkgrel=1
-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=('bc9bc31e12c3a79ae91fd2a15d4b506aa7e3c9a8b47b734c28e1246e162e680d'
-            '10d96a951c38e3a3a3b2854ad5e0da3fd24ee32446f604baae1a6b1ad6e6dad6'
-            '5d81b5487d231f46eaa05eb3c1dfcc84a961b58d71a8c36d6feee0dce713dc6d')
-_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} -ffat-lto-objects ${LDFLAGS}|g' -i unix/Makefile
-}
-
-build() {
-  cd $pkgname/unix
-  make $_target CC="gcc ${CFLAGS} -ffat-lto-objects ${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 -d "$pkgdir"/usr/share/licenses/tachyon
-  install "$srcdir"/$pkgname/Copyright "$pkgdir"/usr/share/licenses/tachyon
-}

Copied: tachyon/repos/community-x86_64/PKGBUILD (from rev 1187659, tachyon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-23 17:16:34 UTC (rev 1187660)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <remy at archlinux.org>
+
+pkgname=tachyon
+pkgver=0.99.5
+pkgrel=1
+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=('09203c102311149f5df5cc367409f96c725742666d19c24db5ba994d5a81a6f5'
+            '10d96a951c38e3a3a3b2854ad5e0da3fd24ee32446f604baae1a6b1ad6e6dad6'
+            '5d81b5487d231f46eaa05eb3c1dfcc84a961b58d71a8c36d6feee0dce713dc6d')
+_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} -ffat-lto-objects ${LDFLAGS}|g' -i unix/Makefile
+}
+
+build() {
+  cd $pkgname/unix
+  make $_target CC="gcc ${CFLAGS} -ffat-lto-objects ${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 -d "$pkgdir"/usr/share/licenses/tachyon
+  install "$srcdir"/$pkgname/Copyright "$pkgdir"/usr/share/licenses/tachyon
+}

Deleted: enable-jpeg-png.patch
===================================================================
--- enable-jpeg-png.patch	2022-04-23 17:16:20 UTC (rev 1187659)
+++ enable-jpeg-png.patch	2022-04-23 17:16:34 UTC (rev 1187660)
@@ -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
-@@ -188,14 +188,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
- 
- 
- ##########################################################################
-@@ -208,14 +208,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 1187659, tachyon/trunk/enable-jpeg-png.patch)
===================================================================
--- enable-jpeg-png.patch	                        (rev 0)
+++ enable-jpeg-png.patch	2022-04-23 17:16:34 UTC (rev 1187660)
@@ -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
+@@ -188,14 +188,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
+ 
+ 
+ ##########################################################################
+@@ -208,14 +208,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	2022-04-23 17:16:20 UTC (rev 1187659)
+++ tachyon-system-cflags.patch	2022-04-23 17:16:34 UTC (rev 1187660)
@@ -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
-@@ -1273,12 +1273,12 @@
- 	$(MAKE) all \
- 	"ARCH = linux-64-thr" \
- 	"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" \
- 	"ARFLAGS = r" \
- 	"STRIP = strip" \
- 	"RANLIB = ranlib" \
--	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" "LDFLAGS = $(LDFLAGS)"
- 
- # Linux on AMD64/EM64T, using gcc
- linux-64-thr-c11:

Copied: tachyon/repos/community-x86_64/tachyon-system-cflags.patch (from rev 1187659, tachyon/trunk/tachyon-system-cflags.patch)
===================================================================
--- tachyon-system-cflags.patch	                        (rev 0)
+++ tachyon-system-cflags.patch	2022-04-23 17:16:34 UTC (rev 1187660)
@@ -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
+@@ -1273,12 +1273,12 @@
+ 	$(MAKE) all \
+ 	"ARCH = linux-64-thr" \
+ 	"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" \
+ 	"ARFLAGS = r" \
+ 	"STRIP = strip" \
+ 	"RANLIB = ranlib" \
+-	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" "LDFLAGS = $(LDFLAGS)"
+ 
+ # Linux on AMD64/EM64T, using gcc
+ linux-64-thr-c11:



More information about the arch-commits mailing list