[packages/enblend-enfuse] - updated to 4.1.1 - removed obsolete patches
baggins
baggins at pld-linux.org
Thu Apr 4 17:18:05 CEST 2013
commit 7ede00a3b9fd8826e2749ae1a90430cc5a4ca4be
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Apr 4 17:17:51 2013 +0200
- updated to 4.1.1
- removed obsolete patches
enblend-enfuse-libpng.patch | 14 ---
enblend-enfuse-libpng15.patch | 220 ------------------------------------------
enblend-enfuse-opt.patch | 19 ----
enblend-enfuse.spec | 16 ++-
4 files changed, 6 insertions(+), 263 deletions(-)
---
diff --git a/enblend-enfuse.spec b/enblend-enfuse.spec
index 2f088cf..71bbdce 100644
--- a/enblend-enfuse.spec
+++ b/enblend-enfuse.spec
@@ -2,15 +2,13 @@
Summary: Image blending with multiresolution splines
Summary(pl.UTF-8): Łączenie zdjęć przy użyciu splajnów wielokrotnej rozdzielczości
Name: enblend-enfuse
-Version: 4.0
-Release: 2
+Version: 4.1.1
+Release: 1
License: GPL v2+
Group: Applications/Graphics
Source0: http://downloads.sourceforge.net/enblend/%{name}-%{version}.tar.gz
-# Source0-md5: 2e7c950061e0085fd75d94576130250f
-Patch0: %{name}-libpng.patch
-Patch1: %{name}-info.patch
-Patch2: %{name}-libpng15.patch
+# Source0-md5: 9bc34f423f3bee35150ab593211da4a2
+Patch0: %{name}-info.patch
URL: http://enblend.sourceforge.net/
BuildRequires: OpenEXR-devel >= 1.0
BuildRequires: OpenGL-GLU-devel
@@ -49,10 +47,8 @@ przynajmniej bardzo trudne do zobaczenia. Enblend nie wyrównuje zdjęć
- do tego można użyć narzędzia takiego jak Hugin.
%prep
-%setup -q -n %{name}-%{version}-753b534c819d
+%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p0
%build
%{__aclocal} -I m4
@@ -79,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README VIGRA_LICENSE
+%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/enblend
%attr(755,root,root) %{_bindir}/enfuse
%{_mandir}/man1/enblend.1*
diff --git a/enblend-enfuse-libpng.patch b/enblend-enfuse-libpng.patch
deleted file mode 100644
index e8a97e0..0000000
--- a/enblend-enfuse-libpng.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur enblend-enfuse-4.0-753b534c819d.orig/src/vigra_impex/png.cxx enblend-enfuse-4.0-753b534c819d/src/vigra_impex/png.cxx
---- enblend-enfuse-4.0-753b534c819d.orig/src/vigra_impex/png.cxx 2009-12-20 16:32:28.000000000 +0100
-+++ enblend-enfuse-4.0-753b534c819d/src/vigra_impex/png.cxx 2010-03-01 11:41:51.340281184 +0100
-@@ -274,8 +274,8 @@
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(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;
- }
-
diff --git a/enblend-enfuse-libpng15.patch b/enblend-enfuse-libpng15.patch
deleted file mode 100644
index f48f7e5..0000000
--- a/enblend-enfuse-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- 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 @@
- 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 @@
- 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 @@
- 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 @@
-
- // 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 @@
-
- // 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 @@
- #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,12 @@
-
- // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
-- char * dummyName;
-+ png_charpp dummyName;
- int dummyCompType;
-- char * profilePtr;
-+ png_bytepp profilePtr;
- 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 +340,7 @@
- // 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 +349,26 @@
- 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 +379,7 @@
- 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 +545,7 @@
- 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 +556,7 @@
- }
-
- // 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 +571,7 @@
- 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 +579,7 @@
-
- // 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 +588,7 @@
-
- // 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 +597,12 @@
- // set icc profile
- if (iccProfile.size() > 0) {
- png_set_iCCP(png, info, "icc", 0,
-- (char *)iccProfile.begin(), iccProfile.size());
-+ iccProfile.begin(), iccProfile.size());
- }
- #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 +634,10 @@
- }
-
- // 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);
- }
diff --git a/enblend-enfuse-opt.patch b/enblend-enfuse-opt.patch
deleted file mode 100644
index 7ff1c98..0000000
--- a/enblend-enfuse-opt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- enblend-enfuse-3.2/src/vigra_impex/Makefile.am.orig 2008-01-25 03:40:53.000000000 +0100
-+++ enblend-enfuse-3.2/src/vigra_impex/Makefile.am 2008-09-09 20:07:33.504979766 +0200
-@@ -2,4 +2,4 @@
- noinst_LIBRARIES = libvigra_impex.a
- libvigra_impex_a_SOURCES = auto_file.hxx bmp.cxx bmp.hxx byteorder.cxx byteorder.hxx codecmanager.cxx codecmanager.hxx error.hxx gif.cxx gif.hxx hdr.cxx hdr.hxx iccjpeg.c iccjpeg.h imageinfo.cxx jpeg.cxx jpeg.hxx png.cxx png.hxx pnm.cxx pnm.hxx rgbe.c rgbe.h sun.cxx sun.hxx tiff.cxx tiff.hxx viff.cxx viff.hxx void_vector.cxx void_vector.hxx exr.cxx exr.hxx
- #libvigra_impex_a_CXXFLAGS = -I${top_srcdir}/include -O3 -Wall -DHasPNG -DHasJPEG -DHasTIFF
--libvigra_impex_a_CXXFLAGS = -I${top_srcdir}/include -O3 -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DVIGRA_STATIC_LIB
-+libvigra_impex_a_CXXFLAGS = -I${top_srcdir}/include -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DVIGRA_STATIC_LIB
---- enblend-enfuse-3.2/configure.in.orig 2008-09-07 22:21:47.000000000 +0200
-+++ enblend-enfuse-3.2/configure.in 2008-09-09 20:07:21.248980604 +0200
-@@ -119,7 +119,7 @@
- CXXFLAGS="$CXXFLAGS -g -DDEBUG -Wall"
- AC_MSG_RESULT(yes)
- else
-- CXXFLAGS="$CXXFLAGS -O3 -ffast-math -DNDEBUG -Wall"
-+ CXXFLAGS="$CXXFLAGS -ffast-math -DNDEBUG -Wall"
- AC_MSG_RESULT(no)
- fi
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/enblend-enfuse.git/commitdiff/7ede00a3b9fd8826e2749ae1a90430cc5a4ca4be
More information about the pld-cvs-commit
mailing list