Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29699
Modified Files: tesseract.info tesseract.patch Added Files: tesseract-3.00.info tesseract-3.00.patch Log Message: new version, which is new different lib basename but same libversion, so store in subdir; offload old %v to new .info to preserve old -shlibs Index: tesseract.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/tesseract.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tesseract.info 5 Mar 2012 17:56:07 -0000 1.1 +++ tesseract.info 24 Mar 2013 00:55:49 -0000 1.2 @@ -1,38 +1,37 @@ Package: tesseract -Version: 3.00 +Version: 3.01 Revision: 1 BuildDepends: << + autoconf2.6, + automake1.12, fink (>= 0.24.12-1), fink-package-precedence, - libjpeg8, - liblept2-dev, - libpng15, - libtiff + liblept3-dev, + libtool2 << Depends: << - lib%N3-shlibs (>= %v-%r), - libjpeg8-shlibs, - liblept2-shlibs, - libpng15-shlibs, - libtiff-shlibs + lib%N3-3.01-shlibs (>= %v-%r), + liblept3-shlibs << GCC: 4.0 Source: http://tesseract-ocr.googlecode.com/files/%n-%v.tar.gz -Source-MD5: cc812a261088ea0c3d2da735be35d09f +Source-MD5: 1ba496e51a42358fb9d3ffe781b2d20a Source2: http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz Source2-MD5: d91041ad156cf2db36664e91ef799451 PatchFile: %n.patch -PatchFile-MD5: 309c20f0f42c26f395bcd66caff56e14 +PatchFile-MD5: 6294b614102318d06aaf650bad063b59 PatchScript: << %{default_script} gzip -d ../eng.traineddata.gz << -ConfigureParams: --disable-static +ConfigureParams: --disable-static --libdir=%p/lib/tesseract3.01 LIBLEPT_HEADERSDIR=%p/include CompileScript: << + mkdir m4 + autoreconf -fi %{default_script} fink-package-precedence --prohibit-bdep=%n-dev,lib%n3-dev . << @@ -43,37 +42,31 @@ DocFiles: AUTHORS COPYING ChangeLog NEWS README ReleaseNotes SplitOff: << - Package: lib%N3-shlibs + Package: lib%N3-3.01-shlibs Depends: << %N-data (>= %v-%r), - libjpeg8-shlibs, - liblept2-shlibs, - libpng15-shlibs, - libtiff-shlibs + liblept3-shlibs << - Files: lib/lib*.3.dylib + Files: lib/tesseract3.01/libtesseract.3.dylib Shlibs: << - %p/lib/libtesseract_api.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_ccstruct.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_ccutil.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_classify.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_cutil.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_dict.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_image.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_main.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_textord.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_training.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_viewer.3.dylib 4.0.0 %n (>= 3.00-1) - %p/lib/libtesseract_wordrec.3.dylib 4.0.0 %n (>= 3.00-1) + %p/lib/tesseract3.01/libtesseract.3.dylib 4.0.0 %n (>= 3.01-1) << DocFiles: AUTHORS COPYING ChangeLog NEWS README ReleaseNotes << SplitOff2: << - Package: lib%N3-dev - Depends: lib%N3-shlibs (= %v-%r) - Conflicts: tesseract-dev - Replaces: tesseract-dev + Package: lib%N3-3.01-dev + Depends: lib%N3-3.01-shlibs (= %v-%r) + Conflicts: << + tesseract-dev, + lib%N3-dev, + lib%N3-3.01-dev + << + Replaces: << + tesseract-dev, + lib%N3-dev, + lib%N3-3.01-dev + << BuildDependsOnly: true Files: include lib DocFiles: AUTHORS COPYING ChangeLog NEWS README ReleaseNotes @@ -88,8 +81,6 @@ DescPackaging: << Disable automatic detection of fink at /sw and of MacPorts - Don't hardcode liblept headers prefix (fixed upstream) - Some libs don't fully link/resolve all symbols). Not fixing. Doesn't seem to actually use png and jpeg (only for vs2008/, --- NEW FILE: tesseract-3.00.patch --- diff -Nurd -x'*~' tesseract-3.00.orig/configure tesseract-3.00/configure --- tesseract-3.00.orig/configure 2010-09-30 13:11:56.000000000 -0400 +++ tesseract-3.00/configure 2011-07-08 12:59:07.000000000 -0400 @@ -2893,17 +2893,6 @@ fi # Special cases -case "$host" in - *-darwin* | *-macos10*) - if test -d /opt/local ; then - CPPFLAGS="$CPPFLAGS -I/opt/local/include" - LDFLAGS="$LDFLAGS -L/opt/local/lib" - elif test -d /sw ; then - CPPFLAGS="$CPPFLAGS -I/sw/include" - LDFLAGS="$LDFLAGS -L/sw/lib" - fi - ;; -esac # ---------------------------------------- # Check Compiler Characteristics and @@ -16432,7 +16421,7 @@ # Check location of leptonica/liblept headers. have_lept=no -for incd in /usr/local/include /usr/include +for incd in ${prefix}/include do for lept in . leptonica liblept do Index: tesseract.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/tesseract.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tesseract.patch 5 Mar 2012 17:56:07 -0000 1.1 +++ tesseract.patch 24 Mar 2013 00:55:49 -0000 1.2 @@ -1,7 +1,18 @@ -diff -Nurd -x'*~' tesseract-3.00.orig/configure tesseract-3.00/configure ---- tesseract-3.00.orig/configure 2010-09-30 13:11:56.000000000 -0400 -+++ tesseract-3.00/configure 2011-07-08 12:59:07.000000000 -0400 -@@ -2893,17 +2893,6 @@ +diff -Nurd -x'*~' tesseract-3.01.orig/api/Makefile.am tesseract-3.01/api/Makefile.am +--- tesseract-3.01.orig/api/Makefile.am 2011-10-21 22:40:50.000000000 -0400 ++++ tesseract-3.01/api/Makefile.am 2013-03-23 20:46:37.000000000 -0400 +@@ -52,7 +52,6 @@ + $(top_srcdir)/ccutil/libtesseract_ccutil.la + + libtesseract_la_LDFLAGS += -version-info $(GENERIC_LIBRARY_VERSION) +-libtesseract_la_LDFLAGS += -L./ -L../ -L../api -L../ccutil -L../viewer -L../cutil -L../image -L../ccstruct -L../dict -L../classify -L../wordrec -L../neural_networks/runtime -L../textord -L../cube -L../ccmain + + bin_PROGRAMS = tesseract + tesseract_SOURCES = $(top_srcdir)/api/tesseractmain.cpp +diff -Nurd -x'*~' tesseract-3.01.orig/configure.ac tesseract-3.01/configure.ac +--- tesseract-3.01.orig/configure.ac 2011-10-21 22:40:55.000000000 -0400 ++++ tesseract-3.01/configure.ac 2013-03-22 12:53:40.000000000 -0400 +@@ -120,17 +120,6 @@ fi # Special cases @@ -19,12 +30,3 @@ # ---------------------------------------- # Check Compiler Characteristics and -@@ -16432,7 +16421,7 @@ - - # Check location of leptonica/liblept headers. - have_lept=no --for incd in /usr/local/include /usr/include -+for incd in ${prefix}/include - do - for lept in . leptonica liblept - do --- NEW FILE: tesseract-3.00.info --- Package: tesseract Version: 3.00 Revision: 2 BuildDepends: << fink (>= 0.24.12-1), fink-package-precedence, libjpeg8, liblept3-dev, libpng15, libtiff5 << Depends: << lib%N3-shlibs (>= %v-%r), libjpeg8-shlibs, liblept3-shlibs, libpng15-shlibs, libtiff5-shlibs << GCC: 4.0 Source: http://tesseract-ocr.googlecode.com/files/%n-%v.tar.gz Source-MD5: cc812a261088ea0c3d2da735be35d09f Source2: http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz Source2-MD5: d91041ad156cf2db36664e91ef799451 PatchFile: %n-%v.patch PatchFile-MD5: 309c20f0f42c26f395bcd66caff56e14 PatchScript: << %{default_script} gzip -d ../eng.traineddata.gz << ConfigureParams: --disable-static CompileScript: << %{default_script} fink-package-precedence --prohibit-bdep=%n-dev,lib%n3-dev . << InstallScript: << make install DESTDIR=%d install -m 644 ../eng.traineddata %i/share/tessdata << DocFiles: AUTHORS COPYING ChangeLog NEWS README ReleaseNotes SplitOff: << Package: lib%N3-shlibs Depends: << %N-data (>= %v-%r), libjpeg8-shlibs, liblept3-shlibs, libpng15-shlibs, libtiff5-shlibs << Files: lib/lib*.3.dylib Shlibs: << %p/lib/libtesseract_api.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_ccstruct.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_ccutil.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_classify.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_cutil.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_dict.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_image.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_main.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_textord.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_training.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_viewer.3.dylib 4.0.0 %n (>= 3.00-1) %p/lib/libtesseract_wordrec.3.dylib 4.0.0 %n (>= 3.00-1) << DocFiles: AUTHORS COPYING ChangeLog NEWS README ReleaseNotes << SplitOff2: << Package: lib%N3-dev Depends: lib%N3-shlibs (= %v-%r) Conflicts: << tesseract-dev, lib%N3-dev, lib%N3-3.01-dev << Replaces: << tesseract-dev, lib%N3-dev, lib%N3-3.01-dev << BuildDependsOnly: true Files: include lib DocFiles: AUTHORS COPYING ChangeLog NEWS README ReleaseNotes << SplitOff3: << Package: %N-data Files: share/tessdata DocFiles: AUTHORS COPYING ChangeLog NEWS README ReleaseNotes << DescPackaging: << Disable automatic detection of fink at /sw and of MacPorts Don't hardcode liblept headers prefix Some libs don't fully link/resolve all symbols). Not fixing. Doesn't seem to actually use png and jpeg (only for vs2008/, which is not used anywhere) after detecting them, but trivial or common pkgs so not bothering to diagnose/disable/cleanup. << DescDetail: << A commercial quality OCR engine originally developed at HP between 1985 and 1995. In 1995, this engine was among the top 3 evaluated by UNLV. It was open-sourced by HP and UNLV in 2005. << Description: Optical character recognition engine Homepage: http://code.google.com/p/tesseract-ocr/ License: BSD Maintainer: Daniel Macks <dma...@netspace.org> ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_mar _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs