commit povray

Hello community, here is the log from the commit of package povray checked in at Mon Jun 2 10:32:15 CEST 2008. -------- --- povray/povray.changes 2008-01-25 22:19:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/povray/povray.changes 2008-06-01 05:57:43.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jun 1 05:37:21 CEST 2008 - crrodriguez@suse.de + +- Do not ever use bundled libpng,zlib,tiff +- needs fno-strict-aliasing + +------------------------------------------------------------------- New: ---- povray-3.6.1-wronglibdetect.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ povray.spec ++++++ --- /var/tmp/diff_new_pack.T29324/_old 2008-06-02 10:32:09.000000000 +0200 +++ /var/tmp/diff_new_pack.T29324/_new 2008-06-02 10:32:09.000000000 +0200 @@ -10,19 +10,21 @@ # norootforbuild + Name: povray BuildRequires: gcc-c++ libpng-devel libtiff-devel xorg-x11-devel License: POV-Ray License Agreement Group: Productivity/Graphics/Visualization/Raytracers AutoReqProv: on Version: 3.6.1 -Release: 116 +Release: 142 Summary: Ray Tracer Url: http://www.povray.org Source: povray-3.6.tar.bz2 Patch1: povray-%{version}-ini.patch Patch2: povray-%{version}-maxlib.patch Patch3: povray-%{version}-fix.patch +Patch4: povray-3.6.1-wronglibdetect.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,19 +62,18 @@ %patch1 %patch2 %patch3 +%patch4 +rm -rf libraries %build -aclocal -autoconf --force -automake --force +autoreconf -fiv %ifarch %arm # work around ICE RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1" %endif -CXXFLAGS="$RPM_OPT_FLAGS -Wno-multichar" CFLAGS="$CXXFLAGS"\ - ./configure COMPILED_BY="SUSE LINUX Products GmbH, Nuernberg, Germany" \ - --disable-optimiz \ - --prefix=/usr --mandir=%{_mandir} --sysconfdir=/etc +CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-multichar" CFLAGS="$CXXFLAGS"\ +%configure COMPILED_BY="SUSE LINUX Products GmbH, Nuernberg, Germany" \ + --disable-optimiz make %{?jobs:-j %jobs} perl -pi -e 's,^DEFAULT_DIR=.*,DEFAULT_DIR=/usr,' scripts/* perl -pi -e 's,^SYSCONFDIR=.*,SYSCONFDIR=/etc,' scripts/* @@ -99,13 +100,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 01 2008 crrodriguez@suse.de +- Do not ever use bundled libpng,zlib,tiff +- needs fno-strict-aliasing * Fri Jan 25 2008 meissner@suse.de - last fix could still overflow buffer, the compiler just did not warn anymore. - still uses builtin copy of libpng. * Thu Jan 24 2008 coolo@suse.de - fix build -* Mon Sep 18 2006 dmueller@suse.de +* Tue Sep 19 2006 dmueller@suse.de - build parallel * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires ++++++ povray-3.6.1-wronglibdetect.patch ++++++ Index: acinclude.m4 =================================================================== --- acinclude.m4.orig 2004-08-03 01:16:14.000000000 +0200 +++ acinclude.m4 2008-06-01 05:21:51.000000000 +0200 @@ -352,14 +352,15 @@ AC_DEFUN([POV_CHECK_LIB], AC_RUN_IFELSE( [ AC_LANG_SOURCE( -[#include +[#define _GNU_SOURCE +#include #include #include "$5" int main (void) { const char *version = $6; fprintf (stderr, "%s\n", version); - return ! (strcmp (version ? version : "", "$2") >= 0); + return ! (strverscmp (version ? version : "", "$2") >= 0); }] ) ], Index: source/png_pov.cpp =================================================================== --- source/png_pov.cpp.orig 2004-08-03 01:11:37.000000000 +0200 +++ source/png_pov.cpp 2008-06-01 05:30:53.000000000 +0200 @@ -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 Index: Makefile.am =================================================================== --- Makefile.am.orig 2004-08-03 01:20:02.000000000 +0200 +++ Makefile.am 2008-06-01 05:40:59.000000000 +0200 @@ -32,12 +32,12 @@ povconfdir = @sysconfdir@/@PACKAGE@/@VER povconfuser = $(HOME)/.@PACKAGE@/@VERSION_BASE@ # Directories to build. -SUBDIRS = libraries source unix +SUBDIRS = source unix # Additional files to distribute. EXTRA_DIST = \ bootstrap kde_install.sh \ - doc icons include ini libraries scenes scripts \ + doc icons include ini scenes scripts \ povray.ini.in # Additional files to clean with 'make distclean'. Index: configure.ac =================================================================== --- configure.ac.orig 2004-08-03 01:16:14.000000000 +0200 +++ configure.ac 2008-06-01 05:46:30.000000000 +0200 @@ -615,7 +615,6 @@ if test x"$pov_check_lib" != x"ok"; then if test x"$enable_lib_checks" != x"no"; then AC_MSG_NOTICE([libpng will be built and statically linked to $PACKAGE_NAME]) fi - AC_CONFIG_SUBDIRS([libraries/png]) if test "$ac_cv_search_png_get_libpng_ver"; then LIBS=`echo $LIBS | sed s,$ac_cv_search_png_get_libpng_ver,,g` fi @@ -644,7 +643,6 @@ if test x"$pov_check_libjpeg" != x"ok"; if test x"$enable_lib_checks" != x"no"; then AC_MSG_NOTICE([libjpeg will be built and statically linked to $PACKAGE_NAME]) fi - AC_CONFIG_SUBDIRS([libraries/jpeg]) if test "$ac_cv_search_jpeg_std_error"; then LIBS=`echo $LIBS | sed s,$ac_cv_search_jpeg_std_error,,g` fi @@ -679,7 +677,6 @@ if test x"$pov_check_libtiff" != x"ok"; if test x"$enable_lib_checks" != x"no"; then AC_MSG_NOTICE([libtiff will be built and statically linked to $PACKAGE_NAME]) fi - AC_CONFIG_SUBDIRS([libraries/tiff]) if test "$ac_cv_search_TIFFGetVersion"; then LIBS=`echo $LIBS | sed s,$ac_cv_search_TIFFGetVersion,,g` fi @@ -1111,7 +1108,6 @@ AC_SUBST([POVLIBSCLEAN]) AC_CONFIG_FILES([\ Makefile \ - libraries/Makefile \ source/base/Makefile \ source/frontend/Makefile \ source/Makefile \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org