X11R7.2 preparation: xorg-lib

- add individual release support to xorg-lib-common.inc
- add new X11R7.2 releases (individual release versions)

27 files changed, 306 insertions, 1 deletions

diff --git a/packages/xorg-lib/diet-x11_1.1.1.bb b/packages/xorg-lib/diet-x11_1.1.1.bb
new file mode 100644
index 0000000000..8dc3174a16
--- /dev/null
+++ b/packages/xorg-lib/diet-x11_1.1.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+
+EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+	    file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1 \
+	    file://xim.patch;patch=1 \
+	    file://xchar2b.patch;patch=1"
diff --git a/packages/xorg-lib/libfontenc_1.0.4.bb b/packages/xorg-lib/libfontenc_1.0.4.bb
new file mode 100644
index 0000000000..afb7ffe10e
--- /dev/null
+++ b/packages/xorg-lib/libfontenc_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X fontenc library (used by libxfont)."
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " zlib xproto"
+
diff --git a/packages/xorg-lib/libsm_1.0.2.bb b/packages/xorg-lib/libsm_1.0.2.bb
new file mode 100644
index 0000000000..e5113dfc76
--- /dev/null
+++ b/packages/xorg-lib/libsm_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+
+DEPENDS += " libice xproto xtrans"
+
+XORG_PN = "libSM"
+
diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
new file mode 100644
index 0000000000..de47042dc4
--- /dev/null
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -0,0 +1,24 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "Base X libs."
+SRC_URI += "file://makekeys.diff;patch=1"
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+	libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+
+XORG_PN = "libX11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+do_compile() {
+	(
+	 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+	 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+	) || exit 1
+		rm -f ${STAGING_INCDIR}/X11/Xlib.h
+	oe_runmake
+}
diff --git a/packages/xorg-lib/libxau_1.0.3.bb b/packages/xorg-lib/libxau_1.0.3.bb
new file mode 100644
index 0000000000..dcde9b4da2
--- /dev/null
+++ b/packages/xorg-lib/libxau_1.0.3.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "A Sample Authorization Protocol for X"
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xau"
+
+XORG_PN = "libXau"
+
diff --git a/packages/xorg-lib/libxcomposite_0.3.1.bb b/packages/xorg-lib/libxcomposite_0.3.1.bb
new file mode 100644
index 0000000000..71842d4a4d
--- /dev/null
+++ b/packages/xorg-lib/libxcomposite_0.3.1.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_PN = "libXcomposite"
+
+SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/packages/xorg-lib/libxcursor_1.1.8.bb b/packages/xorg-lib/libxcursor_1.1.8.bb
new file mode 100644
index 0000000000..bf795757f6
--- /dev/null
+++ b/packages/xorg-lib/libxcursor_1.1.8.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Cursor library"
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
+
+XORG_PN = "libXcursor"
+
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xorg-lib/libxdamage_1.0.4.bb b/packages/xorg-lib/libxdamage_1.0.4.bb
new file mode 100644
index 0000000000..dd6fc42df6
--- /dev/null
+++ b/packages/xorg-lib/libxdamage_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Damage extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
+PROVIDES = "xdamage"
+
+XORG_PN = "libXdamage"
+
diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb
new file mode 100644
index 0000000000..2438a7b599
--- /dev/null
+++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "BSD-X"
+PE = "1"
+
+DEPENDS = "xproto-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxdmcp_1.0.2.bb b/packages/xorg-lib/libxdmcp_1.0.2.bb
new file mode 100644
index 0000000000..109c5b5615
--- /dev/null
+++ b/packages/xorg-lib/libxdmcp_1.0.2.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Display Manager Control Protocol library."
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xdmcp"
+
+XORG_PN = "libXdmcp"
+
diff --git a/packages/xorg-lib/libxevie_1.0.2.bb b/packages/xorg-lib/libxevie_1.0.2.bb
new file mode 100644
index 0000000000..06985bd112
--- /dev/null
+++ b/packages/xorg-lib/libxevie_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
+
+XORG_PN = "libXevie"
+
diff --git a/packages/xorg-lib/libxext_1.0.2.bb b/packages/xorg-lib/libxext_1.0.2.bb
new file mode 100644
index 0000000000..a64067e2ad
--- /dev/null
+++ b/packages/xorg-lib/libxext_1.0.2.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Server Extension library"
+PRIORITY = "optional"
+
+DEPENDS += " xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+
+XORG_PN = "libXext"
+
diff --git a/packages/xorg-lib/libxfixes_4.0.3.bb b/packages/xorg-lib/libxfixes_4.0.3.bb
new file mode 100644
index 0000000000..cffe56a03a
--- /dev/null
+++ b/packages/xorg-lib/libxfixes_4.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Fixes extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
+
+XORG_PN = "libXfixes"
+
diff --git a/packages/xorg-lib/libxfont_1.2.7.bb b/packages/xorg-lib/libxfont_1.2.7.bb
new file mode 100644
index 0000000000..cc855c0106
--- /dev/null
+++ b/packages/xorg-lib/libxfont_1.2.7.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X font library (used by the X server)."
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+
+SRC_URI += "file://no-scalable-crash.patch;patch=1"
+
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+
+XORG_PN = "libXfont"
+
diff --git a/packages/xorg-lib/libxfontcache_1.0.4.bb b/packages/xorg-lib/libxfontcache_1.0.4.bb
new file mode 100644
index 0000000000..1e45867950
--- /dev/null
+++ b/packages/xorg-lib/libxfontcache_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto"
+
+XORG_PN = "libXfontcache"
+
diff --git a/packages/xorg-lib/libxi_1.0.2.bb b/packages/xorg-lib/libxi_1.0.2.bb
new file mode 100644
index 0000000000..84c67f5ae3
--- /dev/null
+++ b/packages/xorg-lib/libxi_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Input extension library."
+
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
+
+XORG_PN = "libXi"
+
diff --git a/packages/xorg-lib/libxkbfile_1.0.4.bb b/packages/xorg-lib/libxkbfile_1.0.4.bb
new file mode 100644
index 0000000000..2d9b778d02
--- /dev/null
+++ b/packages/xorg-lib/libxkbfile_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X11 keyboard library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+
+DEPENDS += " virtual/libx11 kbproto"
+
diff --git a/packages/xorg-lib/libxmu_1.0.3.bb b/packages/xorg-lib/libxmu_1.0.3.bb
new file mode 100644
index 0000000000..e055874b3d
--- /dev/null
+++ b/packages/xorg-lib/libxmu_1.0.3.bb
@@ -0,0 +1,17 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Window System miscellaneous utility library"
+PRIORITY = "optional"
+
+DEPENDS += " libxt libxext xextproto virtual/libx11"
+PROVIDES = "xmu"
+
+XORG_PN = "libXmu"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb
new file mode 100644
index 0000000000..60779da43f
--- /dev/null
+++ b/packages/xorg-lib/libxpm_3.5.6.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Pixmap library."
+PRIORITY = "optional"
+LICENSE = "X-BSD"
+
+DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
+
+XORG_PN = "libXpm"
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xorg-lib/libxrandr_1.1.2.bb b/packages/xorg-lib/libxrandr_1.1.2.bb
new file mode 100644
index 0000000000..18e5deffb8
--- /dev/null
+++ b/packages/xorg-lib/libxrandr_1.1.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Resize and Rotate extension library."
+LICENSE = "BSD-X"
+
+DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
+
+XORG_PN = "libXrandr"
+
diff --git a/packages/xorg-lib/libxrender_0.9.2.bb b/packages/xorg-lib/libxrender_0.9.2.bb
new file mode 100644
index 0000000000..b1372d3dac
--- /dev/null
+++ b/packages/xorg-lib/libxrender_0.9.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD-X"
+
+DEPENDS += " virtual/libx11 renderproto"
+
+XORG_PN = "libXrender"
+
diff --git a/packages/xorg-lib/libxres_1.0.3.bb b/packages/xorg-lib/libxres_1.0.3.bb
new file mode 100644
index 0000000000..b9d2fd68ce
--- /dev/null
+++ b/packages/xorg-lib/libxres_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Resource usage library."
+
+DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
+
+XORG_PN = "libXres"
+
diff --git a/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/packages/xorg-lib/libxscrnsaver_1.1.2.bb
new file mode 100644
index 0000000000..163ca199c1
--- /dev/null
+++ b/packages/xorg-lib/libxscrnsaver_1.1.2.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X screen saver extension library."
+LICENSE = "GPL"
+
+DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
+
+XORG_PN = "libXScrnSaver"
+
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/packages/xorg-lib/libxt_1.0.4.bb b/packages/xorg-lib/libxt_1.0.4.bb
new file mode 100644
index 0000000000..e67590bdf1
--- /dev/null
+++ b/packages/xorg-lib/libxt_1.0.4.bb
@@ -0,0 +1,20 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Toolkit Intrinsics"
+PRIORITY = "optional"
+
+DEPENDS += " libsm virtual/libx11 xproto kbproto"
+PROVIDES = "xt"
+
+XORG_PN = "libXt"
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+	) || exit 1
+	oe_runmake
+}
diff --git a/packages/xorg-lib/libxvmc_1.0.4.bb b/packages/xorg-lib/libxvmc_1.0.4.bb
new file mode 100644
index 0000000000..54aaa895ff
--- /dev/null
+++ b/packages/xorg-lib/libxvmc_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+DESCRIPTION = "X Video Motion Compensation extension library."
+
+DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto"
+
+XORG_PN = "libXvMC"
+
diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
index 0c6c1388d2..e1f783e352 100644
--- a/packages/xorg-lib/xorg-lib-common.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -4,7 +4,8 @@ LICENSE = "MIT-X"
 
 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.bz2"
+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
diff --git a/packages/xorg-lib/xtrans_1.0.3.bb b/packages/xorg-lib/xtrans_1.0.3.bb
new file mode 100644
index 0000000000..e32509a5c4
--- /dev/null
+++ b/packages/xorg-lib/xtrans_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+PE = "1"
+
+SRC_URI += "file://fix-missing-includepath.patch;patch=1"
+
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+