summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Lipp2015-06-23 11:16:26 +0200
committerMoritz Lipp2015-06-23 11:16:56 +0200
commit588245e751c92d6c9a7b25cdbc5f6e5905f73ae3 (patch)
tree1ac90ab1f73f8ce4e6ad08eed7ee96bf0207a64f
parent39d42d02e80fef796033bb74feb01630c963cfe7 (diff)
downloadaur-588245e751c92d6c9a7b25cdbc5f6e5905f73ae3.tar.gz
Update to 0.23
-rw-r--r--.SRCINFO8
-rw-r--r--0001-Invalid-operands-to-binary-operator-in-findNextColor.patch29
-rw-r--r--PKGBUILD13
3 files changed, 44 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e3b88528eebe..ac1103007055 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = fmbt
pkgdesc = Free Model Based tool
- pkgver = 0.22
+ pkgver = 0.23
pkgrel = 1
url = https://01.org/fmbt/
arch = x86_64
@@ -24,8 +24,10 @@ pkgbase = fmbt
depends = python2-shiboken
depends = tesseract
depends = tesseract-data-eng
- source = https://github.com/01org/fMBT/archive/v0.22.tar.gz
- md5sums = febc90273b6d55af019a797b10113031
+ source = https://github.com/01org/fMBT/archive/v0.23.tar.gz
+ source = 0001-Invalid-operands-to-binary-operator-in-findNextColor.patch
+ md5sums = c67e99833607a84e9c493a23526a797b
+ md5sums = e443161ac39c16af976758b2c946b589
pkgname = fmbt
diff --git a/0001-Invalid-operands-to-binary-operator-in-findNextColor.patch b/0001-Invalid-operands-to-binary-operator-in-findNextColor.patch
new file mode 100644
index 000000000000..5a4150ad868a
--- /dev/null
+++ b/0001-Invalid-operands-to-binary-operator-in-findNextColor.patch
@@ -0,0 +1,29 @@
+From c4b0c614e0989eeaa11853edab427a08810ccfb7 Mon Sep 17 00:00:00 2001
+From: Moritz Lipp <mlq@pwmt.org>
+Date: Tue, 23 Jun 2015 11:02:07 +0200
+Subject: [PATCH] Invalid operands to binary operator in findNextColor
+
+---
+ utils/eye4graphics.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/utils/eye4graphics.cc b/utils/eye4graphics.cc
+index ac9594e..3c5ddaa 100644
+--- a/utils/eye4graphics.cc
++++ b/utils/eye4graphics.cc
+@@ -568,9 +568,9 @@ int findNextColor(BoundingBox* bbox,
+ bbox->right = x;
+ bbox->top = y;
+ bbox->bottom = y;
+- bbox->error = (((hay_pixel.red & 0xff) << 16) +
+- ((hay_pixel.green & 0xff) << 8) +
+- (hay_pixel.blue & 0xff));
++ bbox->error = ((((int) hay_pixel.red & 0xff) << 16) +
++ (((int) hay_pixel.green & 0xff) << 8) +
++ ((int) hay_pixel.blue & 0xff));
+ return 1;
+ }
+ }
+--
+2.4.4
+
diff --git a/PKGBUILD b/PKGBUILD
index d3f1c7f771c8..c79cf9dd756e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Moritz Lipp <mail@mlq.me>
pkgname=fmbt
_pkgname=fMBT
-pkgver=0.22
+pkgver=0.23
pkgrel=1
epoch=
pkgdesc="Free Model Based tool"
@@ -28,8 +28,15 @@ depends=(
'tesseract'
'tesseract-data-eng'
)
-source=(https://github.com/01org/$_pkgname/archive/v$pkgver.tar.gz)
-md5sums=('febc90273b6d55af019a797b10113031')
+source=(https://github.com/01org/$_pkgname/archive/v$pkgver.tar.gz
+0001-Invalid-operands-to-binary-operator-in-findNextColor.patch)
+md5sums=('c67e99833607a84e9c493a23526a797b'
+ 'e443161ac39c16af976758b2c946b589')
+
+prepare() {
+ cd "$_pkgname-$pkgver"
+ patch -p1 < $srcdir/0001-Invalid-operands-to-binary-operator-in-findNextColor.patch
+}
build() {
cd "$_pkgname-$pkgver"