From: Erik Hovland <erik@hovland.org>
Date: Fri, 19 May 2006 23:10:29 +0000 (+0000)
Subject: merge of 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06
X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5df2eacd530758fbd5cca526f606d2e95417c0ed;p=openembedded.git

merge of 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06
     and 8cd65284f1d330175ae2d67c03b8a2c1b41e858a
---

5df2eacd530758fbd5cca526f606d2e95417c0ed
diff --cc packages/xlibs/libxss_1.0.1.bb
index fa6cb61ec7,92dd4c82c4..54abc86a23
--- a/packages/xlibs/libxss_1.0.1.bb
+++ b/packages/xlibs/libxss_1.0.1.bb
@@@ -7,9 -7,9 +7,14 @@@ DEPENDS = "libx11 libxext xextproto scr
  PROVIDES = "libxss"
  RREPLACES = "libxss"
  
- XORG_PN = "libXscrnSaver"
 -XORG_PN = "libXScrnSaver"
++SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2"
++S = "${WORKDIR}/libXScrnSaver-${PV}"
  
--include xorg-xlibs.inc
++inherit autotools pkgconfig
  
  #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
  EXTRA_OECONF="--enable-malloc0returnsnull"
++
++do_stage() {
++	autotools_stage_all
++}