Hello community, here is the log from the commit of package enblend-enfuse for openSUSE:Factory checked in at 2012-10-04 19:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enblend-enfuse (Old) and /work/SRC/openSUSE:Factory/.enblend-enfuse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enblend-enfuse", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/enblend-enfuse/enblend-enfuse.changes 2012-01-11 15:37:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.enblend-enfuse.new/enblend-enfuse.changes 2012-10-04 19:38:00.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Oct 3 19:49:45 UTC 2012 - [email protected] + +- really build also with older libpng14 + +------------------------------------------------------------------- +Tue Sep 4 14:22:06 UTC 2012 - [email protected] + +- build also with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- enblend-enfuse-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enblend-enfuse.spec ++++++ --- /var/tmp/diff_new_pack.Fjysmz/_old 2012-10-04 19:38:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Fjysmz/_new 2012-10-04 19:38:01.000000000 +0200 @@ -16,17 +16,22 @@ # - Name: enblend-enfuse Url: http://enblend.sourceforge.net/ +Summary: Tool for Composing Images License: GPL-2.0+ Group: Productivity/Graphics/Other -Summary: Tool for Composing Images Version: 4.0 Release: 0 Source: http://sourceforge.net/projects/enblend/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz Patch0: enblend-enfuse-libpng14.patch Patch1: use-default-gcc-inlining.diff +# libpng15.patch sent to [email protected], [email protected], [email protected], [email protected] +# reply from Chris (cspiel): +# Vigra is not part of the Enblend/Enfuse +# package anymore. Thus the patch is outdated wrt +# current tip. +Patch2: enblend-enfuse-libpng15.patch BuildRequires: OpenEXR-devel BuildRequires: automake BuildRequires: boost-devel @@ -34,11 +39,11 @@ BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: gnuplot +BuildRequires: libjpeg-devel BuildRequires: liblcms-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: plotutils-devel -BuildRequires: libjpeg-devel BuildRequires: tidy BuildRequires: transfig Provides: enblend = %{version} @@ -65,6 +70,7 @@ %setup -q -n enblend-enfuse-4.0-753b534c819d %patch0 -p1 %patch1 +%patch2 %build ACLOCAL="aclocal -I m4" autoreconf -f -i ++++++ enblend-enfuse-libpng15.patch ++++++ http://mailman.archlinux.org/pipermail/arch-commits/2012-January/156335.html Index: src/vigra_impex/png.cxx =================================================================== --- src/vigra_impex/png.cxx.orig +++ src/vigra_impex/png.cxx @@ -81,7 +81,7 @@ extern "C" { static void PngError( png_structp png_ptr, png_const_charp error_msg ) { png_error_message = std::string(error_msg); - longjmp( png_ptr->jmpbuf, 1 ); + longjmp( png_jmpbuf( png_ptr ), 1 ); } // called on non-fatal errors @@ -213,7 +213,7 @@ namespace vigra { vigra_postcondition( png != 0, "could not create the read struct." ); // create info struct - if (setjmp(png->jmpbuf)) { + if (setjmp(png_jmpbuf( png ))) { png_destroy_read_struct( &png, &info, NULL ); vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); } @@ -221,14 +221,14 @@ namespace vigra { vigra_postcondition( info != 0, "could not create the info struct." ); // init png i/o - if (setjmp(png->jmpbuf)) { + if (setjmp(png_jmpbuf( png ))) { png_destroy_read_struct( &png, &info, NULL ); vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); } png_init_io( png, file.get() ); // specify that the signature was already read - if (setjmp(png->jmpbuf)) { + if (setjmp(png_jmpbuf( png ))) { png_destroy_read_struct( &png, &info, NULL ); vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); } @@ -244,13 +244,13 @@ namespace vigra { void PngDecoderImpl::init() { // read all chunks up to the image data - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); png_read_info( png, info ); // pull over the header fields int interlace_method, compression_method, filter_method; - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, &interlace_method, &compression_method, &filter_method ); @@ -264,7 +264,7 @@ namespace vigra { // transform palette to rgb if ( color_type == PNG_COLOR_TYPE_PALETTE) { - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); png_set_palette_to_rgb(png); color_type = PNG_COLOR_TYPE_RGB; @@ -273,7 +273,7 @@ namespace vigra { // expand gray values to at least one byte size if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); png_set_expand_gray_1_2_4_to_8(png); bit_depth = 8; @@ -283,7 +283,7 @@ namespace vigra { #if 0 // strip alpha channel if ( color_type & PNG_COLOR_MASK_ALPHA ) { - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); png_set_strip_alpha(png); color_type ^= PNG_COLOR_MASK_ALPHA; @@ -323,12 +323,16 @@ namespace vigra { // read icc profile #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) - char * dummyName; + png_charpp dummyName; int dummyCompType; - char * profilePtr; +# if (PNG_LIBPNG_VER > 10500) + png_bytepp profilePtr; +# else + png_charpp profilePtr; +# endif png_uint_32 profileLen; - if (info->valid & PNG_INFO_iCCP) { - png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; + if (png_get_valid(png, info, PNG_INFO_iCCP)) { + png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; iccProfilePtr = (unsigned char *) profilePtr; iccProfileLength = profileLen; } @@ -340,7 +344,7 @@ namespace vigra { // image gamma double image_gamma = 0.45455; if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); png_get_gAMA( png, info, &image_gamma ); } @@ -349,26 +353,26 @@ namespace vigra { double screen_gamma = 2.2; // set gamma correction - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); png_set_gamma( png, screen_gamma, image_gamma ); #endif // interlace handling, get number of read passes needed - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); n_interlace_passes = png_set_interlace_handling(png); // update png library state to reflect any changes that were made - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); png_read_update_info( png, info ); - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); n_channels = png_get_channels(png, info); - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); rowsize = png_get_rowbytes(png, info); @@ -379,7 +383,7 @@ namespace vigra { void PngDecoderImpl::nextScanline() { for (int i=0; i < n_interlace_passes; i++) { - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); png_read_row(png, row_data.begin(), NULL); } @@ -545,7 +549,7 @@ namespace vigra { vigra_postcondition( png != 0, "could not create the write struct." ); // create info struct - if (setjmp(png->jmpbuf)) { + if (setjmp(png_jmpbuf( png ))) { png_destroy_write_struct( &png, &info ); vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); } @@ -556,7 +560,7 @@ namespace vigra { } // init png i/o - if (setjmp(png->jmpbuf)) { + if (setjmp(png_jmpbuf( png ))) { png_destroy_write_struct( &png, &info ); vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); } @@ -571,7 +575,7 @@ namespace vigra { void PngEncoderImpl::finalize() { // write the IHDR - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); png_set_IHDR( png, info, width, height, bit_depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, @@ -579,7 +583,7 @@ namespace vigra { // set resolution if (x_resolution > 0 && y_resolution > 0) { - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5), (png_uint_32) (y_resolution / 0.0254 + 0.5), @@ -588,7 +592,7 @@ namespace vigra { // set offset if (position.x > 0 && position.y > 0) { - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); } @@ -597,12 +601,16 @@ namespace vigra { // set icc profile if (iccProfile.size() > 0) { png_set_iCCP(png, info, "icc", 0, - (char *)iccProfile.begin(), iccProfile.size()); +# if (PNG_LIBPNG_VER > 10500) + iccProfile.begin(), iccProfile.size()); +# else + (png_charp)iccProfile.begin(), iccProfile.size()); +# endif } #endif // write the info struct - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); png_write_info( png, info ); @@ -634,10 +642,10 @@ namespace vigra { } // write the whole image - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); png_write_image( png, row_pointers.begin() ); - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf( png ))) vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); png_write_end(png, info); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
