merge of '593b9e6f5ea7ab1790ec54c7599baf883f22f12b'

     and '748258dba4c326c803882128fbda7609d96e2709'

12 files changed, 211 insertions, 0 deletions

diff --git a/packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty b/packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb
new file mode 100644
index 0000000000..b58c45026c
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb
@@ -0,0 +1,10 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
+	file://xim.patch;patch=1"
+
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb
new file mode 100644
index 0000000000..4ce6871947
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb
@@ -0,0 +1,41 @@
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+PRIORITY = "optional"
+DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+PR = "r4"
+
+SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
+           file://errordb-keysymdb-path-fix.patch;patch=1 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit autotools pkgconfig 
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+#		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+		oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+	)
+	oe_runmake
+}
+
+do_stage() {
+	install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+	install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+	install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+	install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+	install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+	install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+	install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+	install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+
+	oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb
new file mode 100644
index 0000000000..00fbc92db6
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+LICENSE= "MIT"
+PRIORITY = "optional"
+DEPENDS = "xproto"
+PROVIDES = "xau"
+DESCRIPTION = "Authorization Protocol for X."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb
new file mode 100644
index 0000000000..8ed426fec3
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+DESCRIPTION = "X Cursor library"
+DEPENDS = "libxfixes"
+PR = "r2"
+
+SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXcursor-${PV}"
+FILES_${PN} += "${libdir}/libXcursor.so"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb
new file mode 100644
index 0000000000..f7ea15ea0c
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE= "MIT"
+DEPENDS = "xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+PR = "r1"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb
new file mode 100644
index 0000000000..3e1ff1ab05
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb
@@ -0,0 +1,18 @@
+# "+" is missing due to bug in Familiar
+PV = "0.0cvs${SRCDATE}"
+PR = "r1"
+LICENSE= "MIT"
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "xproto virtual/libx11 xextensions"
+PROVIDES = "xext"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
+S = "${WORKDIR}/Xext"
+
+inherit autotools pkgconfig 
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb
new file mode 100644
index 0000000000..14174bf9a1
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb
@@ -0,0 +1,16 @@
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DEPENDS = "virtual/libx11 fixesext"
+DESCRIPTION = "X Fixes extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXfixes-${PV}"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb
new file mode 100644
index 0000000000..d6b51ca55d
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb
@@ -0,0 +1,28 @@
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXft-${PV}"
+
+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)
+        bb.build.exec_func('package_do_package', d)
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb
new file mode 100644
index 0000000000..58d2ab33f6
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb
@@ -0,0 +1,16 @@
+SECTION = "libs"
+DEPENDS = "renderext virtual/libx11"
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXrender-${PV}"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb
new file mode 100644
index 0000000000..ab8895e0a5
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb
@@ -0,0 +1,13 @@
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DESCRIPTION = "various extension headers."
+
+SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2"
+S = "${WORKDIR}/xextensions-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb
new file mode 100644
index 0000000000..f6afd506e2
--- /dev/null
+++ b/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb
@@ -0,0 +1,15 @@
+SECTION = "x11/libs"
+LICENSE = "MIT"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2"
+S = "${WORKDIR}/libXtrans-${PV}"
+
+inherit autotools  pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+