diff --git a/media-libs/leptonica/leptonica-1.72.recipe b/media-libs/leptonica/leptonica-1.73.recipe similarity index 98% rename from media-libs/leptonica/leptonica-1.72.recipe rename to media-libs/leptonica/leptonica-1.73.recipe index 4c1f74e0c..8c172c9dd 100644 --- a/media-libs/leptonica/leptonica-1.72.recipe +++ b/media-libs/leptonica/leptonica-1.73.recipe @@ -9,16 +9,16 @@ and image analysis operations. It's long list of features includes: " HOMEPAGE="http://code.google.com/p/leptonica" SOURCE_URI="http://www.leptonica.org/source/leptonica-$portVersion.tar.gz" -CHECKSUM_SHA256="79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56" +CHECKSUM_SHA256="19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1" LICENSE="BSD (2-clause)" COPYRIGHT="2001-2012 Dan Bloomberg" -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" leptonica$secondaryArchSuffix = $portVersion - lib:liblept$secondaryArchSuffix = 4.0.3 compat >= 4 + lib:liblept$secondaryArchSuffix = 5.0.0 compat >= 5 " REQUIRES=" @@ -80,7 +80,7 @@ INSTALL() PROVIDES_devel=" leptonica${secondaryArchSuffix}_devel = $portVersion - devel:liblept$secondaryArchSuffix = 4.0.3 compat >= 4 + devel:liblept$secondaryArchSuffix = 5.0.0 compat >= 5 " REQUIRES_devel=" diff --git a/media-libs/leptonica/patches/leptonica-1.72.patchset b/media-libs/leptonica/patches/leptonica-1.72.patchset deleted file mode 100644 index 23a398a35..000000000 --- a/media-libs/leptonica/patches/leptonica-1.72.patchset +++ /dev/null @@ -1,109 +0,0 @@ -From 91b78c7cdb8b549ea157fd5c27c34a9acd4c5f87 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 31 Mar 2015 10:55:28 +0300 -Subject: Haiku patch - - -diff --git a/src/sarray.c b/src/sarray.c -index 32ff12f..531bb9d 100644 ---- a/src/sarray.c -+++ b/src/sarray.c -@@ -137,6 +137,7 @@ - #include - #ifndef _WIN32 - #include /* unix only */ -+#include - #endif /* ! _WIN32 */ - #include "allheaders.h" - -@@ -1868,6 +1869,7 @@ l_int32 len; - SARRAY *safiles; - DIR *pdir; - struct dirent *pdirentry; -+struct stat s; - - PROCNAME("getFilenamesInDirectory"); - -@@ -1887,7 +1889,8 @@ struct dirent *pdirentry; - * define _BSD_SOURCE in the CC command, because the DT_DIR - * flag is non-standard. */ - #if !defined(__SOLARIS__) -- if (pdirentry->d_type == DT_DIR) -+ stat(pdirentry->d_name, &s); -+ if(S_ISDIR(s.st_mode)) - continue; - #endif - --- -1.8.3.4 - - -From cc2615d0dbf87f8f1d204006d4af9414d245a2bc Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Tue, 31 Mar 2015 10:56:57 +0300 -Subject: gcc2 fixes - - -diff --git a/src/boxfunc1.c b/src/boxfunc1.c -index 9b4705d..eb3813f 100644 ---- a/src/boxfunc1.c -+++ b/src/boxfunc1.c -@@ -77,6 +77,7 @@ - * box1, and 0 otherwise) - * Return: 0 if OK, 1 on error - */ -+l_int32 x1, y1, w1, h1, x2, y2, w2, h2; - l_int32 - boxContains(BOX *box1, - BOX *box2, -@@ -87,7 +88,6 @@ boxContains(BOX *box1, - 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 11f0f37..841d1ca 100644 ---- a/src/compare.c -+++ b/src/compare.c -@@ -1909,6 +1909,7 @@ l_int32 *tab; - l_float32 maxscore, score; - FPIX *fpix; - PIX *pix3, *pix4; -+char buf[128]; - - PROCNAME("pixBestCorrelation"); - -@@ -1955,7 +1956,6 @@ PIX *pix3, *pix4; - - if (debugflag > 0) { - lept_mkdir("lept"); -- char buf[128]; - pix3 = fpixDisplayMaxDynamicRange(fpix); - pix4 = pixExpandReplicate(pix3, 20); - snprintf(buf, sizeof(buf), "/tmp/lept/correl_%d.png", debugflag); -diff --git a/src/recogident.c b/src/recogident.c -index 3db8b36..adea42b 100644 ---- a/src/recogident.c -+++ b/src/recogident.c -@@ -781,6 +781,7 @@ l_float32 maxscore, score; - l_float32 *ycent1; - FPIX *fpix; - PIX *pixt, *pixt1, *pixt2; -+char buf[128]; - - PROCNAME("pixCorrelationBestShift"); - -@@ -869,7 +870,6 @@ PIX *pixt, *pixt1, *pixt2; - - if (debugflag > 0) { - lept_mkdir("recog"); -- char buf[128]; - pixt1 = fpixDisplayMaxDynamicRange(fpix); - pixt2 = pixExpandReplicate(pixt1, 5); - snprintf(buf, sizeof(buf), "/tmp/recog/junkbs_%d.png", debugflag); --- -1.8.3.4 - diff --git a/media-libs/leptonica/patches/leptonica-1.73.patchset b/media-libs/leptonica/patches/leptonica-1.73.patchset new file mode 100644 index 000000000..a6155c585 --- /dev/null +++ b/media-libs/leptonica/patches/leptonica-1.73.patchset @@ -0,0 +1,178 @@ +From c8a63f182efb5b5e4bca552ed08e0833cd09343a Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 @@ + #include + #ifndef _WIN32 + #include /* unix only */ ++#include + #endif /* ! _WIN32 */ + #include "allheaders.h" + +@@ -2282,6 +2283,7 @@ l_int32 len; + SARRAY *safiles; + DIR *pdir; + struct dirent *pdirentry; ++struct stat s; + + PROCNAME("getFilenamesInDirectory"); + +@@ -2301,7 +2303,8 @@ struct dirent *pdirentry; + * define _BSD_SOURCE in the CC command, because the DT_DIR + * flag is non-standard. */ + #if !defined(__SOLARIS__) +- if (pdirentry->d_type == DT_DIR) ++ stat(pdirentry->d_name, &s); ++ if(S_ISDIR(s.st_mode)) + continue; + #endif + +-- +2.7.0 + + +From 922cf3f611322d8f2922e478d954c0beae6bd6e0 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +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 +--- a/src/compare.c ++++ b/src/compare.c +@@ -3245,6 +3245,7 @@ l_int32 *tab; + l_float32 maxscore, score; + FPIX *fpix; + PIX *pix3, *pix4; ++char buf[128]; + + PROCNAME("pixBestCorrelation"); + +@@ -3291,7 +3292,6 @@ PIX *pix3, *pix4; + + if (debugflag > 0) { + lept_mkdir("lept/comp"); +- char buf[128]; + pix3 = fpixDisplayMaxDynamicRange(fpix); + 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 +--- a/src/map.c ++++ b/src/map.c +@@ -104,13 +104,14 @@ + L_AMAP * + l_amapCreate(l_int32 keytype) + { ++ L_AMAP *m; + PROCNAME("l_amapCreate"); + + if (keytype != L_INT_TYPE && keytype != L_UINT_TYPE && + keytype != L_FLOAT_TYPE) + return (L_AMAP *)ERROR_PTR("invalid keytype", procName, NULL); + +- L_AMAP *m = (L_AMAP *)LEPT_CALLOC(1, sizeof(L_AMAP)); ++ m = (L_AMAP *)LEPT_CALLOC(1, sizeof(L_AMAP)); + m->keytype = keytype; + return m; + } +@@ -180,13 +181,14 @@ l_amapSize(L_AMAP *m) + L_ASET * + l_asetCreate(l_int32 keytype) + { ++ L_ASET *s; + PROCNAME("l_asetCreate"); + + if (keytype != L_INT_TYPE && keytype != L_UINT_TYPE && + keytype != L_FLOAT_TYPE) + return (L_ASET *)ERROR_PTR("invalid keytype", procName, NULL); + +- L_ASET *s = (L_ASET *)LEPT_CALLOC(1, sizeof(L_ASET)); ++ s = (L_ASET *)LEPT_CALLOC(1, sizeof(L_ASET)); + s->keytype = keytype; + return s; + } +diff --git a/src/rbtree.c b/src/rbtree.c +index 048d54d..f0d8229 100644 +--- a/src/rbtree.c ++++ b/src/rbtree.c +@@ -132,13 +132,14 @@ static void delete_case6(L_RBTREE *t, node *n); + L_RBTREE * + l_rbtreeCreate(l_int32 keytype) + { ++ L_RBTREE *t; + PROCNAME("l_rbtreeCreate"); + + if (keytype != L_INT_TYPE && keytype != L_UINT_TYPE && + keytype != L_FLOAT_TYPE && keytype) + return (L_RBTREE *)ERROR_PTR("invalid keytype", procName, NULL); + +- L_RBTREE *t = (L_RBTREE *)LEPT_CALLOC(1, sizeof(L_RBTREE)); ++ t = (L_RBTREE *)LEPT_CALLOC(1, sizeof(L_RBTREE)); + t->keytype = keytype; + verify_properties(t); + return t; +@@ -155,12 +156,13 @@ RB_TYPE * + l_rbtreeLookup(L_RBTREE *t, + RB_TYPE key) + { ++ node *n; + PROCNAME("l_rbtreeLookup"); + + if (!t) + return (RB_TYPE *)ERROR_PTR("tree is null\n", procName, NULL); + +- node *n = lookup_node(t, key); ++ n = lookup_node(t, key); + return n == NULL ? NULL : &n->value; + } + +diff --git a/src/recogident.c b/src/recogident.c +index ef2e0df..f48f586 100644 +--- a/src/recogident.c ++++ b/src/recogident.c +@@ -778,6 +778,7 @@ l_float32 maxscore, score; + l_float32 *ycent1; + FPIX *fpix; + PIX *pixt, *pixt1, *pixt2; ++char buf[128]; + + PROCNAME("pixCorrelationBestShift"); + +@@ -866,7 +867,6 @@ PIX *pixt, *pixt1, *pixt2; + + if (debugflag > 0) { + lept_mkdir("lept/recog"); +- char buf[128]; + pixt1 = fpixDisplayMaxDynamicRange(fpix); + pixt2 = pixExpandReplicate(pixt1, 5); + snprintf(buf, sizeof(buf), "/tmp/lept/recog/junkbs_%d.png", debugflag); +-- +2.7.0 +