[arch-commits] Commit in tachyon/trunk (PKGBUILD enable-jpeg-png.patch)

[Antonio Rojas]

    Date: Thursday, January 8, 2015 @ 20:54:55
  Author: arojas
Revision: 125618

Enable JPEG and PNG support

Added:
  tachyon/trunk/enable-jpeg-png.patch
Modified:
  tachyon/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   16 ++++++++++++----
 enable-jpeg-png.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-08 18:47:39 UTC (rev 125617)
+++ PKGBUILD	2015-01-08 19:54:55 UTC (rev 125618)
@@ -3,15 +3,17 @@
 
 pkgname=tachyon
 pkgver=0.98.9
-pkgrel=1
+pkgrel=2
 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')
+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 ;;
@@ -18,6 +20,12 @@
   "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

Added: enable-jpeg-png.patch
===================================================================
--- enable-jpeg-png.patch	                        (rev 0)
+++ enable-jpeg-png.patch	2015-01-08 19:54:55 UTC (rev 125618)
@@ -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
+ 
+ 
+ ##########################################################################