+++ /dev/null
-diff -dur povray-3.50c.orig/src/frame.h povray-3.50c/src/frame.h
---- povray-3.50c.orig/src/frame.h 2002-12-31 12:51:45.000000000 +0100
-+++ povray-3.50c/src/frame.h 2004-01-07 14:37:41.637836976 +0100
-@@ -55,12 +55,20 @@
- class pov_istream_class;
- class pov_ostream_class;
-
-+#if defined(__x86_64__) || defined(__alpha)
-+typedef unsigned u_int32 ;
-+#else
- typedef unsigned long u_int32 ;
-+#endif
- typedef unsigned short u_int16 ;
- typedef unsigned char u_int8 ;
- typedef unsigned char byte ;
-
-+#if defined(__x86_64__) || defined(__alpha)
-+typedef int int32 ;
-+#else
- typedef signed long int32 ;
-+#endif
- typedef signed short int16 ;
- typedef signed char int8 ;
-
-diff -dur povray-3.50c.orig/src/optin.cpp povray-3.50c/src/optin.cpp
---- povray-3.50c.orig/src/optin.cpp 2003-01-04 17:06:20.000000000 +0100
-+++ povray-3.50c/src/optin.cpp 2004-01-07 14:38:14.675814440 +0100
-@@ -436,7 +436,7 @@
-
- static bool matches(char *v1, char *v2);
-
--POV_ISTREAM *Opts_Locate_File(char *filename, unsigned long stype, char *buffer, int err_flag, POVMSObjectPtr obj);
-+POV_ISTREAM *Opts_Locate_File(char *filename, u_int32 stype, char *buffer, int err_flag, POVMSObjectPtr obj);
-
-
- /*****************************************************************************
-Only in povray-3.50c/src: optin.cpp~
+++ /dev/null
-diff -dur povray-3.50c.orig/configure.in povray-3.50c/configure.in
---- povray-3.50c.orig/configure.in 2002-12-31 19:22:43.000000000 +0100
-+++ povray-3.50c/configure.in 2004-01-07 14:47:04.730233920 +0100
-@@ -18,9 +18,6 @@
-
- AC_CHECK_LIB(m, sin)
- AC_CHECK_LIB(z, inflate)
--AC_CHECK_LIB(png, png_get_error_ptr)
--AC_CHECK_LIB(jpeg, jpeg_std_error)
--AC_CHECK_LIB(tiff, TIFFSetWarningHandler)
- AC_CHECK_LIB(vga, vga_init)
- AC_CHECK_LIB(vgagl, gl_setcontextvga)
- dnl look for ios, iostream, fstream
-@@ -30,7 +27,10 @@
- dnl Checks for header files.
- AC_PATH_XTRA
- dnl Now we can check for libX11
--AC_CHECK_LIB(X11, XFlush, LIBS="$LIBS -lX11", true, -L$x_libraries -lX11)
-+AC_CHECK_LIB(X11, XFlush, LIBS="$LIBS -L$x_libraries -lX11", true, -L$x_libraries -lX11)
-+AC_CHECK_LIB(png, png_get_error_ptr)
-+AC_CHECK_LIB(jpeg, jpeg_std_error)
-+AC_CHECK_LIB(tiff, TIFFSetWarningHandler)
- AC_HEADER_STDC
- AC_CHECK_HEADERS(limits.h sys/time.h unistd.h, )
-
-Only in povray-3.50c: configure.in~
+++ /dev/null
-diff -urN povray-3.50a.org/src/optout.h povray-3.50a/src/optout.h
---- povray-3.50a.org/src/optout.h Thu Oct 10 09:48:24 2002
-+++ povray-3.50a/src/optout.h Thu Oct 10 09:49:07 2002
-@@ -46,8 +46,7 @@
- #define OFFICIAL_VERSION_NUMBER 350
-
- #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
--#error You must complete the following DISTRIBUTION_MESSAGE macro
--#define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................."
-+#define DISTRIBUTION_MESSAGE_2 " PLD/Linux Team <feedback@pld-linux.org>"
- #define DISTRIBUTION_MESSAGE_3 " The POV-Ray Team(tm) is not responsible for supporting this version."
-
- /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */
+++ /dev/null
-diff -dur povray-3.50c.orig/acinclude.m4 povray-3.50c/acinclude.m4
---- povray-3.50c.orig/acinclude.m4 2002-12-30 20:33:38.000000000 +0100
-+++ povray-3.50c/acinclude.m4 2004-01-07 14:21:23.602520944 +0100
-@@ -38,11 +38,11 @@
- /usr/gnu \
- /opt/gnu \
- /opt/local/pvm3 \
-- /usr/lib/pvm3 \
-- /usr/local/lib/pvm3\
-+ /usr/lib64/pvm3 \
-+ /usr/local/lib64/pvm3\
- /opt/local/pvm \
-- /usr/lib/pvm \
-- /usr/local/lib/pvm \
-+ /usr/lib64/pvm \
-+ /usr/local/lib64/pvm \
- $prefix \
- "
- dnl ******************************************
-Only in povray-3.50c: acinclude.m4~
+++ /dev/null
-diff -urN povray-3.6.1.org/acinclude.m4 povray-3.6.1/acinclude.m4
---- povray-3.6.1.org/acinclude.m4 2004-08-03 01:16:14.000000000 +0200
-+++ povray-3.6.1/acinclude.m4 2007-01-27 22:37:25.000000000 +0100
-@@ -95,12 +95,12 @@
-
- # check for -dumpversion
- AC_TRY_COMMAND([$CXX -dumpversion < /dev/null 2> /dev/null > conftest.out])
-- pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep '[[0-9]]'`
-+ pov_prog_cxx_version=$(cat conftest.out | egrep '[[0-9]]')
-
- # check for -v
- if test -z "$pov_prog_cxx_version"; then
- AC_TRY_COMMAND([$CXX -v < /dev/null 2>&1 | tr A-Z a-z > conftest.out])
-- pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,'`
-+ pov_prog_cxx_version=$(cat conftest.out | egrep "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,')
- fi
-
- # final compiler version string
-@@ -131,7 +131,7 @@
- AC_REQUIRE([AC_PROG_EGREP])
-
- # Create a unique cache-id name (multiple flags are handled).
-- pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags`echo $1 | sed 's,[[^a-zA-Z0-9]],_,g'`
-+ pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags$(echo $1 | sed 's,[[^a-zA-Z0-9]],_,g')
-
- # Create the extended regular expression to handle multiple flags.
- # For instance, "-first-flag -second-flag -X" gives the regexp:
-@@ -140,7 +140,7 @@
- # FreeBSD and Darwin seem to have a problem with the \+ sed construct
- # (but apparently not with the \{x,y\} one). For safety, I prefer to
- # use [[:space:]][[:space:]]* for [[:space:]]\+
-- pov_prog_cxx_flags_regexp=`echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
-+ pov_prog_cxx_flags_regexp=$(echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,')
-
- # Cannot use AC_CACHE_CHECK due to the nature of the cache-id variable.
- AC_MSG_CHECKING([whether $CXX accepts $1])
-@@ -155,10 +155,10 @@
- AC_TRY_COMMAND([$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0])
- AC_TRY_COMMAND([$CXX -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
- AC_TRY_COMMAND([cat conftest.err >&5])
-- AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
-+ AC_TRY_COMMAND([egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
- # the command above seems to not always return the correct status, so
- # for safety I rerun it here; I keep the other one for logging purpose.
-- pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
-+ pov_prog_cxx_flags_err=$(egrep "$pov_prog_cxx_flags_regexp" conftest.err)
- AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
- if test -z "$pov_prog_cxx_flags_err" \
- || test -z "`diff conftest.err0 conftest.err`"; then
-@@ -192,8 +192,8 @@
- [
- AC_REQUIRE([AC_PROG_EGREP])
-
-- pov_prog_cc_flags_var=pov_cv_prog_cc_flags`echo $1 | sed 's,[[^a-zA-Z0-9]],_,g'`
-- pov_prog_cc_flags_regexp=`echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
-+ pov_prog_cc_flags_var=pov_cv_prog_cc_flags$(echo $1 | sed 's,[[^a-zA-Z0-9]],_,g')
-+ pov_prog_cc_flags_regexp=$(echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,')
-
- AC_MSG_CHECKING([whether $CC accepts $1])
- AC_CACHE_VAL(
-@@ -204,8 +204,8 @@
- AC_TRY_COMMAND([$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0])
- AC_TRY_COMMAND([$CC -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
- AC_TRY_COMMAND([cat conftest.err >&5])
-- AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
-- pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
-+ AC_TRY_COMMAND([egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
-+ pov_prog_cc_flags_err=$(egrep "$pov_prog_cc_flags_regexp" conftest.err)
- AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
- if test -z "$pov_prog_cc_flags_err" \
- || test -z "`diff conftest.err0 conftest.err`"; then
+++ /dev/null
-diff -dur povray-3.50c.orig/configure.in povray-3.50c/configure.in
---- povray-3.50c.orig/configure.in 2004-01-09 14:27:12.000000000 +0100
-+++ povray-3.50c/configure.in 2004-01-09 14:28:47.589558330 +0100
-@@ -18,8 +18,6 @@
-
- AC_CHECK_LIB(m, sin)
- AC_CHECK_LIB(z, inflate)
--AC_CHECK_LIB(vga, vga_init)
--AC_CHECK_LIB(vgagl, gl_setcontextvga)
- dnl look for ios, iostream, fstream
- dnl Moved check for libX11 until after AC_PATH_EXTRA can define
- dnl the x_libraries path it needs.
-Only in povray-3.50c: configure.in~
+++ /dev/null
---- povray-3.6.1/source/png_pov.cpp.wiget 2010-01-29 21:35:24.000000000 +0100
-+++ povray-3.6.1/source/png_pov.cpp 2010-01-29 21:35:33.000000000 +0100
-@@ -782,7 +782,7 @@ PNG_Image::~PNG_Image()
- {
- // finished prematurely - trick into thinking done
- png_ptr->num_rows = png_ptr->row_number;
-- png_write_finish_row(png_ptr);
-+ png_write_row(png_ptr, row_ptr);
- }
-
- #ifdef POV_COMMENTS // temporarily skip comment writing code
-@@ -1428,7 +1428,7 @@ void Read_Png_Image(IMAGE *Image, char *
- 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 @@ void Read_Png_Image(IMAGE *Image, char *
- 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");
projects / packages / povray.git / commitdiff