Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23791/10.4-transitional/unstable/main/finkinfo/graphics
Modified Files:
vigra.info vigra.patch
Log Message:
Fix for non-fileutils "install". Doesn't fix non-compilability under xcode2.2
Index: vigra.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/vigra.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vigra.patch 27 Apr 2005 03:25:46 -0000 1.1
+++ vigra.patch 5 Dec 2005 23:39:18 -0000 1.2
@@ -1,18 +1,72 @@
-diff -ur vigra1.2.0/src/impex/viff.cxx vigra1.2.0-new/src/impex/viff.cxx
---- vigra1.2.0/src/impex/viff.cxx Thu Aug 7 01:16:44 2003
-+++ vigra1.2.0-new/src/impex/viff.cxx Wed Feb 25 13:39:05 2004
-@@ -611,7 +611,7 @@
- void ViffDecoderImpl::color_map()
- {
- void_vector_base temp_bands;
-- unsigned int temp_num_bands;
-+ size_t temp_num_bands;
+diff -Nurd -x'*~' vigra1.2.0.orig/Makefile vigra1.2.0/Makefile
+--- vigra1.2.0.orig/Makefile 2003-08-05 22:03:46.000000000 -0400
++++ vigra1.2.0/Makefile 2005-12-05 18:29:57.000000000 -0500
+@@ -10,26 +10,26 @@
+ install-exec:
+ @cd src ; $(MAKE) install ; cd ..
+ $(INSTALL) -d $(bindir)
+- $(INSTALL) --mode=755 $(vigra_builddir)/config/vigra-config $(bindir)
++ $(INSTALL) -m 755 $(vigra_builddir)/config/vigra-config $(bindir)
- if ( header.map_storage_type == VFF_MAPTYP_1_BYTE ) {
- typedef unsigned char map_storage_type;
-diff -w -uNr vigra-1.2.0-orig/include/vigra/numerictraits.hxx
vigra-1.2.0/include/vigra/numerictraits.hxx
---- vigra-1.2.0-orig/include/vigra/numerictraits.hxx 2003-08-07
02:16:31.000000000 +0200
-+++ vigra-1.2.0/include/vigra/numerictraits.hxx 2004-05-10
08:31:07.000000000 +0200
+ install-includes:
+ if test "$(includedir)" != "$(vigra_builddir)/include" ; then \
+ $(INSTALL) -d $(includedir)/vigra ; \
+- $(INSTALL) --mode=644 $(vigra_builddir)/include/vigra/*.hxx
$(includedir)/vigra ; \
++ $(INSTALL) -m 644 $(vigra_builddir)/include/vigra/*.hxx
$(includedir)/vigra ; \
+ fi
+ install-headers: install-includes
+
+ install-docs:
+ $(INSTALL) -d $(docdir)
+- $(INSTALL) --mode=644 LICENSE $(docdir)
++ $(INSTALL) -m 644 LICENSE $(docdir)
+ if test "$(docdir)" != "$(vigra_builddir)/doc/vigra" ; then \
+- $(INSTALL) --mode=644 \
++ $(INSTALL) -m 644 \
+ $(vigra_builddir)/doc/vigra/*.html \
+ $(vigra_builddir)/doc/vigra/classvigra*.png
$(vigra_builddir)/doc/vigra/form*.png \
+ $(vigra_builddir)/doc/vigra/doxygen.png
$(vigra_builddir)/doc/vigra/doxygen.css \
+ $(docdir) ; \
+ $(INSTALL) -d $(docdir)/documents ; \
+- $(INSTALL) --mode=644 \
++ $(INSTALL) -m 644 \
+ $(vigra_builddir)/doc/vigra/documents/*.ps \
+ $(vigra_builddir)/doc/vigra/documents/*.gif \
+ $(docdir)/documents ; \
+diff -Nurd -x'*~' vigra1.2.0.orig/configure vigra1.2.0/configure
+--- vigra1.2.0.orig/configure 2003-08-06 20:16:18.000000000 -0400
++++ vigra1.2.0/configure 2005-12-05 18:30:50.000000000 -0500
+@@ -2591,27 +2591,6 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+- if test -z "$vigra_save_INSTALL_given" ; then
+- # user hasn't overwritten INSTALL, autoconf found one for us
+- # now we'll test if it supports the -p flag
+- echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
+- rm -f confinst.$$.* > /dev/null 2>&1
+- echo "Testtest" > confinst.$$.orig
+- ac_res=no
+- if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
+- if test -f confinst.$$.new ; then
+- # OK, -p seems to do no harm to install
+- INSTALL="${INSTALL} -p"
+- ac_res=yes
+- fi
+- fi
+- rm -f confinst.$$.*
+- echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
+- fi
+-
+-
+ LIBCPPFLAGS=
+ VIGRA_INCLUDES='-I$(prefix)/include'
+
+diff -Nurd -x'*~' vigra1.2.0.orig/include/vigra/numerictraits.hxx
vigra1.2.0/include/vigra/numerictraits.hxx
+--- vigra1.2.0.orig/include/vigra/numerictraits.hxx 2003-08-06
20:16:31.000000000 -0400
++++ vigra1.2.0/include/vigra/numerictraits.hxx 2005-12-05 17:59:36.000000000
-0500
@@ -313,6 +313,7 @@
typedef Error_NumericTraits_not_specialized_for_this_case isScalar;
typedef Error_NumericTraits_not_specialized_for_this_case isIntegral;
@@ -117,9 +171,9 @@
static long double zero() { return 0.0; }
static long double one() { return 1.0; }
-diff -w -uNr vigra-1.2.0-orig/include/vigra/rgbvalue.hxx
vigra-1.2.0/include/vigra/rgbvalue.hxx
---- vigra-1.2.0-orig/include/vigra/rgbvalue.hxx 2003-08-07
02:16:32.000000000 +0200
-+++ vigra-1.2.0/include/vigra/rgbvalue.hxx 2004-05-16 16:04:32.000000000
+0200
+diff -Nurd -x'*~' vigra1.2.0.orig/include/vigra/rgbvalue.hxx
vigra1.2.0/include/vigra/rgbvalue.hxx
+--- vigra1.2.0.orig/include/vigra/rgbvalue.hxx 2003-08-06 20:16:32.000000000
-0400
++++ vigra1.2.0/include/vigra/rgbvalue.hxx 2005-12-05 17:59:36.000000000
-0500
@@ -319,6 +319,7 @@
typedef RGBValue<typename NumericTraits<T>::RealPromote> RealPromote;
@@ -136,9 +190,9 @@
typedef VigraFalseType isScalar;\
typedef VigraFalseType isOrdered;\
\
-diff -w -uNr vigra-1.2.0-orig/include/vigra/stdimage.hxx
vigra-1.2.0/include/vigra/stdimage.hxx
---- vigra-1.2.0-orig/include/vigra/stdimage.hxx 2003-08-07
02:16:33.000000000 +0200
-+++ vigra-1.2.0/include/vigra/stdimage.hxx 2004-06-20 14:14:39.000000000
+0200
+diff -Nurd -x'*~' vigra1.2.0.orig/include/vigra/stdimage.hxx
vigra1.2.0/include/vigra/stdimage.hxx
+--- vigra1.2.0.orig/include/vigra/stdimage.hxx 2003-08-06 20:16:33.000000000
-0400
++++ vigra1.2.0/include/vigra/stdimage.hxx 2005-12-05 17:59:36.000000000
-0500
@@ -88,8 +88,18 @@
*/
typedef BasicImage<unsigned char> BImage;
@@ -274,9 +328,9 @@
#define VIGRA_PIXELTYPE TinyVector<float, 2>
VIGRA_DEFINE_ITERATORTRAITS(VIGRA_PIXELTYPE, VectorAccessor, VectorAccessor)
#undef VIGRA_PIXELTYPE
-diff -w -uNr vigra-1.2.0-orig/include/vigra/tinyvector.hxx
vigra-1.2.0/include/vigra/tinyvector.hxx
---- vigra-1.2.0-orig/include/vigra/tinyvector.hxx 2003-08-07
02:16:34.000000000 +0200
-+++ vigra-1.2.0/include/vigra/tinyvector.hxx 2004-05-10 08:31:09.000000000
+0200
+diff -Nurd -x'*~' vigra1.2.0.orig/include/vigra/tinyvector.hxx
vigra1.2.0/include/vigra/tinyvector.hxx
+--- vigra1.2.0.orig/include/vigra/tinyvector.hxx 2003-08-06
20:16:34.000000000 -0400
++++ vigra1.2.0/include/vigra/tinyvector.hxx 2005-12-05 17:59:36.000000000
-0500
@@ -798,6 +798,7 @@
typedef TinyVector<typename NumericTraits<T>::RealPromote, SIZE>
RealPromote;
@@ -301,3 +355,15 @@
typedef VigraFalseType isScalar;\
typedef VigraFalseType isOrdered;\
\
+diff -Nurd -x'*~' vigra1.2.0.orig/src/impex/viff.cxx
vigra1.2.0/src/impex/viff.cxx
+--- vigra1.2.0.orig/src/impex/viff.cxx 2003-08-06 20:16:44.000000000 -0400
++++ vigra1.2.0/src/impex/viff.cxx 2005-12-05 17:59:36.000000000 -0500
+@@ -611,7 +611,7 @@
+ void ViffDecoderImpl::color_map()
+ {
+ void_vector_base temp_bands;
+- unsigned int temp_num_bands;
++ size_t temp_num_bands;
+
+ if ( header.map_storage_type == VFF_MAPTYP_1_BYTE ) {
+ typedef unsigned char map_storage_type;
Index: vigra.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/vigra.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vigra.info 22 Jun 2005 12:23:12 -0000 1.2
+++ vigra.info 5 Dec 2005 23:39:18 -0000 1.3
@@ -8,7 +8,7 @@
Source: http://kogs-www.informatik.uni-hamburg.de/~koethe/%n/%n%v.tar.gz
Source-MD5: fbb385e93d4b40469b04af4bc7079734
UpdateConfigGuessInDirs: config
-ConfigureParams: --disable-shared --docdir=%i/share/doc/%n/
+ConfigureParams: --disable-shared --docdir=%i/share/doc/%n/ --without-fftw
Patch: %n.patch
DocFiles: LICENSE README
SplitOff: <<
@@ -25,6 +25,10 @@
#<<
Description: Computer Vision Library
DescPort: <<
+ Uses "$INSTALL -d" for creating directory hierarchies, so disable
+ use of -p in $INSTALL since -p and -d are mutually exclusive.
+<<
+DescDetail: <<
VIGRA stands for "Vision with Generic Algorithms". It's a novel computer
vision library that puts its main emphasize on customizable algorithms
and data structures. By using template techniques similar to those in
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
