1 files changed, 4 insertions, 3 deletions

diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc
index b12627474a..e1f783e352 100644
--- a/meta/packages/xorg-lib/xorg-lib-common.inc
+++ b/meta/packages/xorg-lib/xorg-lib-common.inc
@@ -2,14 +2,15 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 
-DEPENDS = "util-macros"
+DEPENDS = "util-macros xorg-headers-native"
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz"
+XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF="--enable-malloc0returnsnull"
+EXTRA_OECONF = "--enable-malloc0returnsnull"
 
 do_stage() {
         autotools_stage_all