[arch-commits] Commit in enblend-enfuse/repos (12 files)

Eric Bélanger eric at archlinux.org
Fri Nov 25 23:58:43 EST 2011


    Date: Friday, November 25, 2011 @ 23:58:43
  Author: eric
Revision: 143541

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  enblend-enfuse/repos/extra-i686/PKGBUILD
    (from rev 143540, enblend-enfuse/trunk/PKGBUILD)
  enblend-enfuse/repos/extra-i686/enblend-enfuse.install
    (from rev 143540, enblend-enfuse/trunk/enblend-enfuse.install)
  enblend-enfuse/repos/extra-i686/libpng-1.4.patch
    (from rev 143540, enblend-enfuse/trunk/libpng-1.4.patch)
  enblend-enfuse/repos/extra-x86_64/PKGBUILD
    (from rev 143540, enblend-enfuse/trunk/PKGBUILD)
  enblend-enfuse/repos/extra-x86_64/enblend-enfuse.install
    (from rev 143540, enblend-enfuse/trunk/enblend-enfuse.install)
  enblend-enfuse/repos/extra-x86_64/libpng-1.4.patch
    (from rev 143540, enblend-enfuse/trunk/libpng-1.4.patch)
Deleted:
  enblend-enfuse/repos/extra-i686/PKGBUILD
  enblend-enfuse/repos/extra-i686/enblend-enfuse.install
  enblend-enfuse/repos/extra-i686/libpng-1.4.patch
  enblend-enfuse/repos/extra-x86_64/PKGBUILD
  enblend-enfuse/repos/extra-x86_64/enblend-enfuse.install
  enblend-enfuse/repos/extra-x86_64/libpng-1.4.patch

-------------------------------------+
 extra-i686/PKGBUILD                 |   70 +++++++++++++++++-----------------
 extra-i686/enblend-enfuse.install   |   42 ++++++++++----------
 extra-i686/libpng-1.4.patch         |   28 ++++++-------
 extra-x86_64/PKGBUILD               |   70 +++++++++++++++++-----------------
 extra-x86_64/enblend-enfuse.install |   42 ++++++++++----------
 extra-x86_64/libpng-1.4.patch       |   28 ++++++-------
 6 files changed, 144 insertions(+), 136 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-26 04:58:08 UTC (rev 143540)
+++ extra-i686/PKGBUILD	2011-11-26 04:58:43 UTC (rev 143541)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: tobias <tobias at archlinux.org>
-# Contributor: Dominik Ryba <domryba at post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=3
-pkgdesc="intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'libgl' 'lcms' 'texinfo' 'libpng')
-makedepends=('boost' 'pkgconfig')
-replaces=('enblend')
-conflicts=('enblend')
-provides=('enblend')
-install=${pkgname}.install
-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}-753b534c819d"
-  patch -Np1 -i ../libpng-1.4.patch
-  ./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"
-}

Copied: enblend-enfuse/repos/extra-i686/PKGBUILD (from rev 143540, enblend-enfuse/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-26 04:58:43 UTC (rev 143541)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: tobias <tobias at archlinux.org>
+# Contributor: Dominik Ryba <domryba at post.pl>
+
+pkgname=enblend-enfuse
+pkgver=4.0
+pkgrel=4
+pkgdesc="Intelligent blend tool for overlapping picture"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://enblend.sourceforge.net"
+depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng')
+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)
+sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
+          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
+          'eae6cf48ea082865130302d0b4d1ca0b884a563b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
+  patch -Np1 -i ../libpng-1.4.patch
+  ./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"
+}

Deleted: extra-i686/enblend-enfuse.install
===================================================================
--- extra-i686/enblend-enfuse.install	2011-11-26 04:58:08 UTC (rev 143540)
+++ extra-i686/enblend-enfuse.install	2011-11-26 04:58:43 UTC (rev 143541)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(enblend.info enfuse-focus-stacking.info enfuse.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: enblend-enfuse/repos/extra-i686/enblend-enfuse.install (from rev 143540, enblend-enfuse/trunk/enblend-enfuse.install)
===================================================================
--- extra-i686/enblend-enfuse.install	                        (rev 0)
+++ extra-i686/enblend-enfuse.install	2011-11-26 04:58:43 UTC (rev 143541)
@@ -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:

Deleted: extra-i686/libpng-1.4.patch
===================================================================
--- extra-i686/libpng-1.4.patch	2011-11-26 04:58:08 UTC (rev 143540)
+++ extra-i686/libpng-1.4.patch	2011-11-26 04:58:43 UTC (rev 143541)
@@ -1,14 +0,0 @@
-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;
-         }
- 

Copied: enblend-enfuse/repos/extra-i686/libpng-1.4.patch (from rev 143540, enblend-enfuse/trunk/libpng-1.4.patch)
===================================================================
--- extra-i686/libpng-1.4.patch	                        (rev 0)
+++ extra-i686/libpng-1.4.patch	2011-11-26 04:58:43 UTC (rev 143541)
@@ -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;
+         }
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-11-26 04:58:08 UTC (rev 143540)
+++ extra-x86_64/PKGBUILD	2011-11-26 04:58:43 UTC (rev 143541)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: tobias <tobias at archlinux.org>
-# Contributor: Dominik Ryba <domryba at post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=3
-pkgdesc="intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'libgl' 'lcms' 'texinfo' 'libpng')
-makedepends=('boost' 'pkgconfig')
-replaces=('enblend')
-conflicts=('enblend')
-provides=('enblend')
-install=${pkgname}.install
-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}-753b534c819d"
-  patch -Np1 -i ../libpng-1.4.patch
-  ./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"
-}

Copied: enblend-enfuse/repos/extra-x86_64/PKGBUILD (from rev 143540, enblend-enfuse/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-11-26 04:58:43 UTC (rev 143541)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: tobias <tobias at archlinux.org>
+# Contributor: Dominik Ryba <domryba at post.pl>
+
+pkgname=enblend-enfuse
+pkgver=4.0
+pkgrel=4
+pkgdesc="Intelligent blend tool for overlapping picture"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://enblend.sourceforge.net"
+depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng')
+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)
+sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
+          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
+          'eae6cf48ea082865130302d0b4d1ca0b884a563b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
+  patch -Np1 -i ../libpng-1.4.patch
+  ./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"
+}

Deleted: extra-x86_64/enblend-enfuse.install
===================================================================
--- extra-x86_64/enblend-enfuse.install	2011-11-26 04:58:08 UTC (rev 143540)
+++ extra-x86_64/enblend-enfuse.install	2011-11-26 04:58:43 UTC (rev 143541)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(enblend.info enfuse-focus-stacking.info enfuse.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: enblend-enfuse/repos/extra-x86_64/enblend-enfuse.install (from rev 143540, enblend-enfuse/trunk/enblend-enfuse.install)
===================================================================
--- extra-x86_64/enblend-enfuse.install	                        (rev 0)
+++ extra-x86_64/enblend-enfuse.install	2011-11-26 04:58:43 UTC (rev 143541)
@@ -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:

Deleted: extra-x86_64/libpng-1.4.patch
===================================================================
--- extra-x86_64/libpng-1.4.patch	2011-11-26 04:58:08 UTC (rev 143540)
+++ extra-x86_64/libpng-1.4.patch	2011-11-26 04:58:43 UTC (rev 143541)
@@ -1,14 +0,0 @@
-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;
-         }
- 

Copied: enblend-enfuse/repos/extra-x86_64/libpng-1.4.patch (from rev 143540, enblend-enfuse/trunk/libpng-1.4.patch)
===================================================================
--- extra-x86_64/libpng-1.4.patch	                        (rev 0)
+++ extra-x86_64/libpng-1.4.patch	2011-11-26 04:58:43 UTC (rev 143541)
@@ -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