Tue Jul 31 00:02:29 UTC 2012

4 files changed, 295 insertions, 0 deletions

diff --git a/testing/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD
new file mode 100644
index 000000000..51fd36e14
--- /dev/null
+++ b/testing/enblend-enfuse/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 164280 2012-07-29 21:08:21Z eric $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Dominik Ryba <domryba@post.pl>
+
+pkgname=enblend-enfuse
+pkgver=4.0
+pkgrel=6
+pkgdesc="Intelligent blend tool for overlapping picture"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://enblend.sourceforge.net"
+depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
+makedepends=('boost')
+replaces=('enblend')
+conflicts=('enblend')
+provides=('enblend')
+install=${pkgname}.install
+source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \
+        libpng-1.4.patch enblend-4.0-libpng15.patch)
+sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
+          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
+          'eae6cf48ea082865130302d0b4d1ca0b884a563b'
+          '71e961d90be842eafe9d473d8d70b04b29077036')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
+  patch -p1 -i ../libpng-1.4.patch
+  patch -p0 -i ../enblend-4.0-libpng15.patch
+  LIBS="-lboost_system" ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
+  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
+}
diff --git a/testing/enblend-enfuse/enblend-4.0-libpng15.patch b/testing/enblend-enfuse/enblend-4.0-libpng15.patch
new file mode 100644
index 000000000..d4465ccad
--- /dev/null
+++ b/testing/enblend-enfuse/enblend-4.0-libpng15.patch
@@ -0,0 +1,220 @@
+--- 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/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install
new file mode 100644
index 000000000..24ea28a4e
--- /dev/null
+++ b/testing/enblend-enfuse/enblend-enfuse.install
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(enblend.info enfuse.info)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/enblend-enfuse/libpng-1.4.patch b/testing/enblend-enfuse/libpng-1.4.patch
new file mode 100644
index 000000000..3bf852b58
--- /dev/null
+++ b/testing/enblend-enfuse/libpng-1.4.patch
@@ -0,0 +1,14 @@
+diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
+--- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx	2010-01-19 22:09:36.000000000 -0500
++++ enblend-enfuse-3.2/src/vigra_impex/png.cxx	2010-01-19 22:13:43.000000000 -0500
+@@ -275,8 +275,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;
+         }
+