fbreader: split common packaging funcionality

RFC PATCH In review Dmitry Eremin-Solenikov 1 participant 3 messages Dec 9, 2008

lore

Share & tools

lore

Dmitry Eremin-Solenikov

author

2008-12-09 07:24 UTC #0 lore raw

RFC PATCH 1/1 fbreader: split common packaging funcionality

To ease creating fbreader-opie split away common fbreader packaging functionality.

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>

---
 .../fbreader/{fbreader_0.8.2a.bb => fbreader.inc}  |   42 ++++++++------
 packages/fbreader/fbreader_0.8.2a.bb               |   58 ++------------------
 .../480x640-buildfix.patch                         |    0 
 3 files changed, 29 insertions(+), 71 deletions(-)
 copy packages/fbreader/{fbreader_0.8.2a.bb => fbreader.inc} (65%)
 rename packages/fbreader/{fbreader-0.8.2a => files}/480x640-buildfix.patch (100%)

packages/fbreader/fbreader.inc renamed from packages/fbreader/fbreader_0.8.2a.bb +24 ~~-18~~

similarity index 65%
copy from packages/fbreader/fbreader_0.8.2a.bb
copy to packages/fbreader/fbreader.inc
index 7d6a2b0..d392560 100644
@@ -3,23 +3,28 @@ HOMEPAGE = "http://www.fbreader.org"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv"
-PR = "r5"
+DEPENDS = "enca expat bzip2 virtual/libiconv"
+
+FILES_${PN} += "${libdir}/zlibrary"
 
 # The RESOLUTION is defined at compile time which makes
 # this package MACHINE specific.
 PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+PACKAGE_ARCH_${PN}-dbg = "${MACHINE_ARCH}"
+PACKAGE_ARCH_${PN}-dev = "${MACHINE_ARCH}"
 
 SRC_URI = "http://www.fbreader.org/obsolete/fbreader-sources-${PV}.tgz \
-	   file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
 	   file://480x640-buildfix.patch;patch=1"
-	   
+
 SRC_URI_append_spitz = "\
 		  file://zaurus-VGA.patch;patch=1"
 
 SRC_URI_append_akita = "\
 		  file://zaurus-VGA.patch;patch=1"
 
+SRC_URI_append_tosa= "\
+		  file://zaurus-VGA.patch;patch=1"
+
 SRC_URI_append_htcuniversal = "\
 		  file://zaurus-VGA.patch;patch=1"

@@ -33,30 +38,31 @@ READER_STATUS	  = "release"
 READER_RESOLUTION_om-gta01 = "480x640"
 READER_RESOLUTION_spitz = "640x480"
 READER_RESOLUTION_akita = "640x480"
+READER_RESOLUTION_tosa = "480x640"
 READER_RESOLUTION_htcuniversal = "640x480"
 
 FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
 
-CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
+CFLAGS_append = " RESOLUTION=${READER_RESOLUTION}"
 EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
 
 inherit pkgconfig
 
 do_configure() {
-	cd ${WORKDIR}/${PN}-${PV}
-	mv makefiles/target.mk makefiles/target.mk.orig
-	
-	echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk	
+	cd ${S}
+	mv makefiles/target.mk makefiles/target.mk.orig || true
+
+	echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk
 	echo "UI_TYPE = ${READER_GUI}" >> makefiles/target.mk
 	echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
-	
-	cd fbreader/data/help
-	
-	# FIXME: Add native _480x640 file with propper linebreaks
-	ln -s MiniHelp.240x320.fb2 MiniHelp.openzaurus_480x640.fb2
-}
 
-do_install () {
-        cd fbreader/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${READER_RESOLUTION}
-	cp -r data/* ${D}
+	find fbreader zlibrary -name "*640x480*" | while read name
+	do
+		newname="`echo $name | sed -e 's/640x480/480x640/'`"
+		if ! [ -e "$newname" ]
+		then
+			ln -s `basename $name` $newname
+		fi
+	done
 }
+

packages/fbreader/fbreader_0.8.2a.bb +5 ~~-53~~

66 lines not on this page · raw message

packages/fbreader/files/480x640-buildfix.patch renamed from packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch +0 -0

similarity index 100%
rename from packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch
rename to packages/fbreader/files/480x640-buildfix.patch

Signature · 1 line

1.5.6.5

Dmitry Eremin-Solenikov

author

2008-12-09 07:24 UTC #1 lore raw

RFC PATCH 1/1 fbreader: add 0.8.17 recipe for both fbreader and fbreader-opie

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 <[email protected]>

---
 .../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

packages/fbreader/fbreader-0.8.17/fbreader-0.8.17_buildsys_oe.patch new file +37 -0

new file mode 100644
index 0000000..9c18118
@@ -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)

packages/fbreader/fbreader-opie-0.8.17/fbreader-0.8.17_buildsys_oe.patch new file +37 -0

new file mode 100644
index 0000000..ab48513
@@ -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)

packages/fbreader/fbreader-opie_0.8.17.bb new file +18 -0

new file mode 100644
index 0000000..55728f8
@@ -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}"

packages/fbreader/fbreader_0.8.17.bb new file +13 -0

new file mode 100644
index 0000000..ac10960
@@ -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}
+}

Signature · 1 line

1.5.6.5

Dmitry Eremin-Solenikov

author

2008-12-09 23:36 UTC #2 lore raw

In reply to Dmitry Eremin-Solenikov

Quoted 12 lines · Dmitry Eremin-Solenikov

To ease creating fbreader-opie split away common fbreader packaging functionality.

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>

---
 .../fbreader/{fbreader_0.8.2a.bb => fbreader.inc}  |   42 ++++++++------
 packages/fbreader/fbreader_0.8.2a.bb               |   58 ++------------------
 .../480x640-buildfix.patch                         |    0 
 3 files changed, 29 insertions(+), 71 deletions(-)
 copy packages/fbreader/{fbreader_0.8.2a.bb => fbreader.inc} (65%)
 rename packages/fbreader/{fbreader-0.8.2a => files}/480x640-buildfix.patch (100%)

If nobody objects, I'll commit both patches on weekend.

Signature · 2 lines

With best wishes
Dmitry