[oe] [RFC][PATCH] fbreader: add 0.8.17 recipe for both fbreader and fbreader-opie

Dmitry Eremin-Solenikov dbaryshkov at gmail.com
Tue Dec 9 07:19:06 UTC 2008 

Add new version recipe. Also add fbreader-opie_0.8.17 recipe which will
build fbreader for use with Opie environment.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
---
 .../fbreader-0.8.17_buildsys_oe.patch              |   37 ++++++++++++++++++++
 .../fbreader-0.8.17_buildsys_oe.patch              |   37 ++++++++++++++++++++
 packages/fbreader/fbreader-opie_0.8.17.bb          |   18 +++++++++
 packages/fbreader/fbreader_0.8.17.bb               |   13 +++++++
 4 files changed, 105 insertions(+), 0 deletions(-)
 create mode 100644 packages/fbreader/fbreader-0.8.17/fbreader-0.8.17_buildsys_oe.patch
 create mode 100644 packages/fbreader/fbreader-opie-0.8.17/fbreader-0.8.17_buildsys_oe.patch
 create mode 100644 packages/fbreader/fbreader-opie_0.8.17.bb
 create mode 100644 packages/fbreader/fbreader_0.8.17.bb

diff --git a/packages/fbreader/fbreader-0.8.17/fbreader-0.8.17_buildsys_oe.patch b/packages/fbreader/fbreader-0.8.17/fbreader-0.8.17_buildsys_oe.patch
new file mode 100644
index 0000000..9c18118
--- /dev/null
+++ b/packages/fbreader/fbreader-0.8.17/fbreader-0.8.17_buildsys_oe.patch
@@ -0,0 +1,37 @@
+Index: fbreader-0.8.17/makefiles/arch/openzaurus.mk
+===================================================================
+--- fbreader-0.8.17.orig/makefiles/arch/openzaurus.mk	2008-11-23 14:44:17.149701776 +0300
++++ fbreader-0.8.17/makefiles/arch/openzaurus.mk	2008-11-23 14:56:41.825702915 +0300
+@@ -1,7 +1,7 @@
+ include $(ROOTDIR)/makefiles/arch/unix.mk
+ 
+ ifeq "$(UI_TYPE)" "opie"
+-  INSTALLDIR = /opt/QtPalmtop
++  INSTALLDIR = /usr/lib/opie
+   IMAGEDIR = $(INSTALLDIR)/pics
+ else # UI_TYPE == gpe
+   INSTALLDIR = /usr
+@@ -17,7 +17,7 @@ LIBPATH = $(BASEPATH)/arm-linux/lib
+ RM = rm -rvf
+ RM_QUIET = rm -rf
+ QTINCLUDE = -I $(INCPATH)/qt2
+-GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0
++GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/cairo -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0
+ MOC = $(TOOLSPATH)/moc
+ CC = $(TOOLSPATH)/arm-linux-gcc
+ AR = $(TOOLSPATH)/arm-linux-ar rsu
+@@ -27,10 +27,10 @@ XML_LIB = -lexpat
+ ARCHIVER_LIB = -lz -lbz2
+ 
+ ifeq "$(UI_TYPE)" "opie"
+-	UILIBS = -lqte -lqpe
++	UILIBS = -lqte-mt
+ else
+-	UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
++	UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
+ endif
+ 
+-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param inline-unit-growth=200 --param large-function-growth=400 -Wall -Wno-ctor-dtor-privacy -W -Winline
+-LDFLAGS = -Wl,-rpath,$(LIBDIR)
++CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti $(OE_CFLAGS)
++LDFLAGS = -Wl,-rpath,$(LIBDIR) -Wl,-rpath,$(LIBPATH) -L$(LIBPATH)
diff --git a/packages/fbreader/fbreader-opie-0.8.17/fbreader-0.8.17_buildsys_oe.patch b/packages/fbreader/fbreader-opie-0.8.17/fbreader-0.8.17_buildsys_oe.patch
new file mode 100644
index 0000000..ab48513
--- /dev/null
+++ b/packages/fbreader/fbreader-opie-0.8.17/fbreader-0.8.17_buildsys_oe.patch
@@ -0,0 +1,37 @@
+Index: fbreader-0.8.17/makefiles/arch/openzaurus.mk
+===================================================================
+--- fbreader-0.8.17.orig/makefiles/arch/openzaurus.mk	2008-11-23 14:44:17.149701776 +0300
++++ fbreader-0.8.17/makefiles/arch/openzaurus.mk	2008-11-23 14:56:41.825702915 +0300
+@@ -1,7 +1,7 @@
+ include $(ROOTDIR)/makefiles/arch/unix.mk
+ 
+ ifeq "$(UI_TYPE)" "opie"
+-  INSTALLDIR = /opt/QtPalmtop
++  INSTALLDIR = /usr/lib/opie
+   IMAGEDIR = $(INSTALLDIR)/pics
+ else # UI_TYPE == gpe
+   INSTALLDIR = /usr
+@@ -17,7 +17,7 @@ LIBPATH = $(BASEPATH)/arm-linux/lib
+ RM = rm -rvf
+ RM_QUIET = rm -rf
+ QTINCLUDE = -I $(INCPATH)/qt2
+-GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0
++GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/cairo -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0
+ MOC = $(TOOLSPATH)/moc
+ CC = $(TOOLSPATH)/arm-linux-gcc
+ AR = $(TOOLSPATH)/arm-linux-ar rsu
+@@ -27,10 +27,10 @@ XML_LIB = -lexpat
+ ARCHIVER_LIB = -lz -lbz2
+ 
+ ifeq "$(UI_TYPE)" "opie"
+-	UILIBS = -lqte -lqpe
++	UILIBS = -lqte-mt -lqpe
+ else
+-	UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
++	UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
+ endif
+ 
+-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param inline-unit-growth=200 --param large-function-growth=400 -Wall -Wno-ctor-dtor-privacy -W -Winline
+-LDFLAGS = -Wl,-rpath,$(LIBDIR)
++CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti $(OE_CFLAGS)
++LDFLAGS = -Wl,-rpath,$(LIBDIR) -Wl,-rpath,$(LIBPATH) -L$(LIBPATH)
diff --git a/packages/fbreader/fbreader-opie_0.8.17.bb b/packages/fbreader/fbreader-opie_0.8.17.bb
new file mode 100644
index 0000000..55728f8
--- /dev/null
+++ b/packages/fbreader/fbreader-opie_0.8.17.bb
@@ -0,0 +1,18 @@
+require fbreader.inc
+
+SECTION = "opie/applications"
+DEPENDS += "virtual/libqte2 liblinebreak"
+PR = "r0"
+
+SRC_URI += "file://fbreader-0.8.17_buildsys_oe.patch;patch=1"
+EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='-fno-exceptions -fno-rtti ${CXXFLAGS} -I${STAGING_DIR_HOST}/qt2/include/' MOC='${STAGING_BINDIR_NATIVE}/moc' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_DIR_HOST}/qt2/lib'"
+
+READER_GUI = "opie"
+FILES_${PN} += " ${libdir}/opie/ "
+FILES_${PN}-dbg += " ${libdir}/opie/.debug "
+
+do_install () {
+        oe_runmake install 'DESTDIR=${D}' RESOLUTION=${READER_RESOLUTION}
+}
+
+S = "${WORKDIR}/fbreader-${PV}"
diff --git a/packages/fbreader/fbreader_0.8.17.bb b/packages/fbreader/fbreader_0.8.17.bb
new file mode 100644
index 0000000..ac10960
--- /dev/null
+++ b/packages/fbreader/fbreader_0.8.17.bb
@@ -0,0 +1,13 @@
+require fbreader.inc
+
+SECTION = "x11/utils"
+DEPENDS += "gtk+ libgpewidget liblinebreak"
+PR = "r0"
+
+SRC_URI += "file://fbreader-0.8.17_buildsys_oe.patch;patch=1"
+
+inherit pkgconfig
+
+do_install () {
+        oe_runmake install 'DESTDIR=${D}' RESOLUTION=${READER_RESOLUTION}
+}
-- 
1.5.6.5

More information about the Openembedded-devel mailing list