diff options
| -rw-r--r-- | packages/opie-reader/opie-reader.inc | 24 | ||||
| -rw-r--r-- | packages/opie-reader/opie-reader_1.2.0.bb | 5 | ||||
| -rw-r--r-- | packages/opie-reader/opie-reader_cvs.bb | 25 |
3 files changed, 38 insertions, 16 deletions
diff --git a/packages/opie-reader/opie-reader.inc b/packages/opie-reader/opie-reader.inc index b3f130595e..d581a9674d 100644 --- a/packages/opie-reader/opie-reader.inc +++ b/packages/opie-reader/opie-reader.inc @@ -6,7 +6,6 @@ LICENSE = "GPL" APPNAME = "opie-reader" APPTYPE = "binary" - S = "${WORKDIR}/opie-reader" EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}" @@ -14,18 +13,19 @@ PARALLEL_MAKE = "" inherit opie -# FILES bin/opie-reader apps/Applications/opie-reader.desktop pics/opie-reader/* do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/ \ - ${D}${palmtopdir}/lib/ \ - ${D}${palmtopdir}/plugins/reader/data/ \ - ${D}${palmtopdir}/plugins/reader/filters/ \ - ${D}${palmtopdir}/plugins/reader/codecs/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ + install -d ${D}${palmtopdir}/pics/${APPNAME}/ + install -d ${D}${palmtopdir}/lib/ + install -d ${D}${palmtopdir}/plugins/reader/data/ + install -d ${D}${palmtopdir}/plugins/reader/filters/ + install -d ${D}${palmtopdir}/plugins/reader/support/ + install -d ${D}${palmtopdir}/plugins/reader/outcodecs/ + install -d ${D}${palmtopdir}/plugins/reader/codecs/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ for f in libAportis libCHM libPlucker libReb libWeasel libiSilo libppms libArriereGo do - oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/codecs/ + install -m 644 ${S}/$f.so ${D}${palmtopdir}/plugins/reader/codecs/ done for f in libreader_codec libreader_pdb libreader_pluckerbase pluckerdecompress @@ -33,12 +33,12 @@ do_install() { oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/lib/ done - oe_libinstall -so -C ${S}/ libHTMLfilter ${D}${palmtopdir}/plugins/reader/filters/ - oe_libinstall -so -C ${S}/ libpluckerdecompress ${D}${palmtopdir}/plugins/reader/support/ + install -m 644 ${S}/libHTMLfilter.so ${D}${palmtopdir}/plugins/reader/filters/ + install -m 644 ${S}/libpluckerdecompress.so ${D}${palmtopdir}/plugins/reader/support/ for f in libflitecmd libflitedyn libflitedyn16 do - oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/outcodecs + install -m 644 ${S}/$f.so ${D}${palmtopdir}/plugins/reader/outcodecs done install -m 0644 ${S}/HTMLentities ${D}${palmtopdir}/plugins/reader/data/ diff --git a/packages/opie-reader/opie-reader_1.2.0.bb b/packages/opie-reader/opie-reader_1.2.0.bb index 388975f7e0..67833fa5f6 100644 --- a/packages/opie-reader/opie-reader_1.2.0.bb +++ b/packages/opie-reader/opie-reader_1.2.0.bb @@ -1,7 +1,6 @@ include ${PN}.inc - - -PR = "r0" + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index 14790ba78e..66c0bd71ac 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};module=opie/pics \ @@ -10,3 +10,26 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ DEPENDS += " flite " EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 " +python populate_packages_prepend () { + print "opie-reader:", bb.data.getVar( 'RDEPENDS_opie-reader', d ) + plugindir = bb.data.expand('${palmtopdir}/plugins/reader', d) + for dir, type in [ ( 'codecs', 'codec' ), ( 'filters', 'filter' ), ( 'outcodecs', 'output' ) ]: + dir = plugindir + '/' + dir + do_split_packages(d, dir, + '^lib(.*)\.so$', 'opie-reader-' + type + '-%s', + 'Opie reader %s ' + type, + prepend=True) + + # input codes are small and should be installed together with opie-reader, + # flite output pulls in libflite and thus should only be installed if + # really wanted by the user + suggests=[] + recommends=[] + for package in bb.data.getVar('PACKAGES', d).split(): + if 'flite' in package: + suggests.append(package) + else: + recommends.append(package) + bb.data.setVar('RRECOMMENDS_opie-reader', " ".join( recommends ), d) + bb.data.setVar('RSUGGESTS_opie-reader', " ".join( suggests ), d) +} |