rpms/tachyon/EL-4 sources, 1.3, 1.4 tachyon-rpm.patch, 1.3, 1.4 tachyon.spec, 1.4, 1.5
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sat Jul 14 13:26:31 UTC 2007
Author: rathann
Update of /cvs/pkgs/rpms/tachyon/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526
Modified Files:
sources tachyon-rpm.patch tachyon.spec
Log Message:
- revert to 0.97 spec (why did the spec from devel appear here?)
- port to EL-4 branch
- drop SPARC support
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 7 Jul 2007 22:41:23 -0000 1.3
+++ sources 14 Jul 2007 13:25:59 -0000 1.4
@@ -1 +1 @@
-ef6fea54ef5222ed0b5335e2e6a76c11 tachyon20070319.tar.gz
+198953aea283a7158eef2ee079e909f6 tachyon-0.97.tar.gz
tachyon-rpm.patch:
Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/EL-4/tachyon-rpm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tachyon-rpm.patch 17 Dec 2006 01:36:38 -0000 1.3
+++ tachyon-rpm.patch 14 Jul 2007 13:25:59 -0000 1.4
@@ -1,5 +1,5 @@
--- tachyon/unix/Make-arch.r 2005-03-18 16:28:05.000000000 +0100
-+++ tachyon/unix/Make-arch 2006-12-17 00:42:01.000000000 +0100
++++ tachyon/unix/Make-arch 2006-11-29 19:54:45.000000000 +0100
@@ -15,7 +15,7 @@
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -74,8 +74,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 +86,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,8 +122,7 @@
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
- "RANLIB = ranlib" \
-- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
@@ -135,12 +134,13 @@
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
# Linux x86 using LAM MPI and threads
linux-lam-thr:
-@@ -1149,6 +1173,114 @@
+@@ -1149,6 +1173,54 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -192,71 +192,11 @@
+ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
-+# Linux SPARC using gcc
-+linux-sparc:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc" \
-+ "CC = gcc" \
-+ "CFLAGS = -m32 -Wall -O2 -DLinux $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = strip" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
-+
-+# Linux SPARC using gcc and threads
-+linux-sparc-thr:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-thr" \
-+ "CC = gcc" \
-+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC using threads with OpenGL display
-+linux-sparc-thr-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-thr-ogl" \
-+ "CC = gcc" \
-+ "CFLAGS = -m32 -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 SPARC using LAM MPI
-+linux-sparc-lam:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-lam" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m32 -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 SPARC using LAM MPI, with OpenGL display
-+linux-sparc-lam-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-lam-ogl" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m32 -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 PPC using gcc
linux-ps2:
$(MAKE) all \
--- tachyon/unix/Make-config.r 2004-03-05 20:41:03.000000000 +0100
-+++ tachyon/unix/Make-config 2006-12-17 00:37:45.000000000 +0100
++++ tachyon/unix/Make-config 2006-11-29 19:51:01.000000000 +0100
@@ -57,7 +57,7 @@
##########################################################################
@@ -309,26 +249,15 @@
##########################################################################
--- tachyon/unix/Make-opengl.r 2004-02-04 07:36:06.000000000 +0100
-+++ tachyon/unix/Make-opengl 2006-12-17 00:37:45.000000000 +0100
-@@ -9,8 +9,8 @@
- #
- # Generic Mesa OpenGL / GLX include and link specs, for most platforms
- #
--MESA_GLX_INCS = -I/usr/local/include
--MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
-+MESA_GLX_INCS =
-+MESA_GLX_LIBS = -lGL -lGLU -lX11
-
-
- #
++++ tachyon/unix/Make-opengl 2006-11-29 19:51:01.000000000 +0100
@@ -37,8 +37,8 @@
#
# Linux OpenGL / GLX include and link specs
#
-LINUX_GLX_INCS = -I/usr/X11R6/include
-LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11
-+LINUX_GLX_INCS =
-+LINUX_GLX_LIBS = -lGL -lGLU -lX11
++LINUX_GLX_INCS = -I/usr/X11R6/include
++LINUX_GLX_LIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lGL -lGLU -lX11
#
Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/EL-4/tachyon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tachyon.spec 7 Jul 2007 22:41:23 -0000 1.4
+++ tachyon.spec 14 Jul 2007 13:25:59 -0000 1.5
@@ -7,21 +7,18 @@
%ifarch ppc
%define target linux-ppc
%endif
-%ifarch sparc
-%define target linux-sparc
-%endif
Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
-Version: 0.98
-Release: 0.1%{?dist}
+Version: 0.97
+Release: 5%{?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
+Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
Patch0: %{name}-rpm.patch
License: BSD
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: mesa-libGLU-devel
+BuildRequires: xorg-x11-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: lam-devel
@@ -142,8 +139,9 @@
%{_datadir}/tachyon
%changelog
-* Sat Jul 07 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.1
-- update to 0.98 pre-release
+* Sat Jul 14 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-5
+- port to EL-4 branch
+- drop SPARC support
* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-4
- fix copy&paste error in patch
More information about the scm-commits
mailing list