[arch-commits] Commit in tachyon/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Thu Jan 8 19:55:56 UTC 2015
Date: Thursday, January 8, 2015 @ 20:55:55
Author: arojas
Revision: 125619
archrelease: copy trunk to community-i686, community-x86_64
Added:
tachyon/repos/community-i686/PKGBUILD
(from rev 125618, tachyon/trunk/PKGBUILD)
tachyon/repos/community-i686/enable-jpeg-png.patch
(from rev 125618, tachyon/trunk/enable-jpeg-png.patch)
tachyon/repos/community-x86_64/PKGBUILD
(from rev 125618, tachyon/trunk/PKGBUILD)
tachyon/repos/community-x86_64/enable-jpeg-png.patch
(from rev 125618, tachyon/trunk/enable-jpeg-png.patch)
Deleted:
tachyon/repos/community-i686/PKGBUILD
tachyon/repos/community-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 92 +++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 38 ------------
community-i686/enable-jpeg-png.patch | 44 ++++++++++++++
community-x86_64/PKGBUILD | 38 ------------
community-x86_64/enable-jpeg-png.patch | 44 ++++++++++++++
5 files changed, 180 insertions(+), 76 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-01-08 19:54:55 UTC (rev 125618)
+++ community-i686/PKGBUILD 2015-01-08 19:55:55 UTC (rev 125619)
@@ -1,38 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <remy at archlinux.org>
-
-pkgname=tachyon
-pkgver=0.98.9
-pkgrel=1
-pkgdesc="Multithreaded ray tracing software"
-arch=('i686' 'x86_64')
-url="http://jedi.ks.uiuc.edu/~johns/raytracer/"
-license=('BSD')
-depends=('glibc')
-options=('staticlibs')
-source=(http://jedi.ks.uiuc.edu/~johns/raytracer/files/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('eb39e10bb37bccc949b45b8fc28dabd7')
-
-case "$CARCH" in
- "i686") _target=linux-thr ;;
- "x86_64") _target=linux-64-thr ;;
-esac
-
-build() {
- cd $pkgname/unix
- make $_target
-}
-
-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-i686/PKGBUILD (from rev 125618, tachyon/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-08 19:55:55 UTC (rev 125619)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <remy at archlinux.org>
+
+pkgname=tachyon
+pkgver=0.98.9
+pkgrel=2
+pkgdesc="Multithreaded ray tracing software"
+arch=('i686' 'x86_64')
+url="http://jedi.ks.uiuc.edu/~johns/raytracer/"
+license=('BSD')
+depends=('glibc')
+makedepends=('libjpeg-turbo' 'libpng')
+optdepends=('libjpeg-turbo: JPEG format support' 'libpng: PNG format support')
+source=("http://jedi.ks.uiuc.edu/~johns/raytracer/files/$pkgver/$pkgname-$pkgver.tar.gz" 'enable-jpeg-png.patch')
+md5sums=('eb39e10bb37bccc949b45b8fc28dabd7'
+ 'e0f0c2bd974d0beac509d6dd237ad77c')
+
+case "$CARCH" in
+ "i686") _target=linux-thr ;;
+ "x86_64") _target=linux-64-thr ;;
+esac
+
+prepare(){
+ cd $pkgname
+# enable JPEG and PNG support
+ patch -p0 -i "$srcdir"/enable-jpeg-png.patch
+}
+
+build() {
+ cd $pkgname/unix
+ make $_target
+}
+
+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-i686/enable-jpeg-png.patch (from rev 125618, tachyon/trunk/enable-jpeg-png.patch)
===================================================================
--- community-i686/enable-jpeg-png.patch (rev 0)
+++ community-i686/enable-jpeg-png.patch 2015-01-08 19:55:55 UTC (rev 125619)
@@ -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: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-01-08 19:54:55 UTC (rev 125618)
+++ community-x86_64/PKGBUILD 2015-01-08 19:55:55 UTC (rev 125619)
@@ -1,38 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <remy at archlinux.org>
-
-pkgname=tachyon
-pkgver=0.98.9
-pkgrel=1
-pkgdesc="Multithreaded ray tracing software"
-arch=('i686' 'x86_64')
-url="http://jedi.ks.uiuc.edu/~johns/raytracer/"
-license=('BSD')
-depends=('glibc')
-options=('staticlibs')
-source=(http://jedi.ks.uiuc.edu/~johns/raytracer/files/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('eb39e10bb37bccc949b45b8fc28dabd7')
-
-case "$CARCH" in
- "i686") _target=linux-thr ;;
- "x86_64") _target=linux-64-thr ;;
-esac
-
-build() {
- cd $pkgname/unix
- make $_target
-}
-
-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-x86_64/PKGBUILD (from rev 125618, tachyon/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-01-08 19:55:55 UTC (rev 125619)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <remy at archlinux.org>
+
+pkgname=tachyon
+pkgver=0.98.9
+pkgrel=2
+pkgdesc="Multithreaded ray tracing software"
+arch=('i686' 'x86_64')
+url="http://jedi.ks.uiuc.edu/~johns/raytracer/"
+license=('BSD')
+depends=('glibc')
+makedepends=('libjpeg-turbo' 'libpng')
+optdepends=('libjpeg-turbo: JPEG format support' 'libpng: PNG format support')
+source=("http://jedi.ks.uiuc.edu/~johns/raytracer/files/$pkgver/$pkgname-$pkgver.tar.gz" 'enable-jpeg-png.patch')
+md5sums=('eb39e10bb37bccc949b45b8fc28dabd7'
+ 'e0f0c2bd974d0beac509d6dd237ad77c')
+
+case "$CARCH" in
+ "i686") _target=linux-thr ;;
+ "x86_64") _target=linux-64-thr ;;
+esac
+
+prepare(){
+ cd $pkgname
+# enable JPEG and PNG support
+ patch -p0 -i "$srcdir"/enable-jpeg-png.patch
+}
+
+build() {
+ cd $pkgname/unix
+ make $_target
+}
+
+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-x86_64/enable-jpeg-png.patch (from rev 125618, tachyon/trunk/enable-jpeg-png.patch)
===================================================================
--- community-x86_64/enable-jpeg-png.patch (rev 0)
+++ community-x86_64/enable-jpeg-png.patch 2015-01-08 19:55:55 UTC (rev 125619)
@@ -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
+
+
+ ##########################################################################
More information about the arch-commits
mailing list