diff options
author | Daniel Goller <morfic@gentoo.org> | 2005-01-20 06:11:53 +0000 |
---|---|---|
committer | Daniel Goller <morfic@gentoo.org> | 2005-01-20 06:11:53 +0000 |
commit | f0b599d9fa909b5962340657065b3fe70e4c42d3 (patch) | |
tree | 75032960f1953dedc21a53924c2ca4e3b2518890 /media-gfx/povray/files | |
parent | version bump; clean older versions (Manifest recommit) (diff) | |
download | gentoo-2-f0b599d9fa909b5962340657065b3fe70e4c42d3.tar.gz gentoo-2-f0b599d9fa909b5962340657065b3fe70e4c42d3.tar.bz2 gentoo-2-f0b599d9fa909b5962340657065b3fe70e4c42d3.zip |
remove old+broken version
Diffstat (limited to 'media-gfx/povray/files')
-rw-r--r-- | media-gfx/povray/files/README.ICC-PGO | 44 | ||||
-rw-r--r-- | media-gfx/povray/files/digest-povray-3.1g-r5 | 2 | ||||
-rw-r--r-- | media-gfx/povray/files/digest-povray-3.5 | 1 | ||||
-rw-r--r-- | media-gfx/povray/files/gentoo-3.5.patch | 12 | ||||
-rw-r--r-- | media-gfx/povray/files/gentoo.patch | 37 | ||||
-rw-r--r-- | media-gfx/povray/files/povray-3.5-amd64.patch | 444 | ||||
-rw-r--r-- | media-gfx/povray/files/prob-opt.sh | 78 |
7 files changed, 0 insertions, 618 deletions
diff --git a/media-gfx/povray/files/README.ICC-PGO b/media-gfx/povray/files/README.ICC-PGO deleted file mode 100644 index 9e463f010b1e..000000000000 --- a/media-gfx/povray/files/README.ICC-PGO +++ /dev/null @@ -1,44 +0,0 @@ - -Created an attachment (id=566) -povray-3.1g-r4 icc pgo data I collected. - -This is the PGO profiles I collected to benchmark povray. I have a Pentium II -cpu and made these with CFLAGS optimal for my box but I'm pretty sure I read -that these files will work with most any CFLAGS variation. I haven't tested -these on other CPUs. If it breaks, sorry, you'll have to generate the profile -data yourself. - -To use these download the tarball. -First make sure you have the povray-3.1g-r4 ebuild an related files from above. - -Then cd into /var/tmp/portage/povray-3.1g-r4 -(You will need to mkdir this if you haven't merged this povray pacakge version -before.) -Then run `tar xpzf /path/to/povray-3.1g-r4-icc-pgo.tar.gz` -(make sure you use the p with tar, the icc-pgo directory needs to be world -writeable if you want non-root users to be able to generate profile data.) -then run `USE="icc icc-pgo" emerge povray` to get a brand spanking new povray -tweaked to the teeth. (You can put that USE stuff in your /etc/make.conf too -but I wouldn't until it is agreed on how icc will be used in ebuilds.) - -If the resulting povray doesn't work and you want to take the time to generate -profile data, then delete the icc-pgo dir and use the same emerge line, run -povray some, and then use the same emerge line again.) I used the following -script-on-the-command-line to generate some profiles. - -for x in /usr/lib/povray31/scenes/advanced/*.pov ; do nice povray +W160 +H120 --I - $x +A0.2 +AM2 +J0.1 +R3 +V -O `basename $x`.png ; done - - To get an accurate profile you'll want to run that a few times with different - parameters (between the "$x" and "-O") else your profiles won't be very - complete. - - - # tar tzf povray-3.1g-r4-icc-pgo.tar.gz - icc-pgo/ - icc-pgo/3cba06a9.dyn - icc-pgo/3cba06b8.dyn - icc-pgo/3cba06cc.dyn - ..... etc (32 files) .... - diff --git a/media-gfx/povray/files/digest-povray-3.1g-r5 b/media-gfx/povray/files/digest-povray-3.1g-r5 deleted file mode 100644 index 8288b61ec282..000000000000 --- a/media-gfx/povray/files/digest-povray-3.1g-r5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6da91fb1d3d48cd44f46b831760d233f povuni_s_3.1.tgz 946513 -MD5 dff3b8f3bc2a6dd131a9d008d0f46295 povuni_d_3.1.tgz 913748 diff --git a/media-gfx/povray/files/digest-povray-3.5 b/media-gfx/povray/files/digest-povray-3.5 deleted file mode 100644 index b3ba13b97cae..000000000000 --- a/media-gfx/povray/files/digest-povray-3.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 bac59e7a86172a5bd0c63af2516e7045 povuni_s.tgz 6602380 diff --git a/media-gfx/povray/files/gentoo-3.5.patch b/media-gfx/povray/files/gentoo-3.5.patch deleted file mode 100644 index 384a1dab304b..000000000000 --- a/media-gfx/povray/files/gentoo-3.5.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/config.orig Fri Aug 2 10:34:25 2002 -+++ src/config.h Fri Aug 2 10:34:46 2002 -@@ -234,6 +234,9 @@ - - static uid_t euid; - -+using std::max; -+using std::min; -+ - /* - * These handle the parsing of the usual X Windows command-line args. - */ diff --git a/media-gfx/povray/files/gentoo.patch b/media-gfx/povray/files/gentoo.patch deleted file mode 100644 index c8f9448dba55..000000000000 --- a/media-gfx/povray/files/gentoo.patch +++ /dev/null @@ -1,37 +0,0 @@ -Only in povray31-gentoo/source/unix: config.h -diff -urw povray31/source/unix/makefile povray31-gentoo/source/unix/makefile ---- povray31/source/unix/makefile Mon Nov 22 02:12:37 1999 -+++ povray31-gentoo/source/unix/makefile Sun Mar 10 03:40:42 2002 -@@ -53,7 +53,7 @@ - #CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) - - # Linux compiler flags, Pentium II optimized --CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) -+CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -march=i686 -mcpu=i686 -funroll-loops -frerun-cse-after-loop -frerun-loop-opt -malign-functions=4 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) - - # HPUX compiler flags - #CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) -@@ -129,12 +129,12 @@ - #default: svga - - # Define the default POV-Ray library location --POVLIBDIR = /usr/local/lib/povray31 -+POVLIBDIR = $(DESTDIR)/usr/lib/povray31 - - # Define the path under which you want POV-Ray files to be installed, - # typically /usr/local/bin, though Linux distributions may wish to - # alter this to /usr/bin --POVPATH = /usr/local -+POVPATH = $(DESTDIR)/usr - - #---------------------------------------------------------------------- - # There should be no compelling reason to customize the makefile beyond -@@ -1591,7 +1591,7 @@ - -@$(RM) $(ODIR)/svga$(OBJ) $(UTARGET) $(XTARGET) $(STARGET) - - install: -- -@cp povray.1 $(POVPATH)/man/man1 -+ -@cp povray.1 $(POVPATH)/share/man/man1 - -@if \ - [ -x $(UTARGET) ]; \ - then \ diff --git a/media-gfx/povray/files/povray-3.5-amd64.patch b/media-gfx/povray/files/povray-3.5-amd64.patch deleted file mode 100644 index 684390c75620..000000000000 --- a/media-gfx/povray/files/povray-3.5-amd64.patch +++ /dev/null @@ -1,444 +0,0 @@ -diff -ur povray-3.50c/src/bbox.cpp povray-3.50c-amd64/src/bbox.cpp ---- povray-3.50c/src/bbox.cpp 2003-01-06 20:08:26.000000000 -0500 -+++ povray-3.50c-amd64/src/bbox.cpp 2003-11-19 01:10:02.648820136 -0500 -@@ -1869,7 +1869,7 @@ - { - /* Prim array overrun, increase array by 50%. */ - -- maxfinitecount = 1.5 * maxfinitecount; -+ maxfinitecount = (long) (1.5 * maxfinitecount); - - /* For debugging only. */ - -diff -ur povray-3.50c/src/bsphere.cpp povray-3.50c-amd64/src/bsphere.cpp ---- povray-3.50c/src/bsphere.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/bsphere.cpp 2003-11-19 01:10:41.131969808 -0500 -@@ -513,7 +513,7 @@ - { - /* Prim array overrun, increase array by 50%. */ - -- maxelements = 1.5 * maxelements; -+ maxelements = (int) (1.5 * maxelements); - - /* For debugging only. */ - -diff -ur povray-3.50c/src/chi2.cpp povray-3.50c-amd64/src/chi2.cpp ---- povray-3.50c/src/chi2.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/chi2.cpp 2003-11-19 01:11:08.342833128 -0500 -@@ -344,7 +344,7 @@ - goto loverf; - } - -- i = p; -+ i = (int)p; - - if ((i & 1) == 0) - { -diff -ur povray-3.50c/src/express.cpp povray-3.50c-amd64/src/express.cpp ---- povray-3.50c/src/express.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/express.cpp 2003-11-19 01:11:37.258437288 -0500 -@@ -1020,7 +1020,7 @@ - GET(ARRAY_ID_TOKEN) - Parse_Comma(); - a = (POV_ARRAY *)(*(Token.DataPtr)); -- i = (int)Parse_Float()-1.0; -+ i = (int)(Parse_Float()-1.0); - if ((i < 0) || (i > a->Dims)) - Val = 0.0; - else -diff -ur povray-3.50c/src/fncode.cpp povray-3.50c-amd64/src/fncode.cpp ---- povray-3.50c/src/fncode.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/fncode.cpp 2003-11-19 01:12:13.384945224 -0500 -@@ -1869,11 +1869,11 @@ - } - - if(had_x == false) -- compile_instruction(OPCODE_LOADI, 0, 2, 0.0); -+ compile_instruction(OPCODE_LOADI, 0, 2, 0); - if(had_y == false) -- compile_instruction(OPCODE_LOADI, 0, 3, 0.0); -+ compile_instruction(OPCODE_LOADI, 0, 3, 0); - if(had_z == false) -- compile_instruction(OPCODE_LOADI, 0, 4, 0.0); -+ compile_instruction(OPCODE_LOADI, 0, 4, 0); - } - - -diff -ur povray-3.50c/src/fnintern.cpp povray-3.50c-amd64/src/fnintern.cpp ---- povray-3.50c/src/fnintern.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/fnintern.cpp 2003-11-19 10:46:33.619193328 -0500 -@@ -638,13 +638,13 @@ - V1[Y]=PARAM_Y; - V1[Z]=PARAM_Z; - TPATTERN TPat; -- int Tmp = PARAM(5); -+ int Tmp = (int)PARAM(5); - - TPat.Flags = (Tmp & 3) << 4; - - if (f->private_data == NULL) - { -- ea =(DBL *)POV_MALLOC((PARAM(2) + 1)*sizeof(DBL), "exponent array"); -+ ea =(DBL *)POV_MALLOC((long)(PARAM(2) + 1)*sizeof(DBL), "exponent array"); - freq = 1.0; - for (i=0; i<=PARAM(2);i++) - { -@@ -953,7 +953,7 @@ - VECTOR temp; - int Octaves; - TPATTERN TPat; -- int Tmp = PARAM(5); -+ int Tmp = (int)PARAM(5); - - TPat.Flags = (Tmp & 3) << 4; - -@@ -997,7 +997,7 @@ - int i; - VECTOR V1; - TPATTERN TPat; -- int Tmp = PARAM(5); -+ int Tmp = (int)PARAM(5); - - TPat.Flags = (Tmp & 3) << 4; - -@@ -1006,7 +1006,7 @@ - V1[Z]=PARAM_Z; - if (f->private_data == NULL) - { -- ea = (DBL*)POV_MALLOC((PARAM(2) + 1)*sizeof(DBL), "exponent array"); -+ ea = (DBL*)POV_MALLOC((long)(PARAM(2) + 1)*sizeof(DBL), "exponent array"); - freq = 1.0; - for (i=0; i<=PARAM(2);i++) - { -@@ -1221,7 +1221,7 @@ - { - VECTOR Vec = { PARAM_X, PARAM_Y, PARAM_Z }; - TPATTERN TPat; -- int Tmp = PARAM(0); -+ int Tmp = (int)PARAM(0); - - TPat.Flags = (Tmp & 3) << 4; - -diff -ur povray-3.50c/src/frame.h povray-3.50c-amd64/src/frame.h ---- povray-3.50c/src/frame.h 2003-01-06 20:08:30.000000000 -0500 -+++ povray-3.50c-amd64/src/frame.h 2003-11-19 11:38:51.368182976 -0500 -@@ -49,7 +49,9 @@ - typedef unsigned char u_int8 ; - typedef unsigned char byte ; - --typedef signed long int32 ; -+// removed because of conflict with tiff.h -+// typedef signed long int32 ; -+typedef signed int int32 ; - typedef signed short int16 ; - typedef signed char int8 ; - -diff -ur povray-3.50c/src/hfield.cpp povray-3.50c-amd64/src/hfield.cpp ---- povray-3.50c/src/hfield.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/hfield.cpp 2003-11-19 10:48:10.641443704 -0500 -@@ -1706,8 +1706,8 @@ - x0 = px - floor(px); - z0 = pz - floor(pz); - -- signx = sign(dx); -- signz = sign(dz); -+ signx = (int)sign(dx); -+ signz = (int)sign(dz); - - /* Get initial error. */ - -@@ -1837,8 +1837,8 @@ - x0 = px - floor(px); - z0 = pz - floor(pz); - -- signx = sign(dx); -- signz = sign(dz); -+ signx = (int)sign(dx); -+ signz = (int)sign(dz); - - /* Get initial error. */ - -@@ -2064,8 +2064,8 @@ - dx_zero = (fabs(dx) < EPSILON); - dz_zero = (fabs(dz) < EPSILON); - -- signx = sign(dx); -- signz = sign(dz); -+ signx = (int)sign(dx); -+ signz = (int)sign(dz); - - /* Walk on the block grid. */ - -diff -ur povray-3.50c/src/image.cpp povray-3.50c-amd64/src/image.cpp ---- povray-3.50c/src/image.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/image.cpp 2003-11-19 10:48:42.546593384 -0500 -@@ -537,7 +537,7 @@ - temp2 = Image->data.gray16_lines[y][x]; - else - { -- temp2 = GREY_SCALE3( -+ temp2 = (int)GREY_SCALE3( - Image->data.rgb16_lines[y].red[x], - Image->data.rgb16_lines[y].green[x], - Image->data.rgb16_lines[y].blue[x] -diff -ur povray-3.50c/src/lightgrp.cpp povray-3.50c-amd64/src/lightgrp.cpp ---- povray-3.50c/src/lightgrp.cpp 2003-01-06 20:08:27.000000000 -0500 -+++ povray-3.50c-amd64/src/lightgrp.cpp 2003-11-19 10:49:18.417140232 -0500 -@@ -267,4 +267,5 @@ - } - return false; - } --} -\ No newline at end of file -+} -+ -diff -ur povray-3.50c/src/parse.cpp povray-3.50c-amd64/src/parse.cpp ---- povray-3.50c/src/parse.cpp 2003-01-06 20:08:28.000000000 -0500 -+++ povray-3.50c-amd64/src/parse.cpp 2003-11-19 10:59:50.048117728 -0500 -@@ -1669,7 +1669,7 @@ - END_CASE - - CASE (BLUR_SAMPLES_TOKEN) -- New->Blur_Samples = Parse_Float(); -+ New->Blur_Samples = (int)Parse_Float(); - if (New->Blur_Samples <= 0) - Error("Illegal number of focal blur samples."); - END_CASE -@@ -1797,7 +1797,7 @@ - END_CASE - - CASE (BLUR_SAMPLES_TOKEN) -- New->Blur_Samples = Parse_Float(); -+ New->Blur_Samples = (int)Parse_Float(); - if (New->Blur_Samples <= 0) - Error("Illegal number of focal blur samples."); - END_CASE -@@ -3829,7 +3829,7 @@ - Parse_Begin(); - - /* number faces is mandatory, so we ask how many there are */ -- number_of_triangles = Parse_Float(); Parse_Comma(); -+ number_of_triangles = (int)Parse_Float(); Parse_Comma(); - - if (number_of_triangles == 0) - { -@@ -3870,7 +3870,7 @@ - /* look for a texture index */ - EXPECT - CASE_FLOAT -- Triangles[i].Texture = Parse_Float(); Parse_Comma(); -+ Triangles[i].Texture = (int)Parse_Float(); Parse_Comma(); - if (Triangles[i].Texture >= number_of_textures || - Triangles[i].Texture < 0) - Error("Texture index out of range in mesh2."); -@@ -3887,7 +3887,7 @@ - /* look for a texture index */ - EXPECT - CASE_FLOAT -- Triangles[i].Texture2 = Parse_Float(); Parse_Comma(); -+ Triangles[i].Texture2 = (int)Parse_Float(); Parse_Comma(); - if (Triangles[i].Texture2 >= number_of_textures || - Triangles[i].Texture2 < 0) - Error("Texture index out of range in mesh2."); -@@ -3903,7 +3903,7 @@ - /* look for a texture index */ - EXPECT - CASE_FLOAT -- Triangles[i].Texture3 = Parse_Float(); Parse_Comma(); -+ Triangles[i].Texture3 = (int)Parse_Float(); Parse_Comma(); - if (Triangles[i].Texture3 >= number_of_textures || - Triangles[i].Texture3 < 0) - Error("Texture index out of range in mesh2."); -@@ -3987,7 +3987,7 @@ - if (Parse_Float() != number_of_triangles) - Error("Number of normal indices must equal number of faces."); - */ -- number_of_normal_indices = Parse_Float(); -+ number_of_normal_indices = (int)Parse_Float(); - if (number_of_normal_indices > number_of_triangles) - Error("Number of normal indices cannot be more than the number of faces."); - -@@ -4401,7 +4401,7 @@ - END_CASE - - CASE(PRECOMPUTE_TOKEN) -- PrecompDepth= Parse_Float(); -+ PrecompDepth= (int)Parse_Float(); - Parse_Comma(); - - EXPECT -@@ -6319,7 +6319,7 @@ - - CASE (EXPAND_THRESHOLDS_TOKEN) - photonOptions.expandTolerance = Parse_Float(); Parse_Comma(); -- photonOptions.minExpandCount = Parse_Float(); -+ photonOptions.minExpandCount = (int)Parse_Float(); - if (photonOptions.expandTolerance<0.0) - { - Warning(100,"The first parameter of expand_thresholds must be greater than or equal to 0.\nSetting it to 0 now."); -@@ -6355,7 +6355,7 @@ - END_CASE - - CASE (MAX_TRACE_LEVEL_TOKEN) -- photonOptions.Max_Trace_Level = Parse_Float(); -+ photonOptions.Max_Trace_Level = (int)Parse_Float(); - END_CASE - - CASE(LOAD_FILE_TOKEN) -diff -ur povray-3.50c/src/parsestr.cpp povray-3.50c-amd64/src/parsestr.cpp ---- povray-3.50c/src/parsestr.cpp 2003-01-06 20:08:28.000000000 -0500 -+++ povray-3.50c-amd64/src/parsestr.cpp 2003-11-19 11:04:57.434387912 -0500 -@@ -1060,7 +1060,7 @@ - - while(true) - { -- if (((int) *str < 0) || (*str > 127)) -+ if ((int) *str > 127) - err = true; - else if(*str == 0) - break; -@@ -1098,7 +1098,7 @@ - - while(true) - { -- if (((int) *str < 0) || (*str > 127)) -+ if ((int) *str > 127) - err = true; - else if(*str == 0) - break; -diff -ur povray-3.50c/src/parstxtr.cpp povray-3.50c-amd64/src/parstxtr.cpp ---- povray-3.50c/src/parstxtr.cpp 2003-01-06 20:08:28.000000000 -0500 -+++ povray-3.50c-amd64/src/parstxtr.cpp 2003-11-19 11:25:55.745095608 -0500 -@@ -132,8 +132,8 @@ - unsigned short *gray16_line; - VECTOR Point; - -- Image->iwidth = Image->width; -- Image->iheight = Image->height; -+ Image->iwidth = (int)Image->width; -+ Image->iheight = (int)Image->height; - Image->width--; - Image->height--; - Image->Colour_Map_Size = 0; -@@ -159,7 +159,7 @@ - POVFPU_SetLocal(Y, Point[Y]); - POVFPU_SetLocal(Z, Point[Z]); - -- gray16_line[j] = 65535.0 * POVFPU_Run(*fn); -+ gray16_line[j] = (unsigned short)(65535.0 * POVFPU_Run(*fn)); - } - } - } -@@ -189,10 +189,10 @@ - - (void)POVFPU_Run(*fn); - -- rgb16_line->red[j] = 65535.0 * POVFPU_GetLocal(pRED); -- rgb16_line->green[j] = 65535.0 * POVFPU_GetLocal(pGREEN); -- rgb16_line->blue[j] = 65535.0 * POVFPU_GetLocal(pBLUE); -- rgb16_line->transm[j] = 65535.0 * POVFPU_GetLocal(pTRANSM); -+ rgb16_line->red[j] = (unsigned short)(65535.0 * POVFPU_GetLocal(pRED)); -+ rgb16_line->green[j] = (unsigned short)(65535.0 * POVFPU_GetLocal(pGREEN)); -+ rgb16_line->blue[j] = (unsigned short)(65535.0 * POVFPU_GetLocal(pBLUE)); -+ rgb16_line->transm[j] = (unsigned short)(65535.0 * POVFPU_GetLocal(pTRANSM)); - } - } - } -diff -ur povray-3.50c/src/povray.cpp povray-3.50c-amd64/src/povray.cpp ---- povray-3.50c/src/povray.cpp 2003-01-06 20:08:29.000000000 -0500 -+++ povray-3.50c-amd64/src/povray.cpp 2003-11-19 11:28:18.792349120 -0500 -@@ -1444,7 +1444,7 @@ - - if (opts.FrameSeq.SubsetStartPercent != DBL_VALUE_UNSET) - { -- FrameIncr = FrameDiff * opts.FrameSeq.SubsetStartPercent + 0.5; /* w/rounding */ -+ FrameIncr = (int)(FrameDiff * opts.FrameSeq.SubsetStartPercent + 0.5); /* w/rounding */ - - opts.FrameSeq.SubsetStartFrame = opts.FrameSeq.InitialFrame + FrameIncr; - } -@@ -1466,7 +1466,7 @@ - * it via FinalFrame-FrameDiff - */ - -- FrameIncr = FrameDiff * opts.FrameSeq.SubsetEndPercent + 0.5; /* w/rounding */ -+ FrameIncr = (int)(FrameDiff * opts.FrameSeq.SubsetEndPercent + 0.5); /* w/rounding */ - - opts.FrameSeq.SubsetEndFrame = (opts.FrameSeq.FinalFrame - FrameDiff) + FrameIncr; - } -diff -ur povray-3.50c/src/ppm.cpp povray-3.50c-amd64/src/ppm.cpp ---- povray-3.50c/src/ppm.cpp 2003-01-06 20:08:29.000000000 -0500 -+++ povray-3.50c-amd64/src/ppm.cpp 2003-11-19 11:29:02.923640144 -0500 -@@ -282,9 +282,9 @@ - { - if (opts.Options & HF_GRAY_16) /* 16 bit grayscale output */ - { -- gray = ((0.30 * line_data[x][pRED]) + -+ gray = (unsigned int)(((0.30 * line_data[x][pRED]) + - (0.59 * line_data[x][pGREEN]) + -- (0.11 * line_data[x][pBLUE])) * 65535; -+ (0.11 * line_data[x][pBLUE])) * 65535); - - out_file->Write_Byte((gray >> 8) & 0xFF); - if (!out_file->Write_Byte(gray & 0xFF)) -diff -ur povray-3.50c/src/render.cpp povray-3.50c-amd64/src/render.cpp ---- povray-3.50c/src/render.cpp 2003-01-06 20:08:29.000000000 -0500 -+++ povray-3.50c-amd64/src/render.cpp 2003-11-19 11:31:57.572089544 -0500 -@@ -980,8 +980,8 @@ - else - { - /* lets use some percentages instead of the INI options!! */ -- StartPixelSize = max(Frame.Screen_Height,Frame.Screen_Width)*opts.radPretraceStart; -- EndPixelSize = max(Frame.Screen_Height,Frame.Screen_Width)*opts.radPretraceEnd; -+ StartPixelSize = (int)(max(Frame.Screen_Height,Frame.Screen_Width)*opts.radPretraceStart); -+ EndPixelSize = (int)(max(Frame.Screen_Height,Frame.Screen_Width)*opts.radPretraceEnd); - } - } - -diff -ur povray-3.50c/src/statspov.cpp povray-3.50c-amd64/src/statspov.cpp ---- povray-3.50c/src/statspov.cpp 2003-01-06 20:08:29.000000000 -0500 -+++ povray-3.50c-amd64/src/statspov.cpp 2003-11-19 11:32:31.295962736 -0500 -@@ -452,7 +452,7 @@ - SPLIT_TIME(time_dif, &hrs, &mins, &secs); - - Status_Info("%3ld:%02ld:%02ld ", hrs, mins, (long)secs); -- Send_RenderTime(0, 0, time_dif); -+ Send_RenderTime(0, 0, (int)time_dif); - Send_RenderStatus("Rendering"); - } - else -diff -ur povray-3.50c/src/targa.cpp povray-3.50c-amd64/src/targa.cpp ---- povray-3.50c/src/targa.cpp 2003-01-06 20:08:29.000000000 -0500 -+++ povray-3.50c-amd64/src/targa.cpp 2003-11-19 11:33:02.219261680 -0500 -@@ -368,7 +368,7 @@ - if (opts.Options & HF_GRAY_16) - { - /* Ouput heightfield in POV red/green format */ -- gray = ((0.30 * r) + (0.59 * g) + (0.11 * b)) * 65535; -+ gray = (unsigned int)(((0.30 * r) + (0.59 * g) + (0.11 * b)) * 65535); - - out_file->Write_Byte(0); - out_file->Write_Byte(gray & 0xFF); -diff -ur povray-3.50c/src/truetype.cpp povray-3.50c-amd64/src/truetype.cpp ---- povray-3.50c/src/truetype.cpp 2003-01-06 20:08:29.000000000 -0500 -+++ povray-3.50c-amd64/src/truetype.cpp 2003-11-19 11:39:50.407207680 -0500 -@@ -2340,16 +2340,16 @@ - #endif - - if (ttglyph->x[i + n] < ttglyph->header.xMin) -- ttglyph->header.xMin = ttglyph->x[i + n]; -+ ttglyph->header.xMin = (short)ttglyph->x[i + n]; - - if (ttglyph->x[i + n] > ttglyph->header.xMax) -- ttglyph->header.xMax = ttglyph->x[i + n]; -+ ttglyph->header.xMax = (short)ttglyph->x[i + n]; - - if (ttglyph->y[i + n] < ttglyph->header.yMin) -- ttglyph->header.yMin = ttglyph->y[i + n]; -+ ttglyph->header.yMin = (short)ttglyph->y[i + n]; - - if (ttglyph->y[i + n] > ttglyph->header.yMax) -- ttglyph->header.yMax = ttglyph->y[i + n]; -+ ttglyph->header.yMax = (short)ttglyph->y[i + n]; - } - - /* Free up the sub glyph outline information */ diff --git a/media-gfx/povray/files/prob-opt.sh b/media-gfx/povray/files/prob-opt.sh deleted file mode 100644 index 0380da3a8643..000000000000 --- a/media-gfx/povray/files/prob-opt.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -# Script from Klaus-J. Wolf <yanestra@web.de> - -# Please read through this script and understand it before using it. -# IF YOU DON'T UNDERSTAND IT, DON'T USE IT. -# There are a few things you'll probably want to change - pay attention. -# IMPORTANT: This will overwrite your Portage installation of POV-Ray. - -# Notes from Klaus-J. Wolf in bug report #13400: -# "I have written a small script that does the lengthy work of -# probabilistical optimization of Povray (3.50c tested, with gcc-3.2.1). -# In case of an Athlon/600 I got a performance improvement of about 272% -# to the original settings (ICC gave slightly worse results), in case of -# an P4/2000, I got less improvement, but still better than ICC. -# The script uses all scene files of the original distribution (expected to be -# unpacked in the current directory) to create probabilistic profiles. Then it -# uses the profiles to recompile the source." - -# Change this: -NAME="Me" - -PREFIX=/usr - -cat <<EOF -Attention! -You need to: - -1. Have the Povray sources unpacked in the (current) local directory. - -2. Have the necessary library files installed in $PREFIX. - (By typing "make install-data" in the povray dir.) - -EOF -read -p "Press ENTER to continue. " -cd povray-3.50a || exit 9 - -INCLUDES="-I/usr/local/include -L/usr/local/lib -I/usr/X11R6/include -L/usr/X11R6/lib" -# Edit these to match your system: -MYCFLAGS="${INCLUDES} -Wno-multichar -O3 -ffast-math -march=i686 -mcpu=i686 -foptimize-sibling-calls -finline-functions -fexpensive-optimizations -funroll-loops -malign-double -minline-all-stringops -fomit-frame-pointer -mfpmath=sse -msse -msse2" - -MYCXXFLAGS="${MYCFLAGS}" -PHASE1="-fprofile-arcs" -PHASE2="-fbranch-probabilities" - -[ -f Makefile ] || ./configure --prefix=$PREFIX -for a in `find . -name Makefile` -do - [ -f $a~ ] || mv $a $a~ - sed "s&^CFLAGS = .*&CFLAGS = $MYCFLAGS $PHASE1&1" <$a~ | \ - sed "s&^CXXFLAGS = .*&CXXFLAGS = $MYCXXFLAGS $PHASE1&1" | - sed "s/^LIBS = \\(.*\\)/LIBS = \\1 -ljpeg -ltiff -lpng/1" >$a -done - -AUTHFILE="src/optout.h" -[ -f ${AUTHFILE}~ ] || mv $AUTHFILE ${AUTHFILE}~ -cat ${AUTHFILE}~ |grep -v '^#error' | \ - sed "s/FILL IN NAME HERE\\.*/${NAME}/1" \ - >$AUTHFILE - -make - -for a in `find scenes -name "*.pov"` -do - src/povray +H200 +W320 +O`basename $a .pov`.png +I$a +QR -D -V -done - -rm -f `find . -name "*.o" -type f` - -for a in `find . -name Makefile` -do - [ -f $a~ ] || mv $a $a~ - sed "s&^CFLAGS = .*&CFLAGS = $MYCFLAGS $PHASE2&1" <$a~ | \ - sed "s&^CXXFLAGS = .*&CXXFLAGS = $MYCXXFLAGS $PHASE2&1" | - sed "s/^LIBS = \\(.*\\)/LIBS = \\1 -ljpeg -ltiff -lpng/1" >$a -done - -make - |