From 3de4627417e62595ce4349cb3a13c9180f8e6bfd Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Mon, 22 Sep 2008 13:33:19 +0000 Subject: Adds recipes to support building X servers based on the xfree86 DDX instead of kdrive and building mesa. It's a big commit and it's still rather rough around the edges, but there is a desire to get this in early so people can review the work and help polish the changes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of the notable bits: • DRI support in mesa and the X server. (configured in machine conf via MACHINE_DRI_MODULES variable) • XCB backend for xlib • A fairly lite X server build with lots of legacy modules disabled. I'm sure there is plenty of other fairly low hanging fruit if we want to put more effort into reducing the size of the xserver build. Currently the server build comes in @ ~2.3MB vs a kdrive fbdev server build @ ~1MB. E.g xaa could be made conditional to save ~320K. Of course the kdrive server doesn't include glx stuff, which is a pretty big chunk. Also thanks to hrw, since I nabbed a some patches from him for this, and RP, for various bits of Poky style advice. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5205 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/xcb/libpthread-stubs_0.1.bb | 17 +++++++++ meta/packages/xcb/libxcb.inc | 55 ++++++++++++++++++++++++++++ meta/packages/xcb/libxcb/xcbincludedir.patch | 11 ++++++ meta/packages/xcb/libxcb_1.0.bb | 6 +++ meta/packages/xcb/libxcb_git.bb | 12 ++++++ meta/packages/xcb/xcb-proto.inc | 19 ++++++++++ meta/packages/xcb/xcb-proto_1.0.bb | 2 + meta/packages/xcb/xcb-proto_git.bb | 13 +++++++ 8 files changed, 135 insertions(+) create mode 100644 meta/packages/xcb/libpthread-stubs_0.1.bb create mode 100644 meta/packages/xcb/libxcb.inc create mode 100644 meta/packages/xcb/libxcb/xcbincludedir.patch create mode 100644 meta/packages/xcb/libxcb_1.0.bb create mode 100644 meta/packages/xcb/libxcb_git.bb create mode 100644 meta/packages/xcb/xcb-proto.inc create mode 100644 meta/packages/xcb/xcb-proto_1.0.bb create mode 100644 meta/packages/xcb/xcb-proto_git.bb (limited to 'meta/packages/xcb') diff --git a/meta/packages/xcb/libpthread-stubs_0.1.bb b/meta/packages/xcb/libpthread-stubs_0.1.bb new file mode 100644 index 0000000000..9614a74a68 --- /dev/null +++ b/meta/packages/xcb/libpthread-stubs_0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "This library provides weak aliases for pthread functions \ +not provided in libc or otherwise available by default." +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +PARALLEL_MAKE = "" +#DEPENDS = "xcb-proto xproto libxau libxslt-native" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xcb/libxcb.inc b/meta/packages/xcb/libxcb.inc new file mode 100644 index 0000000000..99356a1eb0 --- /dev/null +++ b/meta/packages/xcb/libxcb.inc @@ -0,0 +1,55 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +PARALLEL_MAKE = "" +DEPENDS = "xcb-proto xproto libxau libxslt-native" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" +# file://xcbincludedir.patch;patch=1" + +PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ + libxcb-randr libxcb-record libxcb-render libxcb-res \ + libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ + libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ + libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc" + +FILES_${PN} = "${libdir}/libxcb.so.*" +#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" +FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" +FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" +FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" +FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" +FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" +FILES_libxcb-record = "${libdir}/libxcb-record.so.*" +FILES_libxcb-render = "${libdir}/libxcb-render.so.*" +FILES_libxcb-res = "${libdir}/libxcb-res.so.*" +FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" +FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" +FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*" +FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*" +FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*" +FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*" +FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*" +FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*" +FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" +FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" +FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" +FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" +FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" + +inherit autotools pkgconfig + +# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto` +# but the xcbincludedir variable doesn't point into the staging area, so it needs some +# tweeking here: +do_configure_prepend () { + sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR}/${HOST_SYS}/|" \ + ${S}/configure.ac +} + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xcb/libxcb/xcbincludedir.patch b/meta/packages/xcb/libxcb/xcbincludedir.patch new file mode 100644 index 0000000000..cef635096e --- /dev/null +++ b/meta/packages/xcb/libxcb/xcbincludedir.patch @@ -0,0 +1,11 @@ +--- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000 ++++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100 +@@ -50,7 +50,7 @@ + + # Find the xcb-proto protocol descriptions + AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) +-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` ++XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` + AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) + AC_SUBST(XCBPROTO_XCBINCLUDEDIR) + diff --git a/meta/packages/xcb/libxcb_1.0.bb b/meta/packages/xcb/libxcb_1.0.bb new file mode 100644 index 0000000000..dd88a5390f --- /dev/null +++ b/meta/packages/xcb/libxcb_1.0.bb @@ -0,0 +1,6 @@ +include libxcb.inc +PR = "r0" + +DEPENDS += "libpthread-stubs" + +PACKAGES =+ "libxcb-xinerama" diff --git a/meta/packages/xcb/libxcb_git.bb b/meta/packages/xcb/libxcb_git.bb new file mode 100644 index 0000000000..cb7326efa0 --- /dev/null +++ b/meta/packages/xcb/libxcb_git.bb @@ -0,0 +1,12 @@ +DEFAULT_PREFERENCE = "-1" + +include libxcb.inc +PV = "1.0+git" +PR = "r0" + +DEPENDS += "libpthread-stubs" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb" + +PACKAGES =+ "libxcb-xinerama" diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/packages/xcb/xcb-proto.inc new file mode 100644 index 0000000000..115a71ec3e --- /dev/null +++ b/meta/packages/xcb/xcb-proto.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" + +inherit autotools pkgconfig + +FILES_${PN}-dev += "${datadir}/xcb/*.xml" + +do_stage() { + oe_runmake DESTDIR="${D}" install + mkdir -p ${STAGING_LIBDIR}/pkgconfig + install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig + mkdir -p ${STAGING_DATADIR}/xcb + install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb +} + diff --git a/meta/packages/xcb/xcb-proto_1.0.bb b/meta/packages/xcb/xcb-proto_1.0.bb new file mode 100644 index 0000000000..7ca4463402 --- /dev/null +++ b/meta/packages/xcb/xcb-proto_1.0.bb @@ -0,0 +1,2 @@ +include xcb-proto.inc +PR = "r0" diff --git a/meta/packages/xcb/xcb-proto_git.bb b/meta/packages/xcb/xcb-proto_git.bb new file mode 100644 index 0000000000..26b6ce7d01 --- /dev/null +++ b/meta/packages/xcb/xcb-proto_git.bb @@ -0,0 +1,13 @@ +DEFAULT_PREFERENCE = "-1" + +include xcb-proto.inc +PV = "1.0+git" +PR = "r0" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb-proto" + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3-54-g00ecf