From c00723de0b20bbd6b1674442834d10bb68d78752 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 8 Jul 2007 18:46:31 +0000
Subject: poppler: add recent cvs version since 0.5.9 release doesn't build
---
packages/poppler/poppler.inc | 16 ++++++++--------
packages/poppler/poppler_0.5.9.bb | 5 +++++
packages/poppler/poppler_20060418.bb | 16 ----------------
packages/poppler/poppler_cvs.bb | 6 ++++++
4 files changed, 19 insertions(+), 24 deletions(-)
create mode 100644 packages/poppler/poppler_0.5.9.bb
delete mode 100644 packages/poppler/poppler_20060418.bb
create mode 100644 packages/poppler/poppler_cvs.bb
(limited to 'packages/poppler')
diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc
index c33d6f0ea1..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 = "r1"
SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
inherit autotools pkgconfig
-EXTRA_OECONF = " --enable-xpdf-headers \
- --disable-gtk-test \
- --disable-poppler-qt --disable-poppler-qt4 \
- --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/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
-}
diff --git a/packages/poppler/poppler_cvs.bb b/packages/poppler/poppler_cvs.bb
new file mode 100644
index 0000000000..ca4b8d6a03
--- /dev/null
+++ b/packages/poppler/poppler_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"
--
cgit v1.2.3