xlibs: Update XORG_MIRROR SRC_URIs to match upstream changes

35 files changed, 87 insertions, 226 deletions

diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xlibs/libfontenc_1.0.1.bb
index 3d56bca223..02883c4d26 100644
--- a/packages/xlibs/libfontenc_1.0.1.bb
+++ b/packages/xlibs/libfontenc_1.0.1.bb
@@ -6,10 +6,6 @@ LICENSE = "BSD-X"
 
 DEPENDS = "zlib xproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xlibs/libice_X11R7.0-1.0.0.bb
index 251188b1c2..cd5c2d372f 100644
--- a/packages/xlibs/libice_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libice_X11R7.0-1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE= "MIT"
 DEPENDS = "libx11 util-macros"
 PROVIDES = "ice"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libICE-${PV}.tar.bz2"
-S = "${WORKDIR}/libICE-${PV}"
+XORG_PN = "libICE"
 
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xlibs/liblbxutil_1.0.0.bb
index 4edaa71ba4..36837c23e4 100644
--- a/packages/xlibs/liblbxutil_1.0.0.bb
+++ b/packages/xlibs/liblbxutil_1.0.0.bb
@@ -6,14 +6,12 @@ LICENSE = "GPL"
 
 DEPENDS = "xextproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2 \
-		   file://mkg3states.patch;patch=1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
 
-inherit autotools pkgconfig
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \
+		   file://mkg3states.patch;patch=1"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
index d102f7db7a..bf96271ba6 100644
--- a/packages/xlibs/libsm_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE = "MIT-X"
 
 DEPENDS = "libx11 libice util-macros"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-${PV}.tar.bz2"
-S = "${WORKDIR}/libSM-${PV}"
+XORG_PN = "libSM"
 
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
index d5be287341..ac9d87292a 100644
--- a/packages/xlibs/libx11_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
@@ -9,10 +9,9 @@ PROVIDES = "x11"
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
-S = "${WORKDIR}/libX11-${PV}"
+XORG_PN = "libX11"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
@@ -24,7 +23,3 @@ do_compile() {
 	rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xlibs/libxau_1.0.0.bb
index 828d4ebd3d..f64be68583 100644
--- a/packages/xlibs/libxau_1.0.0.bb
+++ b/packages/xlibs/libxau_1.0.0.bb
@@ -7,11 +7,7 @@ LICENSE= "MIT"
 DEPENDS = "xproto util-macros"
 PROVIDES = "xau"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
-S = "${WORKDIR}/libXau-${PV}"
+XORG_PN = "libXau"
 
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
index 4d3c6acdbd..03ac373f77 100644
--- a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
+++ b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
@@ -7,14 +7,9 @@ LICENSE = "MIT"
 DEPENDS = "xproto libx11 libxt libxmu libxpm"
 PROVIDES = "xaw"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXaw-${PV}.tar.bz2"
-S = "${WORKDIR}/libXaw-${PV}"
+XORG_PN = "libXaw"
 
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
 # FIXME: libXaw needs a full x11, not diet
 BROKEN = "1"
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
index 57eef74aa3..c26f12e5c9 100644
--- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -6,12 +6,9 @@ LICENSE= "BSD-X"
 DEPENDS = "libx11 compositeproto xextproto libxfixes"
 PROVIDES = "xcomposite"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
-	   file://change-include-order.patch;patch=1"
-S = "${WORKDIR}/libXcomposite-${PV}"
+XORG_PN = "libXcomposite"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-X11R7.0-${PV}.tar.bz2 \
+	   file://change-include-order.patch;patch=1"
diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xlibs/libxcursor_1.1.5.2.bb
index d20b52d0f0..9aed134fbb 100644
--- a/packages/xlibs/libxcursor_1.1.5.2.bb
+++ b/packages/xlibs/libxcursor_1.1.5.2.bb
@@ -6,13 +6,8 @@ LICENSE= "BSD-X"
 
 DEPENDS = "libxfixes"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcursor-${PV}.tar.bz2"
-S = "${WORKDIR}/libXcursor-${PV}"
+XORG_PN = "libXcursor"
 
-FILES_${PN} += "${libdir}/libXcursor.so"
-
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xlibs/libxdamage_1.0.2.2.bb
index 572df1d190..acea09c7bd 100644
--- a/packages/xlibs/libxdamage_1.0.2.2.bb
+++ b/packages/xlibs/libxdamage_1.0.2.2.bb
@@ -6,11 +6,6 @@ LICENSE= "BSD-X"
 DEPENDS = "libx11 damageproto libxfixes xproto"
 PROVIDES = "xdamage"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdamage-${PV}.tar.bz2"
-S = "${WORKDIR}/libXdamage-${PV}"
+XORG_PN = "libXdamage"
 
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xlibs/libxdmcp_1.0.0.bb
index 4ba746369f..5ea8cdd513 100644
--- a/packages/xlibs/libxdmcp_1.0.0.bb
+++ b/packages/xlibs/libxdmcp_1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE= "MIT"
 DEPENDS = "xproto util-macros"
 PROVIDES = "xdmcp"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
-S = "${WORKDIR}/libXdmcp-${PV}"
+XORG_PN = "libXdmcp"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xlibs/libxext_1.0.0.bb
index 1c15f819b6..1c4a21280e 100644
--- a/packages/xlibs/libxext_1.0.0.bb
+++ b/packages/xlibs/libxext_1.0.0.bb
@@ -7,13 +7,9 @@ LICENSE= "MIT"
 DEPENDS = "xproto libx11 xextproto util-macros"
 PROVIDES = "xext"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXext-${PV}.tar.bz2"
-S = "${WORKDIR}/libXext-${PV}"
+EXTRA_OECONF="--enable-malloc0returnsnull"
 
-inherit autotools pkgconfig 
+XORG_PN = "libXext"
 
-EXTRA_OECONF="--enable-malloc0returnsnull"
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xlibs/libxfixes_3.0.1.2.bb
index ea898d723b..b22da223f5 100644
--- a/packages/xlibs/libxfixes_3.0.1.2.bb
+++ b/packages/xlibs/libxfixes_3.0.1.2.bb
@@ -5,11 +5,6 @@ LICENSE= "BSD-X"
 
 DEPENDS = "libx11 fixesproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfixes-${PV}.tar.bz2"
-S = "${WORKDIR}/libXfixes-${PV}"
+XORG_PN = "libXfixes"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
index c4614e8d78..aff0e55e21 100644
--- a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE = "BSD-X"
 DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype"
 PROVIDES = "xfont"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
-S = "${WORKDIR}/libXfont-${PV}"
+XORG_PN = "libXfont"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xlibs/libxft_2.1.8.2.bb
index d97049d935..f1b6456740 100644
--- a/packages/xlibs/libxft_2.1.8.2.bb
+++ b/packages/xlibs/libxft_2.1.8.2.bb
@@ -5,20 +5,16 @@ SECTION = "x11/libs"
 DEPENDS = "libx11 xproto libxrender freetype fontconfig"
 PROVIDES = "xft"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXft-${PV}.tar.bz2"
-S = "${WORKDIR}/libXft-${PV}"
+
+XORG_PN = "libXft"
+
+include xorg-xlibs.inc
 
 FILES_${PN} = ${libdir}/lib*.so.*
 FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig \
 		${datadir}/aclocal ${bindir} ${sbindir}
 
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
-
 python do_package() {
         if bb.data.getVar('DEBIAN_NAMES', d, 1):
             bb.data.setVar('PKG_${PN}', 'libxft2', d)
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
index e771e60cda..fa63e588f3 100644
--- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
@@ -5,13 +5,8 @@ LICENSE = "MIT-X"
 
 DEPENDS = "xproto libx11 xextproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXi-${PV}.tar.bz2"
-S = "${WORKDIR}/libXi-${PV}"
+XORG_PN = "libXi"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
index 26b746d465..09a4f564f5 100644
--- a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
+++ b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
@@ -7,13 +7,8 @@ LICENSE = "MIT"
 DEPENDS = "xineramaproto xproto libx11 libxext"
 PROVIDES = "xinerama"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXinerama-${PV}.tar.bz2"
-S = "${WORKDIR}/libXinerama-${PV}"
+XORG_PN = "libXinerama"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xlibs/libxkbfile_1.0.1.bb
index deae8278c5..5cbc9a1150 100644
--- a/packages/xlibs/libxkbfile_1.0.1.bb
+++ b/packages/xlibs/libxkbfile_1.0.1.bb
@@ -6,10 +6,6 @@ LICENSE = "GPL"
 
 DEPENDS = "libx11"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxkbui_1.0.1.bb b/packages/xlibs/libxkbui_1.0.1.bb
index b1ce4f4c11..ded3da66f3 100644
--- a/packages/xlibs/libxkbui_1.0.1.bb
+++ b/packages/xlibs/libxkbui_1.0.1.bb
@@ -6,10 +6,7 @@ LICENSE = "GPL"
 
 DEPENDS = "libx11 libxt libxkbfile kbproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xlibs/libxmu_1.0.0.bb
index e404ff527d..1693e5d0d5 100644
--- a/packages/xlibs/libxmu_1.0.0.bb
+++ b/packages/xlibs/libxmu_1.0.0.bb
@@ -7,8 +7,9 @@ LICENSE = "MIT"
 DEPENDS = "libxt libxext util-macros"
 PROVIDES = "xmu"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXmu-${PV}.tar.bz2"
-S = "${WORKDIR}/libXmu-${PV}"
+XORG_PN = "libXmu"
+
+include xorg-xlibs.inc
 
 PACKAGES =+ "libxmuu libxmuu-dev"
 
@@ -16,9 +17,3 @@ FILES_libxmuu = "${libdir}/libXmuu.so.*"
 FILES_libxmuu-dev = "${libdir}/libXmuu.so"
 
 LEAD_SONAME = "libXmu"
-
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xlibs/libxp_1.0.0.bb
index c8547cf783..15653f1390 100644
--- a/packages/xlibs/libxp_1.0.0.bb
+++ b/packages/xlibs/libxp_1.0.0.bb
@@ -5,14 +5,9 @@ LICENSE = "MIT"
 
 DEPENDS = "libx11 libxext xextproto libxau printproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXp-${PV}.tar.bz2"
-S = "${WORKDIR}/libXp-${PV}"
+XORG_PN = "libXp"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xlibs/libxpm_3.5.4.2.bb
index 0f2b8a94a1..c88bd3f6bc 100644
--- a/packages/xlibs/libxpm_3.5.4.2.bb
+++ b/packages/xlibs/libxpm_3.5.4.2.bb
@@ -7,10 +7,9 @@ PR = "r1"
 
 DEPENDS = "xproto libx11 util-macros"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXpm-${PV}.tar.bz2"
-S = "${WORKDIR}/libXpm-${PV}"
+XORG_PN = "libXpm"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 do_stage () {
 	install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xlibs/libxrandr_1.1.0.2.bb
index 81787ad871..3081f4ab86 100644
--- a/packages/xlibs/libxrandr_1.1.0.2.bb
+++ b/packages/xlibs/libxrandr_1.1.0.2.bb
@@ -5,13 +5,8 @@ LICENSE = "BSD-X"
 
 DEPENDS = "randrproto libx11 libxrender libxext"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrandr-${PV}.tar.bz2"
-S = "${WORKDIR}/libXrandr-${PV}"
+XORG_PN = "libXrandr"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xlibs/libxrender_0.9.0.2.bb
index fdaa9f4eb9..1cff60983a 100644
--- a/packages/xlibs/libxrender_0.9.0.2.bb
+++ b/packages/xlibs/libxrender_0.9.0.2.bb
@@ -5,13 +5,8 @@ LICENSE = "BSD"
 
 DEPENDS = "renderproto libx11"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrender-${PV}.tar.bz2"
-S = "${WORKDIR}/libXrender-${PV}"
+XORG_PN = "libXrender"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
index 69f20fc8f4..a9806f57b1 100644
--- a/packages/xlibs/libxres_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
@@ -6,13 +6,8 @@ LICENSE = "X-MIT"
 DEPENDS = "libx11 xextproto libxext resourceproto"
 PROVIDES = "xres"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXres-${PV}.tar.bz2"
-S = "${WORKDIR}/libXres-${PV}"
+XORG_PN = "libXres"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb
index 54abc86a23..fa6cb61ec7 100644
--- a/packages/xlibs/libxss_1.0.1.bb
+++ b/packages/xlibs/libxss_1.0.1.bb
@@ -7,14 +7,9 @@ DEPENDS = "libx11 libxext xextproto scrnsaverproto"
 PROVIDES = "libxss"
 RREPLACES = "libxss"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2"
-S = "${WORKDIR}/libXScrnSaver-${PV}"
+XORG_PN = "libXscrnSaver"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb
index be1b4c94e9..606de5f31c 100644
--- a/packages/xlibs/libxt_1.0.0.bb
+++ b/packages/xlibs/libxt_1.0.0.bb
@@ -7,10 +7,9 @@ LICENSE =  "X-MIT"
 DEPENDS = "libx11 libsm util-macros kbproto"
 PROVIDES = "xt"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/libXt-X11R7.0-${PV}"
+XORG_PN = "libXt"
 
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
 
@@ -21,7 +20,3 @@ do_compile() {
 	)
 	oe_runmake
 }
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xlibs/libxtst_1.0.1.bb
index 89c7b6607a..1355142ffd 100644
--- a/packages/xlibs/libxtst_1.0.1.bb
+++ b/packages/xlibs/libxtst_1.0.1.bb
@@ -7,11 +7,6 @@ LICENSE = "GPL"
 DEPENDS = "libx11 libxext recordproto xextproto inputproto"
 PROVIDES = "xtst"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXtst-${PV}.tar.bz2"
-S = "${WORKDIR}/libXtst-${PV}"
+XORG_PN = "libXtst"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
index 12b480dedc..2d5c6aeb17 100644
--- a/packages/xlibs/libxv_X11R7.0-1.0.1.bb
+++ b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
@@ -5,13 +5,8 @@ LICENSE = "GPL"
 
 DEPENDS = "libx11 libxext xextproto videoproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXv-${PV}.tar.bz2"
-S = "${WORKDIR}/libXv-${PV}"
+XORG_PN = "libXv"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb
index 46ab999c5f..82e784789f 100644
--- a/packages/xlibs/libxxf86dga_1.0.0.bb
+++ b/packages/xlibs/libxxf86dga_1.0.0.bb
@@ -4,10 +4,9 @@ LICENSE = "XFree86"
 
 DEPENDS = "libx11 libxext xf86dgaproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86dga-${PV}.tar.bz2"
-S = "${WORKDIR}/libXxf86dga-${PV}"
+XORG_PN = "libXxf86dga"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
diff --git a/packages/xlibs/libxxf86misc_1.0.0.bb b/packages/xlibs/libxxf86misc_1.0.0.bb
index dfb65af2bc..5d5badb7a1 100644
--- a/packages/xlibs/libxxf86misc_1.0.0.bb
+++ b/packages/xlibs/libxxf86misc_1.0.0.bb
@@ -1,16 +1,11 @@
 DESCRIPTION = "Xxf86vm extension library."
 SECTION = "x11/libs"
 LICENSE = "MIT"
-
 DEPENDS = "libx11 libxext xf86miscproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86misc-${PV}.tar.bz2"
-S = "${WORKDIR}/libXxf86misc-${PV}"
+XORG_PN = "libXxf86misc"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb
index a5df50e566..47a319c28e 100644
--- a/packages/xlibs/libxxf86vm_1.0.0.bb
+++ b/packages/xlibs/libxxf86vm_1.0.0.bb
@@ -4,13 +4,9 @@ LICENSE = "MIT"
 
 DEPENDS = "libx11 libxext xf86vidmodeproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86vm-${PV}.tar.bz2"
-S = "${WORKDIR}/libXxf86vm-${PV}"
+XORG_PN = "libXxf86vm"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb
index c019e94780..6b009a7ea7 100644
--- a/packages/xlibs/util-macros_1.0.1.bb
+++ b/packages/xlibs/util-macros_1.0.1.bb
@@ -3,12 +3,8 @@ SECTION = "x11/libs"
 LICENSE= "Xorg"
 #MAINTAINER = ""
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
-do_stage () {
-	autotools_stage_all
-}
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc
new file mode 100644
index 0000000000..037e2b9958
--- /dev/null
+++ b/packages/xlibs/xorg-xlibs.inc
@@ -0,0 +1,8 @@
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${XORG_PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-X11R7.0-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xlibs/xtrans_1.0.0.bb
index 79503126f2..b6933bf615 100644
--- a/packages/xlibs/xtrans_1.0.0.bb
+++ b/packages/xlibs/xtrans_1.0.0.bb
@@ -4,10 +4,6 @@ DESCRIPTION = "network API translation layer to \
 insulate X applications and libraries from OS \
 network vageries."
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools  pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc