[oe-commits] Holger Hans Peter Freyther : libx11: Disable generating PS/PDF for the spec

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 18bfe69b58341220399c1a1f9acc0bbc7a905eb8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=18bfe69b58341220399c1a1f9acc0bbc7a905eb8

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Sat Sep 11 23:57:08 2010 +0800

libx11: Disable generating PS/PDF for the spec

libx11 would search for groff and ps2pdf to generate a PS/PDF of
the specs, if a broken ps2pdf (fedora 14 testing) is installed the
build will fail barfing about Fontmap.local. The PS/PDF does not
appear to be in any FILES_* so we can disable the PS/PDF generation
at tall and not run into the issue.

The fedora bug is at: https://bugzilla.redhat.com/show_bug.cgi?id=610301.

libx11.inc: Disable groff, ps2pdf effectively disabling generating
a PS/PDF for the X11 spec
xorg-lib-common.inc: Bump the INC_PR used by libx11.inc. This sadly
affects quite some other recipes too.

---

 recipes/xorg-lib/libx11.inc          |    6 +++---
 recipes/xorg-lib/xorg-lib-common.inc |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/xorg-lib/libx11.inc b/recipes/xorg-lib/libx11.inc
index 3a1ad95..b9eb64a 100644
--- a/recipes/xorg-lib/libx11.inc
+++ b/recipes/xorg-lib/libx11.inc
@@ -22,9 +22,9 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += " --with-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-EXTRA_OECONF_virtclass-native = " --without-xcb"
-EXTRA_OECONF_virtclass-nativesdk = " --without-xcb"
+EXTRA_OECONF += " --with-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --with-groff=no --with-ps2pdf=no"
+EXTRA_OECONF_virtclass-native = " --without-xcb --with-groff=no --with-ps2pdf=no"
+EXTRA_OECONF_virtclass-nativesdk = " --without-xcb --with-groff=no --with-ps2pdf=no"
 
 # Below option is added to overcome the GCC bug on ARM
 # see http://gcc.gnu.org/PR42981 for further details.
diff --git a/recipes/xorg-lib/xorg-lib-common.inc b/recipes/xorg-lib/xorg-lib-common.inc
index 9da51db..9a3bad8 100644
--- a/recipes/xorg-lib/xorg-lib-common.inc
+++ b/recipes/xorg-lib/xorg-lib-common.inc
@@ -4,7 +4,7 @@ LICENSE = "MIT-X"
 DEPENDS = "util-macros xorg-headers-native"
 
 XORG_PN = "${BPN}"
-INC_PR = "r8"
+INC_PR = "r9"
 
 SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2;name=archive"