From eb9ccd66d4850d975ce31a71296647aac3489493 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 12 Dec 2007 06:41:18 +0000 Subject: fix typo to make sourcepkg.bbclass work when inherited. sourcepkg.bbclass:109:addtask dumpdata after archive_bb before do_create_diff_gz archive_bb should be "do_archive_bb". --- classes/sourcepkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 390d3684d4..bbc9f187ec 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -106,6 +106,6 @@ EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz addtask create_orig_tgz after do_unpack before do_patch addtask archive_bb after do_patch before do_dumpdata -addtask dumpdata after archive_bb before do_create_diff_gz +addtask dumpdata after do_archive_bb before do_create_diff_gz addtask create_diff_gz after do_dump_data before do_configure -- cgit v1.2.3 From f87df7d40d242fa23dabfe6c1307262ff33674b9 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 12 Dec 2007 07:07:43 +0000 Subject: angstrom-2007-preferred-versions.inc: prefer octave 2.1.73 (stable). * the old 2.9.14 never built * the new 2.9.x is still in testing --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index e0989b481f..6a050cd755 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1352,7 +1352,7 @@ PREFERRED_VERSION_obby ?= "0.4.1" PREFERRED_VERSION_obexftp ?= "0.20" PREFERRED_VERSION_obexpush ?= "1.0.0" PREFERRED_VERSION_obexpush-native ?= "1.0.0" -PREFERRED_VERSION_octave ?= "2.9.14" +PREFERRED_VERSION_octave ?= "2.1.73" PREFERRED_VERSION_offlineimap ?= "4.0.14" PREFERRED_VERSION_olsr ?= "0.3-1" PREFERRED_VERSION_olsrd ?= "0.5.3" -- cgit v1.2.3 From 5e567478a22e4e0c25dcef25302f476e5d0fbb1b Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 12 Dec 2007 07:21:07 +0000 Subject: octave: bump 2.9.19, fix -dbg += bug#2317 --- packages/octave/octave_2.9.17.bb | 27 --------------------------- packages/octave/octave_2.9.19.bb | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 packages/octave/octave_2.9.17.bb create mode 100644 packages/octave/octave_2.9.19.bb diff --git a/packages/octave/octave_2.9.17.bb b/packages/octave/octave_2.9.17.bb deleted file mode 100644 index 5473e0d99e..0000000000 --- a/packages/octave/octave_2.9.17.bb +++ /dev/null @@ -1,27 +0,0 @@ -require octave.inc - -SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ - file://configure.patch;patch=1" - -PR = "r0" - -PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ - libcruft-dev liboctave-dev liboctinterp-dev \ - libcruft-dbg liboctave-dbg liboctinterp-dbg" - -FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*" -FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so" -FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*" - -FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" -FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" -FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*" - -FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" -FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" -FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*" - -# octave-oct provides subroutines in .oct file format -FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" - -FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" diff --git a/packages/octave/octave_2.9.19.bb b/packages/octave/octave_2.9.19.bb new file mode 100644 index 0000000000..b92a181754 --- /dev/null +++ b/packages/octave/octave_2.9.19.bb @@ -0,0 +1,27 @@ +require octave.inc + +SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ + file://configure.patch;patch=1" + +PR = "r0" + +PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ + libcruft-dev liboctave-dev liboctinterp-dev \ + libcruft-dbg liboctave-dbg liboctinterp-dbg" + +FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*" +FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so" +FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" + +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" +FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" +FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" + +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" +FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" +FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" + +# octave-oct provides subroutines in .oct file format +FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" + +FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" -- cgit v1.2.3 From 49b8194c0aa1ab27a795cecac8954298fcfe6096 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 12 Dec 2007 07:32:26 +0000 Subject: zroadmap: move zroadmap recipies to packages/roadmap for merging --- packages/roadmap/zroadmap-1.0.12/.mtn2git_empty | 0 .../roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch | 36 ++++++++++++++ packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch | 25 ++++++++++ packages/roadmap/zroadmap-1.0.12/zroadgps.png | Bin 0 -> 1949 bytes packages/roadmap/zroadmap_1.0.12.bb | 53 ++++++++++++++++++++ packages/roadmap/zroadmap_cvs.bb | 54 +++++++++++++++++++++ packages/zroadmap/.mtn2git_empty | 0 packages/zroadmap/files/.mtn2git_empty | 0 packages/zroadmap/files/qt2-fixes-r1.patch | 36 -------------- packages/zroadmap/files/qt2-fixes.patch | 25 ---------- packages/zroadmap/files/zroadgps.png | Bin 1949 -> 0 bytes packages/zroadmap/zroadmap_1.0.12.bb | 53 -------------------- packages/zroadmap/zroadmap_cvs.bb | 54 --------------------- 13 files changed, 168 insertions(+), 168 deletions(-) create mode 100644 packages/roadmap/zroadmap-1.0.12/.mtn2git_empty create mode 100644 packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch create mode 100644 packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch create mode 100644 packages/roadmap/zroadmap-1.0.12/zroadgps.png create mode 100644 packages/roadmap/zroadmap_1.0.12.bb create mode 100644 packages/roadmap/zroadmap_cvs.bb delete mode 100644 packages/zroadmap/.mtn2git_empty delete mode 100644 packages/zroadmap/files/.mtn2git_empty delete mode 100644 packages/zroadmap/files/qt2-fixes-r1.patch delete mode 100644 packages/zroadmap/files/qt2-fixes.patch delete mode 100644 packages/zroadmap/files/zroadgps.png delete mode 100644 packages/zroadmap/zroadmap_1.0.12.bb delete mode 100644 packages/zroadmap/zroadmap_cvs.bb diff --git a/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch new file mode 100644 index 0000000000..24fe1c9bdb --- /dev/null +++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch @@ -0,0 +1,36 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- src/qt/qt_main.cc~qt2-fixes-r1.patch ++++ src/qt/qt_main.cc +@@ -137,7 +137,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -146,7 +146,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } +--- src/qt/Makefile~qt2-fixes-r1.patch ++++ src/qt/Makefile +@@ -19,7 +19,7 @@ + + ifeq ($(DESKTOP),QPE) + CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif + diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch new file mode 100644 index 0000000000..46b17b8cfb --- /dev/null +++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch @@ -0,0 +1,25 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes ++++ roadmap-1.0.12/src/qt/qt_main.cc +@@ -123,7 +123,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -132,7 +132,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } diff --git a/packages/roadmap/zroadmap-1.0.12/zroadgps.png b/packages/roadmap/zroadmap-1.0.12/zroadgps.png new file mode 100644 index 0000000000..a77b3729b7 Binary files /dev/null and b/packages/roadmap/zroadmap-1.0.12/zroadgps.png differ diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb new file mode 100644 index 0000000000..5b9161cfce --- /dev/null +++ b/packages/roadmap/zroadmap_1.0.12.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ +It displays a map of the streets, tracks the position provided by a NMEA-compliant \ +GPS receiver, identifies the street matching this GPS position and announces the name \ +of the crossing street at the next intersection. A rudimentary trip feature allows \ +RoadMap to display some basic navigation information (distance to the destination, \ +direction, speed, etc..). Voice messages are generated that duplicate some of the screen information." +SECTION = "opie/applications" +PRIORITY = "optional" +AUTHOR = "Pascal Martin " +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ + file://qt2-fixes.patch;pnum=2;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap-${PV}/src" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ + GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ + GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' +PARALLEL_MAKE = "" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a + cd qt && oe_runmake +} + +do_install() { + cd qt + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb new file mode 100644 index 0000000000..fd9cc5e95f --- /dev/null +++ b/packages/roadmap/zroadmap_cvs.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ +It displays a map of the streets, tracks the position provided by a NMEA-compliant \ +GPS receiver, identifies the street matching this GPS position and announces the name \ +of the crossing street at the next intersection." +SECTION = "opie/applications" +PRIORITY = "optional" +AUTHOR = "Pascal Martin " +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +DEPENDS = "popt expat" +LICENSE = "GPL" +PV = "1.0.12+cvs-${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ + file://qt2-fixes-r1.patch;pnum=1;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap/src" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ + CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' +PARALLEL_MAKE = "" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C qt qtroadmap qtroadgps +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/zroadmap/.mtn2git_empty b/packages/zroadmap/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zroadmap/files/.mtn2git_empty b/packages/zroadmap/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch deleted file mode 100644 index 24fe1c9bdb..0000000000 --- a/packages/zroadmap/files/qt2-fixes-r1.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Signed off by Michael 'Mickey' Lauer -# - ---- src/qt/qt_main.cc~qt2-fixes-r1.patch -+++ src/qt/qt_main.cc -@@ -137,7 +137,7 @@ - switch (orientation[0]) { - case 't': - case 'T': break; -- -+#ifndef QWS - case 'b': - case 'B': moveDockWindow (toolBar, DockBottom); break; - -@@ -146,7 +146,7 @@ - - case 'r': - case 'R': moveDockWindow (toolBar, DockRight); break; -- -+#endif - default: roadmap_log (ROADMAP_FATAL, - "Invalid toolbar orientation %s", orientation); - } ---- src/qt/Makefile~qt2-fixes-r1.patch -+++ src/qt/Makefile -@@ -19,7 +19,7 @@ - - ifeq ($(DESKTOP),QPE) - CFLAGS += -I$(QTDIR)/include -DQWS -- LIBS += -lqte -lqpe -+ LIBS += -lqpe - INSTALLDIR=$(QTDIR) - endif - diff --git a/packages/zroadmap/files/qt2-fixes.patch b/packages/zroadmap/files/qt2-fixes.patch deleted file mode 100644 index 46b17b8cfb..0000000000 --- a/packages/zroadmap/files/qt2-fixes.patch +++ /dev/null @@ -1,25 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes -+++ roadmap-1.0.12/src/qt/qt_main.cc -@@ -123,7 +123,7 @@ - switch (orientation[0]) { - case 't': - case 'T': break; -- -+#ifndef QWS - case 'b': - case 'B': moveDockWindow (toolBar, DockBottom); break; - -@@ -132,7 +132,7 @@ - - case 'r': - case 'R': moveDockWindow (toolBar, DockRight); break; -- -+#endif - default: roadmap_log (ROADMAP_FATAL, - "Invalid toolbar orientation %s", orientation); - } diff --git a/packages/zroadmap/files/zroadgps.png b/packages/zroadmap/files/zroadgps.png deleted file mode 100644 index a77b3729b7..0000000000 Binary files a/packages/zroadmap/files/zroadgps.png and /dev/null differ diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb deleted file mode 100644 index 5b9161cfce..0000000000 --- a/packages/zroadmap/zroadmap_1.0.12.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection. A rudimentary trip feature allows \ -RoadMap to display some basic navigation information (distance to the destination, \ -direction, speed, etc..). Voice messages are generated that duplicate some of the screen information." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin " -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ - file://qt2-fixes.patch;pnum=2;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - file://zroadgps.png" -S = "${WORKDIR}/roadmap-${PV}/src" - -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ - GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ - GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a - cd qt && oe_runmake -} - -do_install() { - cd qt - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb deleted file mode 100644 index fd9cc5e95f..0000000000 --- a/packages/zroadmap/zroadmap_cvs.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin " -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat" -LICENSE = "GPL" -PV = "1.0.12+cvs-${SRCDATE}" -PR = "r0" - -SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ - file://qt2-fixes-r1.patch;pnum=1;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - file://zroadgps.png" -S = "${WORKDIR}/roadmap/src" - -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ - LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a - oe_runmake -C gpx libgpx.a - oe_runmake -C unix libosroadmap.a - oe_runmake -C qt qtroadmap qtroadgps -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} -- cgit v1.2.3 From ed1dc5797c3b006f10e897c125e2bbf26309294f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 08:41:16 +0000 Subject: angstrom 2007 preferred versions: fixes the autobuilder needed to get things building --- conf/distro/include/angstrom-2007-preferred-versions.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 6a050cd755..43cadd36a7 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -838,7 +838,7 @@ PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42" PREFERRED_VERSION_libcontactsdb ?= "0.5" PREFERRED_VERSION_libcroco ?= "0.6.1" PREFERRED_VERSION_libcwd ?= "0.99.47" -PREFERRED_VERSION_libdaemon ?= "0.11" +PREFERRED_VERSION_libdaemon ?= "0.12" PREFERRED_VERSION_libdata-optlist-perl ?= "0.101" PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101" PREFERRED_VERSION_libdbi ?= "0.7.2" @@ -995,7 +995,7 @@ PREFERRED_VERSION_libpcl ?= "1.4" PREFERRED_VERSION_libpcre ?= "4.4" PREFERRED_VERSION_libpcre-native ?= "4.4" PREFERRED_VERSION_libperl6-junction-perl ?= "1.10" -PREFERRED_VERSION_libpixman ?= "0.1.6" +PREFERRED_VERSION_libpixman ?= "0.9.6" PREFERRED_VERSION_libpng ?= "1.2.20" PREFERRED_VERSION_libpng-native ?= "1.2.20" PREFERRED_VERSION_libpthread-stubs ?= "0.1" @@ -1074,7 +1074,7 @@ PREFERRED_VERSION_libwindowswm ?= "1.0.0" PREFERRED_VERSION_libwnck ?= "2.13.5" PREFERRED_VERSION_libwpd ?= "0.8.6" PREFERRED_VERSION_libx11 ?= "1.1.3" -PREFERRED_VERSION_libx11-native ?= "1.0.1" +PREFERRED_VERSION_libx11-native = "1.0.3" PREFERRED_VERSION_libxau ?= "1.0.3" PREFERRED_VERSION_libxau-native ?= "1.0.3" PREFERRED_VERSION_libxaw ?= "1.0.4" @@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.10" +PREFERRED_VERSION_midori ?= "0.0.12" PREFERRED_VERSION_midpath ?= "0.1" PREFERRED_VERSION_midpath-alsa ?= "0.1" PREFERRED_VERSION_midpath-cldc ?= "0.1" @@ -1438,7 +1438,7 @@ PREFERRED_VERSION_pine ?= "4.64" PREFERRED_VERSION_pipeman ?= "1.0.0" PREFERRED_VERSION_pipepanic ?= "0.1.1" PREFERRED_VERSION_pivotinit ?= "1.0.0" -PREFERRED_VERSION_pixman ?= "0.9.5" +PREFERRED_VERSION_pixman ?= "0.9.6" PREFERRED_VERSION_pixops-test ?= "1.0" PREFERRED_VERSION_pkgconfig ?= "0.22" PREFERRED_VERSION_pkgconfig-native ?= "0.22" -- cgit v1.2.3 From 8da344d759e77148d179aa3dcc633c9ec946f4b9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 08:55:28 +0000 Subject: minimal-openmoko-image: image with only dialer + terminal --- packages/images/minimal-openmoko-image.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/images/minimal-openmoko-image.bb diff --git a/packages/images/minimal-openmoko-image.bb b/packages/images/minimal-openmoko-image.bb new file mode 100644 index 0000000000..6ab4935c24 --- /dev/null +++ b/packages/images/minimal-openmoko-image.bb @@ -0,0 +1,21 @@ +#------------------------------------------------------ +# Minimal OpenMoko Image Recipe +# This should only have the base system + dialer +# #------------------------------------------------------ + +IMAGE_LINGUAS = "" +ANGSTROM_EXTRA_INSTALL ?= "" + +IMAGE_INSTALL = "\ + task-base \ + ${ANGSTROM_EXTRA_INSTALL} \ + task-openmoko-linux \ + task-openmoko-net \ + task-openmoko-ui \ + task-openmoko-base \ + task-openmoko-phone \ + " + +inherit image + +ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' -- cgit v1.2.3 From 8a33f551f6e22939034eefb94be156a56592cca0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 09:17:55 +0000 Subject: task-openmoko: split in to seperate recipes to cut down buildtime for minimal-openmoko-image * ACK-ed by mickeyl --- packages/tasks/task-openmoko-base.bb | 29 +++++++ packages/tasks/task-openmoko-examples.bb | 6 ++ packages/tasks/task-openmoko-games.bb | 14 ++++ packages/tasks/task-openmoko-linux.bb | 24 ++++++ packages/tasks/task-openmoko-net.bb | 15 ++++ packages/tasks/task-openmoko-phone.bb | 19 +++++ packages/tasks/task-openmoko-pim.bb | 23 +++++ packages/tasks/task-openmoko-ui.bb | 56 +++++++++++++ packages/tasks/task-openmoko.bb | 140 +------------------------------ 9 files changed, 190 insertions(+), 136 deletions(-) create mode 100644 packages/tasks/task-openmoko-base.bb create mode 100644 packages/tasks/task-openmoko-examples.bb create mode 100644 packages/tasks/task-openmoko-games.bb create mode 100644 packages/tasks/task-openmoko-linux.bb create mode 100644 packages/tasks/task-openmoko-net.bb create mode 100644 packages/tasks/task-openmoko-phone.bb create mode 100644 packages/tasks/task-openmoko-pim.bb create mode 100644 packages/tasks/task-openmoko-ui.bb diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb new file mode 100644 index 0000000000..a5d13e7e08 --- /dev/null +++ b/packages/tasks/task-openmoko-base.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-base +# +DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager" +RDEPENDS_task-openmoko-base = "\ + matchbox-panel-2 \ + matchbox-panel-2-applets \ + matchbox-keyboard-inputmethod \ + matchbox-keyboard-im \ + matchbox-keyboard-applet \ + matchbox-stroke \ + openmoko-terminal2 \ +# openmoko-keyboard \ + openmoko-panel-battery \ + openmoko-panel-bt \ + openmoko-panel-clock \ + openmoko-panel-usb \ + ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \ + \ + openmoko-today2 \ +# openmoko-appmanager \ +" diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb new file mode 100644 index 0000000000..c5dbfb6f04 --- /dev/null +++ b/packages/tasks/task-openmoko-examples.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "OpenMoko: Examples for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task \ No newline at end of file diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb new file mode 100644 index 0000000000..0fdf3cac33 --- /dev/null +++ b/packages/tasks/task-openmoko-games.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "OpenMoko: Games for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-games +# +DESCRIPTION_task-openmoko-games = "OpenMoko: Games" +RDEPENDS_task-openmoko-games = "\ + oh-puzzles \ +" diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb new file mode 100644 index 0000000000..59e6f24094 --- /dev/null +++ b/packages/tasks/task-openmoko-linux.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "OpenMoko: Core system for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-core +# +DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services" +RDEPENDS_task-openmoko-linux = "\ + task-base \ + netbase \ + sysfsutils \ + modutils-initscripts \ + module-init-tools-depmod \ + rsync \ + screen \ + psplash \ + fbset \ + fbset-modes \ +# update-alternatives \ +" diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb new file mode 100644 index 0000000000..e75dc4b4ff --- /dev/null +++ b/packages/tasks/task-openmoko-net.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "OpenMoko: Networking for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-net +# +DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking" +RDEPENDS_task-openmoko-net = "\ + bluez-utils \ + bridge-utils \ +" diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb new file mode 100644 index 0000000000..e47a1e5465 --- /dev/null +++ b/packages/tasks/task-openmoko-phone.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PROVIDES = "task-openmoko-everything" +PR = "r71" + +inherit task + +# +# task-openmoko-phone +# +DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services" +RDEPENDS_task-openmoko-phone = "\ + gsmd \ + libgsmd-tools \ + openmoko-dialer2 \ + openmoko-panel-gsm \ +# ppp \ +" diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb new file mode 100644 index 0000000000..1eea1a14a1 --- /dev/null +++ b/packages/tasks/task-openmoko-pim.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-pim +# +DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite" +RDEPENDS_task-openmoko-pim = "\ + eds-dbus \ + openmoko-calculator2 \ + openmoko-contacts2 \ + openmoko-dates2 \ + openmoko-feedreader2 \ + openmoko-browser2 \ + openmoko-appmanager2 \ + openmoko-tasks2 \ + openmoko-mediaplayer2 \ + openmoko-messages2 \ +" diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb new file mode 100644 index 0000000000..e34bb42b2f --- /dev/null +++ b/packages/tasks/task-openmoko-ui.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +XSERVER ?= "xserver-kdrive-fbdev" + +# +# task-openmoko-ui +# +DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface" +PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}" +RDEPENDS_task-openmoko-ui = "\ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc \ + gtk+ \ + matchbox-wm \ + ${XSERVER} \ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ + \ + settings-daemon \ + notification-daemon \ + neod \ + libnotify \ + \ + openmoko-session2 \ + openmoko-sound-system2 \ + openmoko-sound-theme-standard2 \ + \ + gpe-scap \ +" + +# Handle theming. FIXME: properly use machine database in a smart way, +# taking into account not only size but also PPI! Ultimately this might +# need recomputing some theme files and images on-the-fly :/ SVG and logical +# theme description anyone? Or simply Edje to the rescue! :D +THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2" +THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" + +RDEPENDS_task-openmoko-ui += "${THEMES}" diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 76e0b843f7..0d867e1b3b 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -6,158 +6,26 @@ PR = "r71" inherit task -XSERVER ?= "xserver-kdrive-fbdev" +PACKAGES += "\ + task-openmoko-everything +" -PACKAGES = "\ +RDEPENDS_task-openmoko-everything := "\ task-openmoko-linux \ task-openmoko-ui \ task-openmoko-base \ task-openmoko-phone \ task-openmoko-pim \ task-openmoko-net \ - \ task-openmoko-games \ task-openmoko-examples \ -" - -RDEPENDS_task-openmoko-everything := "\ - ${PACKAGES} \ task-openmoko-debug \ task-openmoko-native-sdk \ " -# -# task-openmoko-core -# -DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services" -RDEPENDS_task-openmoko-linux = "\ - task-base \ - netbase \ - sysfsutils \ - modutils-initscripts \ - module-init-tools-depmod \ - rsync \ - screen \ - psplash \ - fbset \ - fbset-modes \ -# update-alternatives \ -" - -# -# task-openmoko-ui -# -DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface" -PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}" -RDEPENDS_task-openmoko-ui = "\ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc \ - gtk+ \ - matchbox-wm \ - ${XSERVER} \ - xserver-kdrive-common \ - xserver-nodm-init \ - xauth \ - xhost \ - xset \ - xrandr \ - \ - settings-daemon \ - notification-daemon \ - neod \ - libnotify \ - \ - openmoko-session2 \ - openmoko-sound-system2 \ - openmoko-sound-theme-standard2 \ - \ - gpe-scap \ -" -# Handle theming. FIXME: properly use machine database in a smart way, -# taking into account not only size but also PPI! Ultimately this might -# need recomputing some theme files and images on-the-fly :/ SVG and logical -# theme description anyone? Or simply Edje to the rescue! :D -THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2" -THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -RDEPENDS_task-openmoko-ui += "${THEMES}" -PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}" -# -# task-openmoko-base -# -DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager" -RDEPENDS_task-openmoko-base = "\ - matchbox-panel-2 \ - matchbox-panel-2-applets \ - matchbox-keyboard-inputmethod \ - matchbox-keyboard-im \ - matchbox-keyboard-applet \ - matchbox-stroke \ - openmoko-terminal2 \ -# openmoko-keyboard \ - openmoko-panel-battery \ - openmoko-panel-bt \ - openmoko-panel-clock \ - openmoko-panel-usb \ - ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \ - \ - openmoko-today2 \ -# openmoko-appmanager \ -" -# -# task-openmoko-phone -# -DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services" -RDEPENDS_task-openmoko-phone = "\ - gsmd \ - libgsmd-tools \ - openmoko-dialer2 \ - openmoko-panel-gsm \ -# ppp \ -" -# -# task-openmoko-pim -# -DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite" -RDEPENDS_task-openmoko-pim = "\ - eds-dbus \ - openmoko-calculator2 \ - openmoko-contacts2 \ - openmoko-dates2 \ - openmoko-feedreader2 \ - openmoko-browser2 \ - openmoko-appmanager2 \ - openmoko-tasks2 \ - openmoko-mediaplayer2 \ - openmoko-messages2 \ -" -# -# task-openmoko-net -# -DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking" -RDEPENDS_task-openmoko-net = "\ - bluez-utils \ - bridge-utils \ -" - -# -# task-openmoko-games -# -DESCRIPTION_task-openmoko-games = "OpenMoko: Games" -RDEPENDS_task-openmoko-games = "\ - oh-puzzles \ -" -- cgit v1.2.3 From 342e4a94d063d42613c53ab578234cd5a960de1a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 09:39:40 +0000 Subject: task-openmoko: fix typo --- packages/tasks/task-openmoko.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 0d867e1b3b..730ea339aa 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -7,7 +7,7 @@ PR = "r71" inherit task PACKAGES += "\ - task-openmoko-everything + task-openmoko-everything \ " RDEPENDS_task-openmoko-everything := "\ -- cgit v1.2.3 From dc090a67d832ee09497745ec9551f8fa06bde455 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 12 Dec 2007 14:27:12 +0000 Subject: linux-handhelds-2.6: Use deployed kernel filename consistent with main kernel recipe. --- packages/linux/linux-handhelds-2.6.inc | 2 +- packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index f58ef672aa..0db5e93974 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -23,7 +23,7 @@ HHV ?= "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" -KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}" +KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin" do_configure() { diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb index ec5844bfb5..275602762d 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From a0071190d32c847d55239cf814d5a33a9bf70e06 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 12 Dec 2007 14:28:29 +0000 Subject: build-release.sh: Add h3900. --- contrib/angstrom/build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index efaaecf110..5f885b1377 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -56,7 +56,7 @@ do done # graphics, flash storage -for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 poodle tosa hx4700 c7x0 spitz akita collie +for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie do BUILD_MACHINE=$machine BUILD_TARGETS="minimal-image console-image x11-image" -- cgit v1.2.3 From 95eea93a5dcaebe465be4ed2b7211c990d1053b8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 17:25:05 +0000 Subject: webkit-gtk: fiddle with exceptions and rtti cflags before: 3.0M armv5te/libwebkitgtk1_0.1+svnr27222-r3_armv5te.ipk after: 2.3M armv5te/libwebkitgtk1_0.1+svnr27222-r3_armv5te.ipk --- packages/webkit/files/WebKit.pri | 2 +- packages/webkit/webkit-gtk_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 0c47afe7fd..f672790d26 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -16,7 +16,7 @@ gtk-port:CONFIG += link_pkgconfig gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__ gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng -gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) +gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) -fno-exceptions -fno-rtti DEFINES += USE_SYSTEM_MALLOC CONFIG(release) { diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 262c6820db..608a4d2a5c 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -9,7 +9,7 @@ FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher" require webkit.inc -PR = "r3" +PR = "r4" do_install() { install -d ${D}${bindir} -- cgit v1.2.3 From 7d3280d01628b7f8f814b80e6d19ed76fc198b99 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 12 Dec 2007 19:31:56 +0000 Subject: webkit update: update webkit srcrevs, add midori 0.13, bump openmoko-feedreader2 and openmoko-browser2 --- conf/distro/include/sane-srcrevs.inc | 10 ++++---- packages/gtk-webcore/midori_0.0.13.bb | 11 ++++++++ packages/webkit/files/WebKit.pri | 47 ++++++++++++++++++++++++++++++----- packages/webkit/files/WebKit.pro | 14 ++++++++--- packages/webkit/webkit-gtk_svn.bb | 3 +++ packages/webkit/webkit.inc | 8 +++++- 6 files changed, 77 insertions(+), 16 deletions(-) create mode 100644 packages/gtk-webcore/midori_0.0.13.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a65f477296..dff8d89328 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -62,7 +62,7 @@ SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appearance ?= "3239" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" -SRCREV_pn-openmoko-browser2 ?= "3249" +SRCREV_pn-openmoko-browser2 ?= "3646" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "3235" SRCREV_pn-openmoko-common ?= "397" @@ -73,7 +73,7 @@ SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "661" SRCREV_pn-openmoko-dialer ?= "2811" SRCREV_pn-openmoko-dialer2 ?= "3522" -SRCREV_pn-openmoko-feedreader2 ?= "3080" +SRCREV_pn-openmoko-feedreader2 ?= "3645" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" @@ -121,9 +121,9 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-webkit-gtk ?= "27222" -SRCREV_pn-webkit-qt ?= "27222" -SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-webkit-gtk ?= "28656" +SRCREV_pn-webkit-qt ?= "28656" +SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" diff --git a/packages/gtk-webcore/midori_0.0.13.bb b/packages/gtk-webcore/midori_0.0.13.bb new file mode 100644 index 0000000000..23d0179375 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.13.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "webkit-gtk libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ + " + + diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index f672790d26..640fa34174 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -11,12 +11,47 @@ qt-port:DEFINES += BUILDING_QT__=1 qt-port:!building-libs { QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR LIBS += -lQtWebKit + DEPENDPATH += $$PWD/WebKit/qt/Api +} + +gtk-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lWebKitGtk + DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport +} + +gtk-port { + CONFIG += link_pkgconfig + + DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 + + # We use FreeType directly with Cairo + PKGCONFIG += cairo-ft + + directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 + else: PKGCONFIG += cairo gtk+-2.0 + + # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) + CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) + + # We use the curl http backend on all platforms + PKGCONFIG += libcurl + + LIBS += -lWebKitGtk -ljpeg -lpng + + QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + QMAKE_LIBS += $$system(icu-config --ldflags) + + # This set of warnings is borrowed from the Mac build + QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + + # These flags are based on optimization experience from the Mac port: + # Helps code size significantly and speed a little + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + + DEPENDPATH += $$PWD/JavaScriptCore/API + INCLUDEPATH += $$PWD } -gtk-port:CONFIG += link_pkgconfig -gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl -gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__ -gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng -gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) -fno-exceptions -fno-rtti DEFINES += USE_SYSTEM_MALLOC CONFIG(release) { @@ -32,7 +67,7 @@ gtk-port:INCLUDEPATH += \ $$BASE_DIR/WebCore/platform/graphics/cairo \ $$BASE_DIR/WebCore/loader/gtk \ $$BASE_DIR/WebCore/page/gtk \ - $$BASE_DIR/WebKit/gtk/Api \ + $$BASE_DIR/WebKit/gtk/WebView \ $$BASE_DIR/WebKit/gtk/WebCoreSupport INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/ \ diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro index aab0209a93..027017bd8d 100644 --- a/packages/webkit/files/WebKit.pro +++ b/packages/webkit/files/WebKit.pro @@ -3,9 +3,15 @@ CONFIG += ordered !gtk-port:CONFIG += qt-port qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins SUBDIRS += \ - WebCore + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} -qt-port:SUBDIRS += \ - WebKit/qt/QtLauncher gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 608a4d2a5c..c726020d1a 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,5 +1,8 @@ DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" +# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need: +# DEPENDS += " gstreamer gst-plugins-base gnome-vfs " + WEBKIT_PORT = "gtk-port" WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index 2ff61091c3..81c2d91bf8 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -34,7 +34,13 @@ do_configure() { do_compile_prepend() { mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/JavaScriptCore/pcre - ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + if test -e dftables.c + then + ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + elif test -e dftables.cpp + then + ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf + fi cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/WebKitBuilds/Debug } -- cgit v1.2.3 From 6bcfbe338d719d5f7f3224aa4b06c6f49be32383 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Dec 2007 22:12:32 +0000 Subject: Add glibc-* to equivalent eglibc-* packages in RPROVIDES. --- packages/glibc/eglibc-package.bbclass | 4 +++- packages/glibc/eglibc_svn.bb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index 0cb8497733..a859ac2ca9 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" BINARY_LOCALE_ARCHES ?= "arm.*" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" -PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" RPROVIDES_eglibc = "glibc" RPROVIDES_eglibc-utils = "glibc-utils" @@ -210,6 +210,7 @@ python package_do_split_gconvs () { f.close() if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d) do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) @@ -261,6 +262,7 @@ python package_do_split_gconvs () { else: eglibc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d) + bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d) rprovides = 'virtual-locale-%s' % legitimize_package_name(name) m = re.match("(.*)_(.*)", name) if m: diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index da33cca3fa..ff68185bcc 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -2,8 +2,8 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" -PV = "2.6+svnr${SRCREV}" -PR = "r1" +PV = "2.7+svnr${SRCREV}" +PR = "r2" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://etc/ld.so.conf \ file://generate-supported.mk" -- cgit v1.2.3 From c6c56ec9b79372e509f87a08e9d0e8e60bc854b4 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Wed, 12 Dec 2007 22:33:06 +0000 Subject: mono 1.2.6pre4: add new version to OE DEFAULT_PREFERENCE is set to -1 for this version until 1.2.6 is released. --- conf/checksums.ini | 4 ++ packages/mono/files/mono-libgc-configure.patch | 20 ++++++ .../mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty | 0 .../mono/mono-1.2.5.1+1.2.6pre4/configure.patch | 23 +++++++ .../mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb | 12 ++++ packages/mono/mono_1.2.5.1+1.2.6pre4.bb | 80 ++++++++++++++++++++++ packages/mono/mono_1.2.6.inc | 13 ++++ 7 files changed, 152 insertions(+) create mode 100644 packages/mono/files/mono-libgc-configure.patch create mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty create mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch create mode 100644 packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono_1.2.6.inc diff --git a/conf/checksums.ini b/conf/checksums.ini index afa2a95e2b..dc1b06316f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7806,6 +7806,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 +[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2] +md5=391f85b4f962269e044ceac2b5235310 +sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f + [http://venge.net/monotone/downloads/monotone-0.20.tar.gz] md5=3bdf4da35ff576a401483815952f4045 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93 diff --git a/packages/mono/files/mono-libgc-configure.patch b/packages/mono/files/mono-libgc-configure.patch new file mode 100644 index 0000000000..641635da3c --- /dev/null +++ b/packages/mono/files/mono-libgc-configure.patch @@ -0,0 +1,20 @@ +Index: mono-1.2.6/libgc/configure.in +=================================================================== +--- mono-1.2.6.orig/libgc/configure.in 2007-12-12 15:02:31.000000000 -0500 ++++ mono-1.2.6/libgc/configure.in 2007-12-12 15:05:10.000000000 -0500 +@@ -17,6 +17,15 @@ + AC_PREREQ(2.53) + AC_INIT(libgc-mono, 6.6, Hans_Boehm@hp.com) + ++# the following is a very strange bug. CPPFLAGS does not get set correctly ++# if CPPFLAGS is set in the environment. The top level configure script ++# appends to the CPPFLAGS variable, and then exports it. This change should ++# be picked up by this configure script, but it is not. The original ++# env variable is still used for some reason. If CPPFLAGS is not set in the ++# environment, everything works fine. ++# Someone more experienced with autoconf will have to come up with a better fix. ++CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DUSE_COMPILER_TLS" ++echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS" + AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define) + + AC_CONFIG_SRCDIR(gcj_mlc.c) diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty b/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch b/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch new file mode 100644 index 0000000000..f033248621 --- /dev/null +++ b/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch @@ -0,0 +1,23 @@ +Index: mono-1.2.6/configure.in +=================================================================== +--- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 ++++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 +@@ -1150,6 +1150,8 @@ + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1252,6 +1254,9 @@ + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + diff --git a/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb new file mode 100644 index 0000000000..1ec7397e2b --- /dev/null +++ b/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb @@ -0,0 +1,12 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_1.2.6.inc +require mono-mcs-intermediate.inc + +DEFAULT_PREFERENCE = "-1" + diff --git a/packages/mono/mono_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono_1.2.5.1+1.2.6pre4.bb new file mode 100644 index 0000000000..e78160ee5a --- /dev/null +++ b/packages/mono/mono_1.2.5.1+1.2.6pre4.bb @@ -0,0 +1,80 @@ +require mono_1.2.6.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://configure.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_1.2.5.1-files.inc + +# Add some packages +PACKAGES_append = " mono-doc mono mono-runtime" + +FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc new file mode 100644 index 0000000000..23492e82f7 --- /dev/null +++ b/packages/mono/mono_1.2.6.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Mono Programming Language" +SECTION = "devel/mono" +LICENSE = "GPL LGPL X11" + +SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2 \ + file://mono-libgc-configure.patch;patch=1" + +S = "${WORKDIR}/mono-1.2.6" + +inherit autotools +EXTRA_OECONF_arm = "--without-tls" +EXTRA_OECONF_mipsel = "--without-tls" + -- cgit v1.2.3 From 1140c9fef8e08e49bf990b072b90888df1d17de8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 13 Dec 2007 03:05:38 +0000 Subject: gpe-applauncher: Use grid layout per default. --- packages/gpephone/gpe-applauncher_0.11.bb | 4 ++-- packages/gpephone/gpe-applauncher_svn.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb index 1efcd793e0..204f7828f9 100644 --- a/packages/gpephone/gpe-applauncher_0.11.bb +++ b/packages/gpephone/gpe-applauncher_0.11.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -18,7 +18,7 @@ inherit gpephone autotools SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb index 4fe82877e3..311d2eef60 100644 --- a/packages/gpephone/gpe-applauncher_svn.bb +++ b/packages/gpephone/gpe-applauncher_svn.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" PV = "0.11+svn-${SRCREV}" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -24,7 +24,7 @@ RDEPENDS_${PN} += "gpe-applauncher-config" SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' -- cgit v1.2.3 From 368600baa8a10692d799bbe6111f629fbd3847d7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 13 Dec 2007 10:01:34 +0000 Subject: angstrom 2007 preferred versions: bump midori to 0.13 to get it built against a recent webkit --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 43cadd36a7..12138d0f13 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.12" +PREFERRED_VERSION_midori ?= "0.0.13" PREFERRED_VERSION_midpath ?= "0.1" PREFERRED_VERSION_midpath-alsa ?= "0.1" PREFERRED_VERSION_midpath-cldc ?= "0.1" -- cgit v1.2.3 From 60bf325ef367ef3820d3b54227815fa478d94c38 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 13 Dec 2007 11:17:10 +0000 Subject: meta angstrom 2007: add skeleton for autobuilder feed population file --- packages/meta/meta-angstrom-2007.bb | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 packages/meta/meta-angstrom-2007.bb diff --git a/packages/meta/meta-angstrom-2007.bb b/packages/meta/meta-angstrom-2007.bb new file mode 100644 index 0000000000..a3a2c78a79 --- /dev/null +++ b/packages/meta/meta-angstrom-2007.bb @@ -0,0 +1,32 @@ +# Meta file to inform the autobuilder which packages to build for the feeds +# Any changes should be discussed first on the angstrom-distro-devel mailinglist + +# Try to keep it alphabetically sorted please + +inherit meta + +RDEPENDS = "" + +# Basic tools +RDEPENDS += " \ + task-proper-tools \ + screen \ + " + +# Browsers know to work on all archs +RDEPENDS += " \ + gpe-mini-browser \ + midori \ + minimo \ + openmoko-browser2 \ + webkit-gtklauncher \ + " + +# Webservers +RDEPENDS += " \ + apache2 \ + boa \ + cherokee \ + lighttpd \ + thttpd \ + " -- cgit v1.2.3