| 1 |
jlec 15/03/06 08:01:42 |
| 2 |
|
| 3 |
Added: tachyon-0.99_beta6-shared.patch |
| 4 |
tachyon-0.99_beta6-ldflags.patch |
| 5 |
Log: |
| 6 |
Version BUmp |
| 7 |
|
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: tachyon-0.99_beta6-shared.patch |
| 17 |
=================================================================== |
| 18 |
diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile |
| 19 |
--- tachyon/unix/Makefile.shared 2011-02-07 16:14:38.000000000 +0100 |
| 20 |
+++ tachyon/unix/Makefile 2011-07-23 20:23:51.000000000 +0200 |
| 21 |
@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon |
| 22 |
# |
| 23 |
# Name of raytracing library file to create |
| 24 |
# |
| 25 |
-RAYLIB=${ARCHDIR}/libtachyon.a |
| 26 |
+RAYLIB=${ARCHDIR}/libtachyon.so |
| 27 |
RAYLIBDIR=${ARCHDIR} |
| 28 |
|
| 29 |
# |
| 30 |
@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \ |
| 31 |
${OBJDIR}/tgafile.o \ |
| 32 |
${OBJDIR}/winbmp.o |
| 33 |
|
| 34 |
+VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2) |
| 35 |
+${RAYLIB} : DIRNAME=tachyon-${VERSION} |
| 36 |
${RAYLIB} : ${RAYOBJS} |
| 37 |
- rm -f ${RAYLIB} |
| 38 |
- ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS} |
| 39 |
- ${RANLIB} ${RAYLIB} |
| 40 |
+ ${CC} ${LDFLAGS} -shared -Wl,-soname,libtachyon.so.${VERSION} -o ${RAYLIBDIR}/libtachyon.so.${VERSION} ${CFLAGS} -fPIC ${RAYOBJS} ${PNGLIB} -lm -lpthread ${JPEGLIB} |
| 41 |
+ ln -s libtachyon.so.${VERSION} ${RAYLIBDIR}/libtachyon.so |
| 42 |
|
| 43 |
${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS} |
| 44 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o |
| 45 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o |
| 46 |
|
| 47 |
${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS} |
| 48 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o |
| 49 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o |
| 50 |
|
| 51 |
${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS} |
| 52 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o |
| 53 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o |
| 54 |
|
| 55 |
${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} |
| 56 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o |
| 57 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o |
| 58 |
|
| 59 |
${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h |
| 60 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o |
| 61 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o |
| 62 |
|
| 63 |
${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS} |
| 64 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o |
| 65 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o |
| 66 |
|
| 67 |
${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS} |
| 68 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o |
| 69 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o |
| 70 |
|
| 71 |
${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS} |
| 72 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o |
| 73 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o |
| 74 |
|
| 75 |
${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS} |
| 76 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o |
| 77 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o |
| 78 |
|
| 79 |
${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS} |
| 80 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o |
| 81 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o |
| 82 |
|
| 83 |
${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS} |
| 84 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o |
| 85 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o |
| 86 |
|
| 87 |
${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h |
| 88 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o |
| 89 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o |
| 90 |
|
| 91 |
${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS} |
| 92 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o |
| 93 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o |
| 94 |
|
| 95 |
${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS} |
| 96 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o |
| 97 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o |
| 98 |
|
| 99 |
${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS} |
| 100 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o |
| 101 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o |
| 102 |
|
| 103 |
${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS} |
| 104 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o |
| 105 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o |
| 106 |
|
| 107 |
${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS} |
| 108 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o |
| 109 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o |
| 110 |
|
| 111 |
${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS} |
| 112 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o |
| 113 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o |
| 114 |
|
| 115 |
${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS} |
| 116 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o |
| 117 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o |
| 118 |
|
| 119 |
${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS} |
| 120 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o |
| 121 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o |
| 122 |
|
| 123 |
${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS} |
| 124 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o |
| 125 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o |
| 126 |
|
| 127 |
${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h |
| 128 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o |
| 129 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o |
| 130 |
|
| 131 |
${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS} |
| 132 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o |
| 133 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o |
| 134 |
|
| 135 |
${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS} |
| 136 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o |
| 137 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o |
| 138 |
|
| 139 |
${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS} |
| 140 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o |
| 141 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o |
| 142 |
|
| 143 |
${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS} |
| 144 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o |
| 145 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o |
| 146 |
|
| 147 |
${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS} |
| 148 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o |
| 149 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o |
| 150 |
|
| 151 |
${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS} |
| 152 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o |
| 153 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o |
| 154 |
|
| 155 |
${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS} |
| 156 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o |
| 157 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o |
| 158 |
|
| 159 |
${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS} |
| 160 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o |
| 161 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o |
| 162 |
|
| 163 |
${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS} |
| 164 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o |
| 165 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o |
| 166 |
|
| 167 |
${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h |
| 168 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o |
| 169 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o |
| 170 |
|
| 171 |
${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS} |
| 172 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o |
| 173 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o |
| 174 |
|
| 175 |
${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS} |
| 176 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o |
| 177 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o |
| 178 |
|
| 179 |
${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS} |
| 180 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o |
| 181 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o |
| 182 |
|
| 183 |
${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS} |
| 184 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o |
| 185 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o |
| 186 |
|
| 187 |
${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS} |
| 188 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o |
| 189 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o |
| 190 |
|
| 191 |
${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h |
| 192 |
- ${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o |
| 193 |
+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o |
| 194 |
|
| 195 |
clean : |
| 196 |
@echo "Cleaning object files, binaries etc." |
| 197 |
|
| 198 |
|
| 199 |
|
| 200 |
1.1 media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch |
| 201 |
|
| 202 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch?rev=1.1&view=markup |
| 203 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch?rev=1.1&content-type=text/plain |
| 204 |
|
| 205 |
Index: tachyon-0.99_beta6-ldflags.patch |
| 206 |
=================================================================== |
| 207 |
diff --git a/unix/Makefile b/unix/Makefile |
| 208 |
index 8dd0846..d2fe1ac 100644 |
| 209 |
--- a/unix/Makefile |
| 210 |
+++ b/unix/Makefile |
| 211 |
@@ -121,7 +121,7 @@ ${MGFLIB} : ../libmgf/Makefile |
| 212 |
}; |
| 213 |
|
| 214 |
${ARCHDIR}/tachyon : ${RAYLIB} ${PARSELIB} ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} |
| 215 |
- ${CC} ${CFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS} |
| 216 |
+ ${CC} ${CFLAGS} ${LDFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS} |
| 217 |
${STRIP} ${ARCHDIR}/tachyon |
| 218 |
|
| 219 |
${ARCHDIR}/animray : ${RAYLIB} ${OBJDIR}/mainanim.o |
Archives