diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index ed18607..ef37af9 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,6 +1,7 @@ +diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch --- tachyon/unix/Make-arch.r 2007-02-13 10:00:36.000000000 +0100 -+++ tachyon/unix/Make-arch 2007-07-14 14:22:32.000000000 +0200 -@@ -15,7 +15,7 @@ ++++ tachyon/unix/Make-arch 2007-12-04 00:01:04.000000000 +0100 +@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC) @@ -9,7 +10,7 @@ MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) default: -@@ -983,7 +983,7 @@ +@@ -983,7 +983,7 @@ linux: "CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ @@ -18,7 +19,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" -@@ -1007,7 +1007,7 @@ +@@ -1007,7 +1007,7 @@ linux-64: "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ @@ -27,7 +28,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" -@@ -1029,10 +1029,10 @@ +@@ -1029,10 +1029,10 @@ linux-64-thr: $(MAKE) all \ "ARCH = linux-64-thr" \ "CC = gcc" \ @@ -40,7 +41,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1128,10 +1128,10 @@ +@@ -1128,10 +1128,10 @@ linux-thr: $(MAKE) all \ "ARCH = linux-thr" \ "CC = gcc" \ @@ -53,7 +54,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1140,7 +1140,7 @@ +@@ -1140,7 +1140,7 @@ linux-thr-ogl: $(MAKE) all \ "ARCH = linux-thr-ogl" \ "CC = cc" \ @@ -62,7 +63,7 @@ "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1174,37 +1174,61 @@ +@@ -1174,37 +1174,61 @@ linux-beowulf-mpi: linux-lam: $(MAKE) all \ "ARCH = linux-lam" \ @@ -74,8 +75,7 @@ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" + +# Linux x86 using LAM MPI, with OpenGL display @@ -87,7 +87,8 @@ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" # Linux AMD64/EM64T using LAM MPI @@ -122,7 +123,8 @@ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + +# Linux AMD64/EM64T using threads with OpenGL display @@ -134,13 +136,12 @@ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread" # Linux x86 using LAM MPI and threads linux-lam-thr: -@@ -1242,6 +1266,234 @@ +@@ -1242,6 +1266,234 @@ linux-ppc: "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" @@ -375,9 +376,73 @@ # Linux PPC using gcc linux-ps2: $(MAKE) all \ +@@ -1259,13 +1511,61 @@ linux-alpha: + $(MAKE) all \ + "ARCH = linux-alpha" \ + "CC = gcc" \ +- "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \ ++ "CFLAGS = -Wall -O2 -DLinux $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm" + ++# Linux Alpha using gcc and threads ++linux-alpha-thr: ++ $(MAKE) all \ ++ "ARCH = linux-alpha-thr" \ ++ "CC = gcc" \ ++ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" ++ ++# Linux Alpha using threads with OpenGL display ++linux-alpha-thr-ogl: ++ $(MAKE) all \ ++ "ARCH = linux-alpha-thr-ogl" \ ++ "CC = gcc" \ ++ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread" ++ ++# Linux Alpha using LAM MPI ++linux-alpha-lam: ++ $(MAKE) all \ ++ "ARCH = linux-alpha-lam" \ ++ "CC = mpicc" \ ++ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ ++# Linux Alpha using LAM MPI, with OpenGL display ++linux-alpha-lam-ogl: ++ $(MAKE) all \ ++ "ARCH = linux-alpha-lam-ogl" \ ++ "CC = mpicc" \ ++ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ + # Linux Alpha using Compaq's compilers + linux-alpha-ccc: + $(MAKE) all \ +diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config --- tachyon/unix/Make-config.r 2007-01-24 09:35:44.000000000 +0100 -+++ tachyon/unix/Make-config 2007-07-14 14:18:14.000000000 +0200 -@@ -57,7 +57,7 @@ ++++ tachyon/unix/Make-config 2007-12-03 23:57:46.000000000 +0100 +@@ -57,7 +57,7 @@ X11LIB= -lX11 ########################################################################## # Standard MPICH installation location @@ -386,7 +451,7 @@ # UMR CS Dept #MPIDIR=/software/all/mpi -@@ -108,14 +108,14 @@ +@@ -108,14 +108,14 @@ MBOX= # http://www.ijg.org/files/ ########################################################################## # Uncomment the following lines to disable JPEG support @@ -407,7 +472,7 @@ ########################################################################## -@@ -128,14 +128,14 @@ +@@ -128,14 +128,14 @@ JPEGLIB= # http://www.libpng.org/ ########################################################################## # Uncomment the following lines to disable PNG support @@ -428,8 +493,9 @@ ########################################################################## +diff -up tachyon/unix/Make-opengl.r tachyon/unix/Make-opengl --- tachyon/unix/Make-opengl.r 2007-01-24 09:35:44.000000000 +0100 -+++ tachyon/unix/Make-opengl 2007-07-14 14:18:14.000000000 +0200 ++++ tachyon/unix/Make-opengl 2007-12-03 23:57:46.000000000 +0100 @@ -9,8 +9,8 @@ # # Generic Mesa OpenGL / GLX include and link specs, for most platforms @@ -441,7 +507,7 @@ # -@@ -37,8 +37,8 @@ +@@ -37,8 +37,8 @@ HP_GLX_LIBS = -L/usr/lib/X11R6 -L/opt/gr # # Linux OpenGL / GLX include and link specs # diff --git a/tachyon.spec b/tachyon.spec index c9918da..7fc564b 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -4,14 +4,14 @@ %ifarch x86_64 %define target linux-64 %endif -%ifarch ppc ppc64 sparc sparc64 +%ifarch ppc ppc64 sparc sparc64 alpha %define target linux-%{_target_cpu} %endif Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.3.20070319%{?dist} +Release: 0.4.20070319%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.98/tachyon20070319.tar.gz @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Tue Dec 04 2007 Dominik 'Rathann' Mierzejewski 0.98-0.4 +- add support for Alpha + * Wed Aug 29 2007 Dominik 'Rathann' Mierzejewski 0.98-0.3 - rebuild - update license tag