xlibs: add X11R7.1 release

diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
new file mode 100644 (file)
index 0000000..747c525
--- /dev/null
+++ b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/base"
+include libx11_${PV}.bb
+
+PROVIDES += "libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-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"

diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xlibs/libfontenc_1.0.2.bb
new file mode 100644 (file)
index 0000000..b67c4a0
--- /dev/null
+++ b/packages/xlibs/libfontenc_1.0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xlibs/libice_X11R7.1-1.0.1.bb
new file mode 100644 (file)
index 0000000..a1e92b6
--- /dev/null
+++ b/packages/xlibs/libice_X11R7.1-1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 ICE library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "libx11 util-macros"
+PROVIDES = "ice"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libICE"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xlibs/liblbxutil_1.0.1.bb
new file mode 100644 (file)
index 0000000..795cd45
--- /dev/null
+++ b/packages/xlibs/liblbxutil_1.0.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \
+          file://mkg3states.patch;patch=1"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"

diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xlibs/libsm_X11R7.1-1.0.1.bb
new file mode 100644 (file)
index 0000000..468b014
--- /dev/null
+++ b/packages/xlibs/libsm_X11R7.1-1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Session management library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+#PV="1:1.0.1"
+
+DEPENDS = "libx11 libice util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libSM"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xlibs/libx11_X11R7.1-1.0.1.bb
new file mode 100644 (file)
index 0000000..6836c87
--- /dev/null
+++ b/packages/xlibs/libx11_X11R7.1-1.0.1.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "x11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+XORG_PN = "libX11"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+       (
+               unset CC LD CXX CCLD
+               oe_runmake -C src/util '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}' makekeys
+       )
+       rm -f ${STAGING_INCDIR}/X11/Xlib.h
+       oe_runmake
+}

diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xlibs/libxau_1.0.1.bb
new file mode 100644 (file)
index 0000000..39e2f88
--- /dev/null
+++ b/packages/xlibs/libxau_1.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Authorization Protocol for X."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xau"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXau"
+
+include xorg-xlibs.inc
+

diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
new file mode 100644 (file)
index 0000000..7fb6838
--- /dev/null
+++ b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Athena Widgets library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXaw"
+
+include xorg-xlibs.inc
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"

diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
new file mode 100644 (file)
index 0000000..2847ada
--- /dev/null
+++ b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X Composite extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 compositeproto libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcomposite"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \
+          file://change-include-order.patch;patch=1"

diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xlibs/libxcursor_1.1.6.bb
new file mode 100644 (file)
index 0000000..20f44bf
--- /dev/null
+++ b/packages/xlibs/libxcursor_1.1.6.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X Cursor library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libxfixes"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcursor"
+
+include xorg-xlibs.inc
+
+FILES_${PN} += "${libdir}/libXcursor.so"

diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xlibs/libxdamage_1.0.3.bb
new file mode 100644 (file)
index 0000000..b97e01c
--- /dev/null
+++ b/packages/xlibs/libxdamage_1.0.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X Damage extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 damageproto libxfixes xproto"
+PROVIDES = "xdamage"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdamage"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xlibs/libxdmcp_1.0.1.bb
new file mode 100644 (file)
index 0000000..d9cfadb
--- /dev/null
+++ b/packages/xlibs/libxdmcp_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Display Manager Control Protocol library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xdmcp"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdmcp"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xlibs/libxext_1.0.1.bb
new file mode 100644 (file)
index 0000000..5ee1d82
--- /dev/null
+++ b/packages/xlibs/libxext_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto libx11 util-macros"
+PROVIDES = "xext"
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXext"
+
+include xorg-xlibs.inc
+

diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xlibs/libxfixes_4.0.1.bb
new file mode 100644 (file)
index 0000000..5b8881e
--- /dev/null
+++ b/packages/xlibs/libxfixes_4.0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X Fixes extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 fixesproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfixes"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
new file mode 100644 (file)
index 0000000..d17359d
--- /dev/null
+++ b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
+PROVIDES = "xfont"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfont"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xlibs/libxi_X11R7.1-1.0.1.bb
new file mode 100644 (file)
index 0000000..d698f04
--- /dev/null
+++ b/packages/xlibs/libxi_X11R7.1-1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X Input extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXi"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"

diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xlibs/libxkbfile_1.0.3.bb
new file mode 100644 (file)
index 0000000..36e3e5f
--- /dev/null
+++ b/packages/xlibs/libxkbfile_1.0.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc

diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xlibs/libxkbui_1.0.2.bb
new file mode 100644 (file)
index 0000000..a914f1e
--- /dev/null
+++ b/packages/xlibs/libxkbui_1.0.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxt libxkbfile"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+

diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xlibs/libxmu_1.0.1.bb
new file mode 100644 (file)
index 0000000..cc06d2a
--- /dev/null
+++ b/packages/xlibs/libxmu_1.0.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "X Window System miscellaneous utility library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libxt libxext util-macros"
+PROVIDES = "xmu"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXmu"
+
+include xorg-xlibs.inc
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"

diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xlibs/libxpm_3.5.5.bb
new file mode 100644 (file)
index 0000000..397be2f
--- /dev/null
+++ b/packages/xlibs/libxpm_3.5.5.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "X Pixmap library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-BSD"
+
+DEPENDS = "xproto libx11 util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXpm"
+
+include xorg-xlibs.inc
+
+do_stage () {
+       install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+       oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"

diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xlibs/libxrandr_1.1.1.bb
new file mode 100644 (file)
index 0000000..0c79789
--- /dev/null
+++ b/packages/xlibs/libxrandr_1.1.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Resize and Rotate extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "randrproto libx11 libxrender libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrandr"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"

diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xlibs/libxrender_0.9.1.bb
new file mode 100644 (file)
index 0000000..1ee5186
--- /dev/null
+++ b/packages/xlibs/libxrender_0.9.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Render extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "BSD"
+
+DEPENDS = "renderproto libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrender"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"

diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xlibs/libxres_X11R7.1-1.0.1.bb
new file mode 100644 (file)
index 0000000..e2ac5ae
--- /dev/null
+++ b/packages/xlibs/libxres_X11R7.1-1.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X Resource usage library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libxext"
+PROVIDES = "xres"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXres"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"

diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xlibs/libxt_1.0.2.bb
new file mode 100644 (file)
index 0000000..69c7434
--- /dev/null
+++ b/packages/xlibs/libxt_1.0.2.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "X Toolkit Intrinsics"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE =  "X-MIT"
+
+DEPENDS = "libx11 libsm util-macros"
+PROVIDES = "xt"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXt"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+       (
+               unset CC LD CXX CCLD
+               oe_runmake -C util '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
+       )
+       oe_runmake
+}

diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xlibs/libxxf86dga_1.0.1.bb
new file mode 100644 (file)
index 0000000..2842c2c
--- /dev/null
+++ b/packages/xlibs/libxxf86dga_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86dga extension library."
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86dga"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+       oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}

diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xlibs/libxxf86misc_1.0.1.bb
new file mode 100644 (file)
index 0000000..2544f91
--- /dev/null
+++ b/packages/xlibs/libxxf86misc_1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86misc"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+

diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xlibs/libxxf86vm_1.0.1.bb
new file mode 100644 (file)
index 0000000..0ab206a
--- /dev/null
+++ b/packages/xlibs/libxxf86vm_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86vm"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+

diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xlibs/util-macros_1.0.2.bb
new file mode 100644 (file)
index 0000000..76101b0
--- /dev/null
+++ b/packages/xlibs/util-macros_1.0.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+XORG_PN = "${PN}"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2"

diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc
index 1a89d35..8fb4677 100644 (file)
--- a/packages/xlibs/xorg-xlibs.inc
+++ b/packages/xlibs/xorg-xlibs.inc
@@ -1,7 +1,10 @@
-XORG_PV = "${@['X11R7.0-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:8]=='X11R7.0-']}"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
+XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}"
+XORG_RELEASE ?= "X11R7.0"
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
 
+
 inherit autotools pkgconfig
 
 do_stage() {