diff options
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 0 | ||||
| -rw-r--r-- | packages/flite/flite_1.2.bb | 7 | ||||
| -rw-r--r-- | packages/opie-reader/opie-reader.inc | 46 | ||||
| -rw-r--r-- | packages/opie-reader/opie-reader_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/xserver/xserver-kdrive_20050610.bb | 48 | ||||
| -rw-r--r-- | packages/xserver/xserver-kdrive_20050617.bb | 0 | ||||
| -rw-r--r-- | packages/xserver/xserver-xorg_6.8.99.10.bb | 23 | ||||
| -rw-r--r-- | packages/xserver/xserver-xorg_6.8.99.11.bb | 0 |
8 files changed, 69 insertions, 59 deletions
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/machine/ipaq-pxa270.conf diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb index 6fedda7d94..b8696fd829 100644 --- a/packages/flite/flite_1.2.bb +++ b/packages/flite/flite_1.2.bb @@ -38,5 +38,10 @@ do_install() { do_stage () { install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/ - oe_runmake -C lib INSTALLLIBDIR="${STAGING_LIBDIR}" install + oe_libinstall -C lib -a -so libflite ${STAGING_LIBDIR} + oe_libinstall -C lib -a -so libflite_cmu_time_awb ${STAGING_LIBDIR} + oe_libinstall -C lib -a -so libflite_cmulex ${STAGING_LIBDIR} + oe_libinstall -C lib -a -so libflite_usenglish ${STAGING_LIBDIR} + oe_libinstall -C lib -a -so libflite_cmu_us_kal ${STAGING_LIBDIR} + oe_libinstall -C lib -a -so libflite_cmu_us_kal16 ${STAGING_LIBDIR} } diff --git a/packages/opie-reader/opie-reader.inc b/packages/opie-reader/opie-reader.inc index e69de29bb2..b3f130595e 100644 --- a/packages/opie-reader/opie-reader.inc +++ b/packages/opie-reader/opie-reader.inc @@ -0,0 +1,46 @@ +DESCRIPTION = "E-Book reader" +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Team Opie <opie@handhelds.org>" +LICENSE = "GPL" +APPNAME = "opie-reader" +APPTYPE = "binary" + + +S = "${WORKDIR}/opie-reader" + +EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}" +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}/ + + for f in libAportis libCHM libPlucker libReb libWeasel libiSilo libppms libArriereGo + do + oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/codecs/ + done + + for f in libreader_codec libreader_pdb libreader_pluckerbase pluckerdecompress + do + 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/ + + for f in libflitecmd libflitedyn libflitedyn16 + do + oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/outcodecs + done + + install -m 0644 ${S}/HTMLentities ${D}${palmtopdir}/plugins/reader/data/ +} + diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index 341e0cffba..14790ba78e 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -6,3 +6,7 @@ PR = "r0" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/apps" + +DEPENDS += " flite " +EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 " + diff --git a/packages/xserver/xserver-kdrive_20050610.bb b/packages/xserver/xserver-kdrive_20050610.bb deleted file mode 100644 index 2c3f3d8599..0000000000 --- a/packages/xserver/xserver-kdrive_20050610.bb +++ /dev/null @@ -1,48 +0,0 @@ -PV = "0.0cvs${FIXEDCVSDATE}" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" - -LICENSE = "MIT" -DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" - -PR = "r10" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" - -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ - file://kmode.patch;patch=1 \ - file://touchscreen_hack.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - -S = "${WORKDIR}/xserver" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xserver/xserver-kdrive_20050617.bb b/packages/xserver/xserver-kdrive_20050617.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver/xserver-kdrive_20050617.bb diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xserver/xserver-xorg_6.8.99.10.bb index aa8fff95a4..0358b0688f 100644 --- a/packages/xserver/xserver-xorg_6.8.99.10.bb +++ b/packages/xserver/xserver-xorg_6.8.99.10.bb @@ -2,7 +2,7 @@ SECTION = "x11/base" RPROVIDES = "virtual/xserver" PROVIDES = "virtual/xserver" LICENSE = "Xorg" -PR = "r1" +PR = "r2" DEPENDS = "fontconfig freetype libxi xmu flex-native zlib" @@ -23,15 +23,18 @@ FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Opt FILES_${PN}-doc += "${libdir}/X11/doc" do_configure() { - echo "#define BuildServersOnly YES" > config/cf/host.def - echo "#define ProjectRoot /usr" >> config/cf/host.def - echo "#define XnestServer NO" >> config/cf/host.def - echo "#define XdmxServer NO" >> config/cf/host.def - echo "#define CcCmd gcc" >> config/cf/host.def - echo "#define LdCmd ld" >> config/cf/host.def - echo "#define HasFreetype2 YES" >> config/cf/host.def - echo "#define HasFontconfig YES" >> config/cf/host.def - echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def + cat <<EOF > config/cf/host.def +#define BuildServersOnly YES +#define ProjectRoot ${prefix} +#define XnestServer NO +#define XdmxServer NO +#define CcCmd gcc +#define LdCmd ld +#define HasFreetype2 YES +#define HasFontconfig YES +#define BuildDevelDRIDrivers YES +#define BuildXF86DRI YES +EOF echo "" > config/cf/date.def rm -f include/extensions/panoramiX.h make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake diff --git a/packages/xserver/xserver-xorg_6.8.99.11.bb b/packages/xserver/xserver-xorg_6.8.99.11.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver/xserver-xorg_6.8.99.11.bb |