xorg-lib: use .inc file from oe-core

* INC_PR is not available (start with r10)
* BBCLASSEXTEND is not in .inc globally, add it per recipe where it's needed

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

4 files changed, 6 insertions, 24 deletions

diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
index 52235866e..2b7045315 100644
--- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
@@ -1,11 +1,11 @@
-require xorg-lib-common.inc
+require recipes-graphics/xorg-lib/xorg-lib-common.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b0d5bdc98f7ebab3b6c3791d9bf40907"
 
 DESCRIPTION = "XFIXES Extension"
 DEPENDS += " xextproto xproto zlib"
 PE = "1"
-PR = "${INC_PR}.0"
+PR = "r10"
 
 SRC_URI += "file://mkg3states-1.1.patch"
 SRC_URI[md5sum] = "273329a78c2e9ea189ac416c7fde94a1"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb
index 980de3a30..40d11da30 100644
--- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb
@@ -1,11 +1,11 @@
-require xorg-lib-common.inc
+require recipes-graphics/xorg-lib/xorg-lib-common.inc
 DESCRIPTION = "X Athena Widget Set"
 DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=f1beacbc336a5a256bb28dbfcf01c2be"
 
 PE = "1"
-PR = "${INC_PR}.0"
+PR = "r10"
 
 SRC_URI[md5sum] = "ccc57478c41b7a75b9702241b889b1d4"
 SRC_URI[sha256sum] = "a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
index 499caf16c..c56ee1888 100644
--- a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
@@ -1,10 +1,10 @@
-require xorg-lib-common.inc
+require recipes-graphics/xorg-lib/xorg-lib-common.inc
 DESCRIPTION = "X11 keyboard UI presentation library"
 LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
 DEPENDS += "virtual/libx11 libxt libxkbfile"
 PE = "1"
-PR = "${INC_PR}.0"
+PR = "r10"
 
 SRC_URI[md5sum] = "1143e456f7429e18e88f2eadb2f2b6b1"
 SRC_URI[sha256sum] = "20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214"
diff --git a/meta-oe/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta-oe/recipes-graphics/xorg-lib/xorg-lib-common.inc
deleted file mode 100644
index 2f7337507..000000000
--- a/meta-oe/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-HOMEPAGE = "http://www.x.org"
-BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-DEPENDS = "util-macros"
-
-XORG_PN = "${BPN}"
-INC_PR = "r9"
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-malloc0returnsnull"
-
-BBCLASSEXTEND = "native nativesdk"