rpms/tachyon/devel tachyon-rpm.patch, NONE, 1.1 tachyon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Thu Nov 30 11:53:22 UTC 2006
Author: rathann
Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8396/devel
Modified Files:
.cvsignore sources
Added Files:
tachyon-rpm.patch tachyon.spec
Log Message:
auto-import tachyon-0.97-2 on branch devel from tachyon-0.97-2.src.rpm
tachyon-rpm.patch:
--- NEW FILE tachyon-rpm.patch ---
--- tachyon/unix/Make-arch.r 2005-03-18 16:28:05.000000000 +0100
+++ tachyon/unix/Make-arch 2006-11-29 19:54:45.000000000 +0100
@@ -15,7 +15,7 @@
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC)
-MISCFLAGS=$(MISCDEFS) $(MISCINC)
+MISCFLAGS=$(MISCDEFS) $(MISCINC) $(OPTFLAGS)
MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
default:
@@ -915,7 +915,7 @@
"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -927,7 +927,7 @@
"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -936,10 +936,10 @@
$(MAKE) all \
"ARCH = linux-64-thr" \
"CC = gcc" \
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
@@ -1035,10 +1035,10 @@
$(MAKE) all \
"ARCH = linux-thr" \
"CC = gcc" \
- "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
@@ -1047,7 +1047,7 @@
$(MAKE) all \
"ARCH = linux-thr-ogl" \
"CC = cc" \
- "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = touch" \
@@ -1081,37 +1081,61 @@
linux-lam:
$(MAKE) all \
"ARCH = linux-lam" \
- "CC = hcc" \
- "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+ "CC = mpicc" \
+ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
+linux-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-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)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI
-linux-lam-64:
+linux-64-lam:
$(MAKE) all \
- "ARCH = linux-lam-64" \
- "CC = hcc" \
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+ "ARCH = linux-64-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI, with OpenGL display
-linux-lam-64-ogl:
+linux-64-lam-ogl:
$(MAKE) all \
- "ARCH = linux-lam-64-ogl" \
- "CC = hcc" \
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "ARCH = linux-64-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
+linux-64-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-64-thr-ogl" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
"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,54 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
+# Linux PPC using gcc and threads
+linux-ppc-thr:
+ $(MAKE) all \
+ "ARCH = linux-ppc-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 PPC using threads with OpenGL display
+linux-ppc-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc-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 AMD64/EM64T using LAM MPI
+linux-ppc-lam:
+ $(MAKE) all \
+ "ARCH = linux-ppc-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 AMD64/EM64T using LAM MPI, with OpenGL display
+linux-ppc-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc-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 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-11-29 19:51:01.000000000 +0100
@@ -57,7 +57,7 @@
##########################################################################
# Standard MPICH installation location
-MPIDIR=/usr/local/mpi
+MPIDIR=/usr
# UMR CS Dept
#MPIDIR=/software/all/mpi
@@ -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=
+JPEGLIB= -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= `pkg-config --cflags libpng`
+PNGLIB= `pkg-config --libs libpng`
##########################################################################
--- tachyon/unix/Make-opengl.r 2004-02-04 07:36:06.000000000 +0100
+++ tachyon/unix/Make-opengl 2006-11-29 19:51:01.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
#
@@ -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
#
--- NEW FILE tachyon.spec ---
%ifarch %{ix86}
%define target linux
%endif
%ifarch x86_64
%define target linux-64
%endif
%ifarch ppc
%define target linux-ppc
%endif
Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
Version: 0.97
Release: 2%{?dist}
URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
Group: Applications/Engineering
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: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: lam-devel
%description
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations. Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application. The distribution also includes a simple scene
file parser front-end which reads a few different formats.
This package contains pthread build.
%package gl
Summary: Parallel / Multiprocessor Ray Tracing System
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}
%description gl
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations. Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application. The distribution also includes a simple scene
file parser front-end which reads a few different formats.
This package contains pthread build with OpenGL display.
%package lam
Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}
%description lam
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations. Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application. The distribution also includes a simple scene
file parser front-end which reads a few different formats.
This package contains LAM build.
%package lam-gl
Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}
%description lam-gl
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations. Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application. The distribution also includes a simple scene
file parser front-end which reads a few different formats.
This package contains LAM build with OpenGL display.
%package docs
Summary: Documentation and example scenes for tachyon
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description docs
This package contains documentation and example scenes for rendering
with tachyon.
%prep
%setup -q -n %{name}
%patch0 -p1 -b .r
find . -name CVS | xargs %{__rm} -rf
chmod 644 src/hash.*
chmod 644 demosrc/trackball.c
chmod 644 scenes/imaps/*
%build
pushd unix
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr-ogl
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam-ogl
popd
%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
for variant in -thr -thr-ogl -lam -lam-ogl ; do
install -pm755 compile/%{target}$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon$variant
done
rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
%{__rm} docs/tachyon/images.idx
%{__mv} docs/tachyon docs/html
%{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}
%files gl
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-ogl
%files lam
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam
%files lam-gl
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam-ogl
%files docs
%defattr(644,root,root,755)
%doc docs/tachyon.pdf docs/tachyon.ps docs/html
%{_datadir}/tachyon
%changelog
* Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-2
- use only kosher CFLAGS
- fix target setting
* Tue Nov 28 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-1
- initial build
- patch to add necessary build targets
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Nov 2006 11:33:41 -0000 1.1
+++ .cvsignore 30 Nov 2006 11:52:52 -0000 1.2
@@ -0,0 +1 @@
+tachyon-0.97.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Nov 2006 11:33:41 -0000 1.1
+++ sources 30 Nov 2006 11:52:52 -0000 1.2
@@ -0,0 +1 @@
+198953aea283a7158eef2ee079e909f6 tachyon-0.97.tar.gz
More information about the scm-commits
mailing list