[arch-commits] Commit in vigra/trunk (3 files)
Date: Friday, May 19, 2017 @ 06:10:09 Author: bpiotrowski Revision: 296263 upgpkg: vigra 1.11.0-7 rebuild against boost 1.64 Added: vigra/trunk/vigra-1.11.0-const-swap.patch Modified: vigra/trunk/PKGBUILD Deleted: vigra/trunk/vigra-1.7.1.gcc460.patch ---+ PKGBUILD | 13 ++--- vigra-1.11.0-const-swap.patch | 25 + vigra-1.7.1.gcc460.patch | 33 - 3 files changed, 35 insertions(+), 36 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-05-18 21:02:05 UTC (rev 296262) +++ PKGBUILD2017-05-19 06:10:09 UTC (rev 296263) @@ -5,7 +5,7 @@ pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.11.0 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url="http://hci.iwr.uni-heidelberg.de/vigra/"; license=('custom:MIT') @@ -13,9 +13,16 @@ 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw' # additional makedeps 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') -source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz) -md5sums=('7f80d289e03a2f2e8c8e85f3ff29d988') +source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz +vigra-1.11.0-const-swap.patch) +md5sums=('7f80d289e03a2f2e8c8e85f3ff29d988' + 'a571f3a8d4cd66c8a8071ca958091f7b') +prepare() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/vigra-1.11.0-const-swap.patch +} + build() { cd "${srcdir}"/${pkgbase}-${pkgver} cmake -DCMAKE_INSTALL_PREFIX=/usr \ Added: vigra-1.11.0-const-swap.patch === --- vigra-1.11.0-const-swap.patch (rev 0) +++ vigra-1.11.0-const-swap.patch 2017-05-19 06:10:09 UTC (rev 296263) @@ -0,0 +1,25 @@ +From 18675a51fca27b324eb4e4b49593bcee9bc4535e Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Fri, 17 Feb 2017 00:55:25 + +Subject: [PATCH] Fix parameter of ImagePyramid::swap + +You can't swap with a const object. This fixes a compilation failure +with GCC 7 which rejects the incorrect function even if it isn't +instantiated. +--- + include/vigra/imagecontainer.hxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx +index a6f0f80..636cc64 100644 +--- a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx +@@ -763,7 +763,7 @@ public: + /** swap contents of this array with the contents of other + (STL-Container interface) + */ +-void swap(const ImagePyramid &other) ++void swap(ImagePyramid &other) + { + images_.swap(other.images_); + std::swap(lowestLevel_, other.lowestLevel_); Deleted: vigra-1.7.1.gcc460.patch === --- vigra-1.7.1.gcc460.patch2017-05-18 21:02:05 UTC (rev 296262) +++ vigra-1.7.1.gcc460.patch2017-05-19 06:10:09 UTC (rev 296263) @@ -1,33 +0,0 @@ -diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx vigra-1.7.1.old/include/vigra/random_forest.hxx2010-12-03 17:40:34.0 + -+++ vigra-1.7.1/include/vigra/random_forest.hxx2011-01-28 00:16:32.0 + -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include "mathutil.hxx" - #include "array_vector.hxx" - #include "sized_int.hxx" -diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx vigra-1.7.1.old/include/vigra/sifImport.hxx2010-12-03 17:40:34.0 + -+++ vigra-1.7.1/include/vigra/sifImport.hxx2011-01-28 00:23:31.0 + -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - #include "vigra/multi_array.hxx" - - namespace vigra { -diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.0 + -+++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.0 + -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include -+#include - #include "tinyvector.hxx" - #include "iteratortags.hxx" -
[arch-commits] Commit in vigra/trunk (3 files)
Date: Tuesday, May 17, 2011 @ 14:01:10 Author: andyrtr Revision: 124225 upgpkg: vigra 1.7.1-1 upstream update 1.7.1 Added: vigra/trunk/vigra-1.7.1.gcc460.patch Modified: vigra/trunk/PKGBUILD Deleted: vigra/trunk/libpng-1.4.patch --+ PKGBUILD | 17 + libpng-1.4.patch | 14 -- vigra-1.7.1.gcc460.patch | 33 + 3 files changed, 42 insertions(+), 22 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-05-17 17:46:11 UTC (rev 124224) +++ PKGBUILD2011-05-17 18:01:10 UTC (rev 124225) @@ -3,8 +3,8 @@ # Contributor: Lukas Jirkovsky pkgname=vigra -pkgver=1.7.0 -pkgrel=6 +pkgver=1.7.1 +pkgrel=1 pkgdesc="Computer vision library" arch=('i686' 'x86_64') url="http://hci.iwr.uni-heidelberg.de/vigra/"; @@ -14,13 +14,14 @@ optdepends=('python2: for python bindings' 'boost-libs: for python bindings') options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz libpng-1.4.patch) -md5sums=('a40b3b013653f75dc84ba55b2df1fae2' 'db610e48558eb323490ad21d636bac76') -sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' '5f668c861f5fe927a4f51014afab94805db60c46') +source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz + vigra-1.7.1.gcc460.patch) +md5sums=('2bde208e0fd7626770169dd4fa097282' + '25ef8bc26bc38ee67e5b512d2acd0166') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-src - patch -p1 < ../libpng-1.4.patch + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_VIGRANUMPY=1 \ -DDOCINSTALL=share/doc @@ -28,7 +29,7 @@ } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # license install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE Deleted: libpng-1.4.patch === --- libpng-1.4.patch2011-05-17 17:46:11 UTC (rev 124224) +++ libpng-1.4.patch2011-05-17 18:01:10 UTC (rev 124225) @@ -1,14 +0,0 @@ -diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx vigra1.6.0-orig/src/impex/png.cxx 2010-01-20 19:46:57.0 -0500 -+++ vigra1.6.0/src/impex/png.cxx 2010-01-20 19:47:55.0 -0500 -@@ -270,8 +270,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; - } - Added: vigra-1.7.1.gcc460.patch === --- vigra-1.7.1.gcc460.patch(rev 0) +++ vigra-1.7.1.gcc460.patch2011-05-17 18:01:10 UTC (rev 124225) @@ -0,0 +1,33 @@ +diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx +--- vigra-1.7.1.old/include/vigra/random_forest.hxx2010-12-03 17:40:34.0 + vigra-1.7.1/include/vigra/random_forest.hxx2011-01-28 00:16:32.0 + +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + #include "mathutil.hxx" + #include "array_vector.hxx" + #include "sized_int.hxx" +diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx +--- vigra-1.7.1.old/include/vigra/sifImport.hxx2010-12-03 17:40:34.0 + vigra-1.7.1/include/vigra/sifImport.hxx2011-01-28 00:23:31.0 + +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include "vigra/multi_array.hxx" + + namespace vigra { +diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx +--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.0 + vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.0 + +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include ++#include + #include "tinyvector.hxx" + #include "iteratortags.hxx" +