aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-05-03 11:50:29 -0400
committerArmin Kuster <akuster808@gmail.com>2016-08-16 10:29:40 -0700
commit232d1943d3f32f2047e3df37f67bdce88d33a4e8 (patch)
tree58161d99693572ef3e548de18431ab4a10cdd7df
parent03a71a69cd6b161e223fd906e7db627f21d329fd (diff)
downloadmeta-openembedded-contrib-232d1943d3f32f2047e3df37f67bdce88d33a4e8.tar.gz
meta-openembedded-contrib-232d1943d3f32f2047e3df37f67bdce88d33a4e8.tar.bz2
meta-openembedded-contrib-232d1943d3f32f2047e3df37f67bdce88d33a4e8.zip
fbreader: add cflags fix for fribidi 0.19.7
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 5bece73f64ae7f736cd08eef387d67d74e31a424) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch11
-rw-r--r--meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb3
2 files changed, 13 insertions, 1 deletions
diff --git a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch
new file mode 100644
index 0000000000..e72fa8cf2f
--- /dev/null
+++ b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch
@@ -0,0 +1,11 @@
+--- fbreader-0.12.10/makefiles/config.mk.orig 2016-05-03 11:11:07.259734561 -0400
++++ fbreader-0.12.10/makefiles/config.mk 2016-05-03 11:11:37.447735786 -0400
+@@ -38,7 +38,7 @@
+ LDFLAGS += -pg
+ endif
+
+-ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include
++ZINCLUDE = $(shell pkg-config --cflags fribidi) -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include
+
+ ZLSHARED ?= yes
+
diff --git a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
index e9ead0f248..1487f11a2c 100644
--- a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
+++ b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
@@ -9,7 +9,8 @@ PR = "r1"
SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
file://Makefile.patch \
-file://gcc45.patch"
+file://gcc45.patch \
+file://fix-cflags-fribidi.patch"
# Set the defaults
READER_RESOLUTION ?= "1024x600"