diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-02-12 03:40:10 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-02-12 03:40:10 +0000 |
| commit | 312b7a20c3eafba35731d900a1705b353d7ab425 (patch) | |
| tree | 5d3786f9cdf64ce5abe3289c1354178e50eb9f0e | |
| parent | 5572e1f2a11806acc21a7ab8113f34a1e662eafa (diff) | |
| parent | 74a7abd209a8708d512f9b36e3f3e0414932cfad (diff) | |
merge of '14d71b936216a80a0008bcd3d669f6c38fd5d0a6'
and '79d9268d43556f55360ba162dc5f949422a1079b'
| -rw-r--r-- | classes/opie.bbclass | 5 | ||||
| -rw-r--r-- | packages/blueprobe/blueprobe-0.18/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/blueprobe/blueprobe-0.18/h4000.patch | 16 | ||||
| -rw-r--r-- | packages/blueprobe/blueprobe_0.18.bb | 4 | ||||
| -rw-r--r-- | packages/mediatomb/mediatomb_svn.bb | 7 |
5 files changed, 24 insertions, 8 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 922cb9435a..d858439688 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -15,10 +15,7 @@ inherit palmtop -# Note that when CVS changes to 1.2.2, the dash -# should be removed from OPIE_CVS_PV to convert -# to the standardised version format -OPIE_CVS_PV = "1.2.2+cvs-${SRCDATE}" +OPIE_CVS_PV = "1.2.2+cvs${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" diff --git a/packages/blueprobe/blueprobe-0.18/.mtn2git_empty b/packages/blueprobe/blueprobe-0.18/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.18/.mtn2git_empty diff --git a/packages/blueprobe/blueprobe-0.18/h4000.patch b/packages/blueprobe/blueprobe-0.18/h4000.patch new file mode 100644 index 0000000000..35a30c4943 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.18/h4000.patch @@ -0,0 +1,16 @@ +--- blueprobe-0.18/blueprobe.init.org 2007-01-11 11:54:09.000000000 +0000 ++++ blueprobe-0.18/blueprobe.init 2007-02-11 17:05:51.000000000 +0000 +@@ -65,6 +65,13 @@ + PROTO=bcsp + PROBE=yes + ;; ++ "HP iPAQ H4000") ++ BLUETOOTH=yes ++ PORT=/dev/ttyS1 ++ SPEED=115200 ++ PROTO=texas ++ PROBE=no ++ ;; + "HP iPAQ HX4700") + BLUETOOTH=yes + PORT=/dev/ttyS1 diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb index 2c0650511a..ca455401e0 100644 --- a/packages/blueprobe/blueprobe_0.18.bb +++ b/packages/blueprobe/blueprobe_0.18.bb @@ -1,3 +1,5 @@ require blueprobe.inc -PR = "r0" +PR = "r1" + +SRC_URI += "file://h4000.patch;patch=1" diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb index 4d8b4f2c4d..0283eb6ae7 100644 --- a/packages/mediatomb/mediatomb_svn.bb +++ b/packages/mediatomb/mediatomb_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://mediatomb.org/" LICENSE = "GPLv2" DEPENDS = "sqlite3 libexif js zlib file id3lib" PV = "0.8+0.9pre1+svn${SRCDATE}-sqlite" -PR = "r1" +PR = "r2" SRC_URI = "svn://mediatomb.svn.sourceforge.net/svnroot/mediatomb/trunk;proto=https;module=mediatomb" @@ -16,7 +16,7 @@ EXTRA_OECONF = "--disable-mysql \ --enable-sqlite3 \ --enable-libjs \ --enable-libmagic \ - --enable-taglib \ + --enable-id3lib \ --enable-libexif \ --disable-largefile \ --with-sqlite3-h=${STAGING_INCDIR} \ @@ -29,4 +29,5 @@ EXTRA_OECONF = "--disable-mysql \ --with-zlib-libs=${STAGING_LIBDIR} \ --with-js-h=${STAGING_INCDIR}/js \ --with-js-libs=${STAGING_LIBDIR} \ - --with-taglib-cfg=${STAGING_BINDIR_CROSS}/taglib-config" + --with-id3lib-h=${STAGING_INCDIR} \ + --with-id3lib-libs=${STAGING_LIBDIR}" |