diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-15 16:22:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-15 16:22:13 +0000 |
| commit | 2d8ecd28c2b78a24be103eff5a3237cb058fbade (patch) | |
| tree | 5ba65ec62c217495e73627f18edd8bf25731882d /media-gfx/povray/files | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-2d8ecd28c2b78a24be103eff5a3237cb058fbade.tar.gz gentoo-2-2d8ecd28c2b78a24be103eff5a3237cb058fbade.tar.bz2 gentoo-2-2d8ecd28c2b78a24be103eff5a3237cb058fbade.zip | |
Backport libpng14 patch to stable 3.6.1 release.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/povray/files')
3 files changed, 20 insertions, 43 deletions
diff --git a/media-gfx/povray/files/povray-3.6.1-libpng14.patch b/media-gfx/povray/files/povray-3.6.1-libpng14.patch new file mode 100644 index 000000000000..250927f183eb --- /dev/null +++ b/media-gfx/povray/files/povray-3.6.1-libpng14.patch @@ -0,0 +1,20 @@ +--- source/png_pov.cpp ++++ source/png_pov.cpp +@@ -1428,7 +1428,7 @@ + if(r_info_ptr->valid & PNG_INFO_tRNS) + { + for (index = 0; index < r_info_ptr->num_trans; index++) +- cmap[index].Transmit = 255 - r_info_ptr->trans[index]; ++ cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index]; + } + + Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image"); +@@ -1461,7 +1461,7 @@ + if(r_info_ptr->valid & PNG_INFO_tRNS) + { + for (index = 0; index < r_info_ptr->num_trans; index++) +- cmap[index].Transmit = 255 - r_info_ptr->trans[index]; ++ cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index]; + } + + Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image"); diff --git a/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch b/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch deleted file mode 100644 index 2da0056750b5..000000000000 --- a/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- vfe/vfe.cpp 2008-09-06 00:14:57.000000000 +0200 -+++ vfe/vfe.cpp 2009-01-16 12:48:13.646808534 +0100 -@@ -747,9 +747,9 @@ - - // this code may not be removed or modified unless the compilation is for personal - // use and the binary is not distributed to anyone else. -- xtime_get(&t, TIME_UTC); -- if (t.sec > 1230760800) -- throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application."); -+ // xtime_get(&t, TIME_UTC); -+ // if (t.sec > 1230760800) -+ // throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application."); - - state = kStarting; - diff --git a/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch deleted file mode 100644 index 80a382ad672c..000000000000 --- a/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- vfe/unix/unixconsole.cpp~ 2008-10-07 17:06:27.000000000 -0600 -+++ vfe/unix/unixconsole.cpp 2008-11-08 14:11:58.000000000 -0700 -@@ -281,10 +281,21 @@ - - if (user_code != current_code) - { -- fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n", -- PACKAGE, -- current_week < 52 ? "has expired" : "is over twelve months old and is no longer usable" -- ); -+ if (current_week < 52) -+ { -+ fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n", -+ PACKAGE, -+ "has expired" -+ ); -+ fprintf(stderr, "\nTo extend the license period (a week at a time), you can do\nsomething like the following (adjust syntax for your shell):\n\n export POVRAY_BETA=`povray --betacode 2>&1`\n\n"); -+ } -+ else -+ { -+ fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n", -+ PACKAGE, -+ "is over twelve months old and is no longer usable" -+ ); -+ } - exit(RETURN_ERROR); - } - current_time = EXPIRE_AT + (current_week+1)*spw - current_time; |