[oe-commits] org.oe.dev poppler: add recent cvs version since 0.5.9 release doesn't build

[mickeyl commit]

poppler: add recent cvs version since 0.5.9 release doesn't build

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3b04f9d33d900f95c8814c78ad7693a4bd404ded
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3b04f9d33d900f95c8814c78ad7693a4bd404ded
Files:
1
packages/poppler/poppler_20060418.bb
packages/poppler/poppler_0.5.9.bb
packages/poppler/poppler_cvs.bb
conf/distro/include/sane-srcdates.inc
packages/poppler/poppler.inc
Diffs:

#
# mt diff -r94ba8615f831009b81dcc23ba40f7611f3f7ef8e -r3b04f9d33d900f95c8814c78ad7693a4bd404ded
#
# 
# 
# delete "packages/poppler/poppler_20060418.bb"
# 
# add_file "packages/poppler/poppler_0.5.9.bb"
#  content [b079c20842d11be30315f70ccc4fe3848e93df52]
# 
# add_file "packages/poppler/poppler_cvs.bb"
#  content [0eb50012481924d447c07b60366c172118c1ec08]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [211037ba3b8be809090a4a8d44a0ea8d709dae7e]
#    to [2b41f0b4202e7f574bbc791177357abce12a84a0]
# 
# patch "packages/poppler/poppler.inc"
#  from [ecb447386fd5cd0ec22a5a76367952a9268e8ae2]
#    to [a6771820c70794fab92d6a9af14c558b7493a212]
# 
============================================================
--- packages/poppler/poppler_0.5.9.bb	b079c20842d11be30315f70ccc4fe3848e93df52
+++ packages/poppler/poppler_0.5.9.bb	b079c20842d11be30315f70ccc4fe3848e93df52
@@ -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"
+
============================================================
--- packages/poppler/poppler_cvs.bb	0eb50012481924d447c07b60366c172118c1ec08
+++ packages/poppler/poppler_cvs.bb	0eb50012481924d447c07b60366c172118c1ec08
@@ -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"
============================================================
--- conf/distro/include/sane-srcdates.inc	211037ba3b8be809090a4a8d44a0ea8d709dae7e
+++ conf/distro/include/sane-srcdates.inc	2b41f0b4202e7f574bbc791177357abce12a84a0
@@ -107,3 +107,6 @@ SRCDATE_zroadmap ?= "20060814"
 SRCDATE_yamonenv ?= "20060814"
 SRCDATE_zroadmap ?= "20060814"
 
+# Freedesktop.org
+SRCDATE_poppler = "20070708"
+
============================================================
--- packages/poppler/poppler.inc	ecb447386fd5cd0ec22a5a76367952a9268e8ae2
+++ packages/poppler/poppler.inc	a6771820c70794fab92d6a9af14c558b7493a212
@@ -1,23 +1,23 @@ LICENSE = "GPL"
 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
 }