[arch-commits] Commit in enblend-enfuse/trunk (3 files)

Eric Bélanger eric at archlinux.org
Wed Jan 20 07:24:29 UTC 2010


    Date: Wednesday, January 20, 2010 @ 02:24:28
  Author: eric
Revision: 64417

upgpkg: enblend-enfuse 4.0-1
    Upstream update, Rebuilt for libpng 1.4 and libjpeg 8

Added:
  enblend-enfuse/trunk/libpng-1.4.patch
Modified:
  enblend-enfuse/trunk/PKGBUILD
  enblend-enfuse/trunk/enblend-enfuse.install

------------------------+
 PKGBUILD               |   19 +++++++++++--------
 enblend-enfuse.install |    4 ++--
 libpng-1.4.patch       |   14 ++++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-20 06:53:09 UTC (rev 64416)
+++ PKGBUILD	2010-01-20 07:24:28 UTC (rev 64417)
@@ -3,8 +3,8 @@
 # Contributor: Dominik Ryba <domryba at post.pl>
 
 pkgname=enblend-enfuse
-pkgver=3.2
-pkgrel=3
+pkgver=4.0
+pkgrel=1
 pkgdesc="intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -15,13 +15,16 @@
 conflicts=('enblend')
 provides=('enblend')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9b6ebaf672f5103c633a53c9723d99c3')
+source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch)
+md5sums=('2e7c950061e0085fd75d94576130250f' 'a39df8dd32ccfa020dea2ea388642575')
+sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' 'eae6cf48ea082865130302d0b4d1ca0b884a563b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  patch -p1 < ../libpng-1.4.patch || return 1
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install
-  rm -f ${pkgdir}/usr/share/info/dir
+  make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" || return 1
+  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" || return 1
 }

Modified: enblend-enfuse.install
===================================================================
--- enblend-enfuse.install	2010-01-20 06:53:09 UTC (rev 64416)
+++ enblend-enfuse.install	2010-01-20 07:24:28 UTC (rev 64417)
@@ -3,7 +3,7 @@
 
 post_install() {
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -13,7 +13,7 @@
 
 pre_remove() {
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 

Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	                        (rev 0)
+++ libpng-1.4.patch	2010-01-20 07:24:28 UTC (rev 64417)
@@ -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;
+         }
+ 




More information about the arch-commits mailing list