diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
| commit | 9d829ed05c295df608b4fc108eb1c628fd06fd39 (patch) | |
| tree | c1b27cfe4498f8abef1a61325922906f3e6a32ff /packages/poppler | |
| parent | 1434b204e16e87b7f59f074f3036d5dcbcf0116f (diff) | |
| parent | 6ccac10beeaaa02a86081bd6179fd57c208ad6b1 (diff) | |
merge of '76e1e69496801009ea0aa69c84f76e858978ab99'
and 'db976a98427dd6a195e2cf167e225de2d0206aea'
Diffstat (limited to 'packages/poppler')
| -rw-r--r-- | packages/poppler/poppler.inc | 16 | ||||
| -rw-r--r-- | packages/poppler/poppler0.6_cvs.bb | 6 | ||||
| -rw-r--r-- | packages/poppler/poppler_0.5.4.bb | 2 | ||||
| -rw-r--r-- | packages/poppler/poppler_0.5.9.bb | 5 | ||||
| -rw-r--r-- | packages/poppler/poppler_20060418.bb | 16 |
5 files changed, 20 insertions, 25 deletions
diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc index 14ae8220a8..e01057cb4e 100644 --- a/packages/poppler/poppler.inc +++ b/packages/poppler/poppler.inc @@ -1,23 +1,23 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." DEPENDS = "fontconfig jpeg zlib gtk+ cairo" LICENSE = "GPL" -PR = "r0" SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" inherit autotools pkgconfig -EXTRA_OECONF = " --enable-xpdf-headers \ - --disable-gtk-test \ - --disable-poppler-qt \ - --enable-zlib \ - " +EXTRA_OECONF = "\ + --enable-xpdf-headers \ + --disable-gtk-test \ + --disable-poppler-qt \ + --disable-poppler-qt4 \ + --enable-zlib \ +" -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require poppler-fpu.inc EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" - do_stage() { autotools_stage_all } diff --git a/packages/poppler/poppler0.6_cvs.bb b/packages/poppler/poppler0.6_cvs.bb new file mode 100644 index 0000000000..ca4b8d6a03 --- /dev/null +++ b/packages/poppler/poppler0.6_cvs.bb @@ -0,0 +1,6 @@ +require poppler.inc +PV = "0.5.9+cvs${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler" +S = "${WORKDIR}/poppler" diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb index ade41a276a..92c25bc0ac 100644 --- a/packages/poppler/poppler_0.5.4.bb +++ b/packages/poppler/poppler_0.5.4.bb @@ -1,2 +1,2 @@ require poppler.inc -PR = "r1" +PR = "r2" diff --git a/packages/poppler/poppler_0.5.9.bb b/packages/poppler/poppler_0.5.9.bb new file mode 100644 index 0000000000..347d9ae303 --- /dev/null +++ b/packages/poppler/poppler_0.5.9.bb @@ -0,0 +1,5 @@ +require poppler.inc + +# does not build, use cvs for now and eventually try to bump to 0.6.0 (or 1.0) +DEFAULT_PREFERENCE = "-1" + diff --git a/packages/poppler/poppler_20060418.bb b/packages/poppler/poppler_20060418.bb deleted file mode 100644 index 842536eda3..0000000000 --- a/packages/poppler/poppler_20060418.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -DEPENDS = "fontconfig jpeg gtk+ cairo" -LICENSE = "GPL" -PV = "0.5.1+cvs20060418" -PR = "r0" - -SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler;date=${PV}" -S = "${WORKDIR}/poppler" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-xpdf-headers --disable-gtk-test --disable-poppler-qt" - -do_stage() { - autotools_stage_all -} |