leptonica: bump version.

media-libs/leptonica/leptonica-1.74.4.recipe

@@ -8,9 +8,9 @@ and image analysis operations. It's long list of features includes:
 HOMEPAGE="http://www.leptonica.org/"
 COPYRIGHT="2001-2012 Dan Bloomberg"
 LICENSE="BSD (2-clause)"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="http://www.leptonica.org/source/leptonica-$portVersion.tar.gz"
-CHECKSUM_SHA256="19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1"
+CHECKSUM_SHA256="29c35426a416bf454413c6fec24c24a0b633e26144a17e98351b6dffaa4a833b"
 PATCHES="leptonica-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -18,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	leptonica$secondaryArchSuffix = $portVersion
-	lib:liblept$secondaryArchSuffix = 5.0.0 compat >= 5
+	lib:liblept$secondaryArchSuffix = 5.0.1 compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -31,7 +31,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	leptonica${secondaryArchSuffix}_devel = $portVersion
-	devel:liblept$secondaryArchSuffix = 5.0.0 compat >= 5
+	devel:liblept$secondaryArchSuffix = 5.0.1 compat >= 5
 	"
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
@@ -267,21 +267,18 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
-	cmd:ar$secondaryArchSuffix
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:makeinfo
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake -a
+	autoreconf -fi
 	# override CFLAGS to make gcc2 happy by not passing the -g option
 	CFLAGS=-O2 runConfigure ./configure
 	make $jobArgs
@@ -295,8 +292,8 @@ INSTALL()
 	prepareInstalledDevelLibs liblept
 
 	packageEntries devel \
-				$developDir
+		$developDir
 
 	packageEntries tools \
-				$binDir
+		$binDir
 }

media-libs/leptonica/patches/leptonica-1.74.4.patchset

@@ -1,14 +1,14 @@
-From c8a63f182efb5b5e4bca552ed08e0833cd09343a Mon Sep 17 00:00:00 2001
+From 58df7954c3512064aa974a08056a64213ca0aafe Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 31 Mar 2015 10:55:28 +0300
 Subject: Haiku patch
 
 
-diff --git a/src/sarray.c b/src/sarray.c
-index f6d139e..9ce239e 100644
---- a/src/sarray.c
-+++ b/src/sarray.c
-@@ -149,6 +149,7 @@
+diff --git a/src/sarray1.c b/src/sarray1.c
+index 8142699..0761ee6 100644
+--- a/src/sarray1.c
++++ b/src/sarray1.c
+@@ -132,6 +132,7 @@
  #include <string.h>
  #ifndef _WIN32
  #include <dirent.h>     /* unix only */
@@ -16,7 +16,7 @@ index f6d139e..9ce239e 100644
  #endif  /* ! _WIN32 */
  #include "allheaders.h"
  
-@@ -2282,6 +2283,7 @@ l_int32         len;
+@@ -1852,6 +1853,7 @@ l_int32         len;
  SARRAY         *safiles;
  DIR            *pdir;
  struct dirent  *pdirentry;
@@ -24,7 +24,7 @@ index f6d139e..9ce239e 100644
  
      PROCNAME("getFilenamesInDirectory");
  
-@@ -2301,7 +2303,8 @@ struct dirent  *pdirentry;
+@@ -1870,7 +1872,8 @@ struct dirent  *pdirentry;
           * define _BSD_SOURCE in the CC command, because the DT_DIR
           * flag is non-standard.  */
  #if !defined(__SOLARIS__)
@@ -35,38 +35,20 @@ index f6d139e..9ce239e 100644
  #endif
  
 -- 
-2.7.0
+2.13.1
 
 
-From 922cf3f611322d8f2922e478d954c0beae6bd6e0 Mon Sep 17 00:00:00 2001
+From 42bba88459f0e568b205fa2ea07afed87ebec2ab Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 31 Mar 2015 10:56:57 +0300
 Subject: gcc2 fixes
 
 
-diff --git a/src/boxfunc1.c b/src/boxfunc1.c
-index bb90f66..764d97e 100644
---- a/src/boxfunc1.c
-+++ b/src/boxfunc1.c
-@@ -82,12 +82,12 @@ boxContains(BOX     *box1,
-             BOX     *box2,
-             l_int32 *presult)
- {
-+l_int32  x1, y1, w1, h1, x2, y2, w2, h2;
-     PROCNAME("boxContains");
- 
-     if (!box1 || !box2)
-         return ERROR_INT("box1 and box2 not both defined", procName, 1);
- 
--l_int32  x1, y1, w1, h1, x2, y2, w2, h2;
- 
-     boxGetGeometry(box1, &x1, &y1, &w1, &h1);
-     boxGetGeometry(box2, &x2, &y2, &w2, &h2);
 diff --git a/src/compare.c b/src/compare.c
-index 9dd891a..92e6940 100644
+index 8a34b89..564dd38 100644
 --- a/src/compare.c
 +++ b/src/compare.c
-@@ -3245,6 +3245,7 @@ l_int32   *tab;
+@@ -3365,6 +3365,7 @@ l_int32   *tab;
  l_float32  maxscore, score;
  FPIX      *fpix;
  PIX       *pix3, *pix4;
@@ -74,7 +56,7 @@ index 9dd891a..92e6940 100644
  
      PROCNAME("pixBestCorrelation");
  
-@@ -3291,7 +3292,6 @@ PIX       *pix3, *pix4;
+@@ -3411,7 +3412,6 @@ PIX       *pix3, *pix4;
  
      if (debugflag > 0) {
          lept_mkdir("lept/comp");
@@ -83,10 +65,10 @@ index 9dd891a..92e6940 100644
          pix4 = pixExpandReplicate(pix3, 20);
          snprintf(buf, sizeof(buf), "/tmp/lept/comp/correl_%d.png",
 diff --git a/src/map.c b/src/map.c
-index 5283256..72a9cdb 100644
+index 71b3923..c2311f2 100644
 --- a/src/map.c
 +++ b/src/map.c
-@@ -104,13 +104,14 @@
+@@ -106,13 +106,14 @@
  L_AMAP *
  l_amapCreate(l_int32  keytype)
  {
@@ -102,7 +84,7 @@ index 5283256..72a9cdb 100644
      m->keytype = keytype;
      return m;
  }
-@@ -180,13 +181,14 @@ l_amapSize(L_AMAP  *m)
+@@ -182,13 +183,14 @@ l_amapSize(L_AMAP  *m)
  L_ASET *
  l_asetCreate(l_int32  keytype)
  {
@@ -119,10 +101,10 @@ index 5283256..72a9cdb 100644
      return s;
  }
 diff --git a/src/rbtree.c b/src/rbtree.c
-index 048d54d..f0d8229 100644
+index 4092b7d..4fa878d 100644
 --- a/src/rbtree.c
 +++ b/src/rbtree.c
-@@ -132,13 +132,14 @@ static void delete_case6(L_RBTREE *t, node *n);
+@@ -131,13 +131,14 @@ static void verify_properties(L_RBTREE *t);
  L_RBTREE *
  l_rbtreeCreate(l_int32  keytype)
  {
@@ -138,7 +120,7 @@ index 048d54d..f0d8229 100644
      t->keytype = keytype;
      verify_properties(t);
      return t;
-@@ -155,12 +156,13 @@ RB_TYPE *
+@@ -154,12 +155,13 @@ RB_TYPE *
  l_rbtreeLookup(L_RBTREE  *t,
                 RB_TYPE    key)
  {
@@ -154,10 +136,10 @@ index 048d54d..f0d8229 100644
  }
  
 diff --git a/src/recogident.c b/src/recogident.c
-index ef2e0df..f48f586 100644
+index 19d06dd..a621268 100644
 --- a/src/recogident.c
 +++ b/src/recogident.c
-@@ -778,6 +778,7 @@ l_float32   maxscore, score;
+@@ -742,6 +742,7 @@ l_float32   maxscore, score;
  l_float32  *ycent1;
  FPIX       *fpix;
  PIX        *pixt, *pixt1, *pixt2;
@@ -165,7 +147,7 @@ index ef2e0df..f48f586 100644
  
      PROCNAME("pixCorrelationBestShift");
  
-@@ -866,7 +867,6 @@ PIX        *pixt, *pixt1, *pixt2;
+@@ -830,7 +831,6 @@ PIX        *pixt, *pixt1, *pixt2;
  
      if (debugflag > 0) {
          lept_mkdir("lept/recog");
@@ -174,5 +156,5 @@ index ef2e0df..f48f586 100644
          pixt2 = pixExpandReplicate(pixt1, 5);
          snprintf(buf, sizeof(buf), "/tmp/lept/recog/junkbs_%d.png", debugflag);
 -- 
-2.7.0
+2.13.1