diff options
104 files changed, 1218 insertions, 138 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4efeb75fe2..c7bde00fe6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -624,6 +624,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS ?= "240" MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320" MACHINE_DISPLAY_ORIENTATION ?= "0" MACHINE_DISPLAY_BPP ?= "16" +MACHINE_DRI_MODULES ?= "auto" DISTRO_EXTRA_RDEPENDS ?= "" DISTRO_EXTRA_RRECOMMENDS ?= "" diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 7266609e15..259f098b5a 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -19,8 +19,8 @@ PREFERRED_VERSION_fontsproto-native = "2.0.2" PREFERRED_VERSION_gccmakedep = "1.0.2" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_imake = "1.0.2" -PREFERRED_VERSION_inputproto = "1.4.3" -PREFERRED_VERSION_inputproto-native = "1.4.3" +PREFERRED_VERSION_inputproto = "1.4.4" +PREFERRED_VERSION_inputproto-native = "1.4.4" PREFERRED_VERSION_inputproto-sdk = "1.4.3" PREFERRED_VERSION_kbproto = "1.0.3" PREFERRED_VERSION_kbproto-native = "1.0.3" @@ -36,9 +36,10 @@ PREFERRED_VERSION_liboldx = "1.0.1" PREFERRED_VERSION_libsm = "1.0.3" PREFERRED_VERSION_libwindowswm = "1.0.0" PREFERRED_VERSION_libx11 = "1.1.4" +PREFERRED_VERSION_libx11-trim = "1.1.5" PREFERRED_VERSION_libx11-native = "1.1.4" PREFERRED_VERSION_libx11-sdk = "1.1.4" -PREFERRED_VERSION_libxau = "1.0.3" +PREFERRED_VERSION_libxau = "1.0.4" PREFERRED_VERSION_libxau-native = "1.0.3" PREFERRED_VERSION_libxau-sdk = "1.0.3" PREFERRED_VERSION_libxaw = "1.0.4" @@ -52,7 +53,7 @@ PREFERRED_VERSION_libxevie = "1.0.2" PREFERRED_VERSION_libxext = "1.0.4" PREFERRED_VERSION_libxext-sdk = "1.0.4" PREFERRED_VERSION_libxfixes = "4.0.3" -PREFERRED_VERSION_libxfont = "1.3.2" +PREFERRED_VERSION_libxfont = "1.3.3" PREFERRED_VERSION_libxfont-native = "1.3.2" PREFERRED_VERSION_libxfontcache = "1.0.4" PREFERRED_VERSION_libxft = "2.1.12" @@ -127,10 +128,21 @@ PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2" PREFERRED_VERSION_xrandr = "1.2.3" PREFERRED_VERSION_xrdb = "1.0.5" PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" -PREFERRED_VERSION_xserver-xorg = "1.3.0.0" +PREFERRED_VERSION_xserver-xf86-dri-lite = "1.5.0" PREFERRED_VERSION_xset = "1.0.4" -PREFERRED_VERSION_xtrans = "1.0.4" +PREFERRED_VERSION_xtrans = "1.2.1" PREFERRED_VERSION_xtrans-native = "1.0.4" PREFERRED_VERSION_xtrans-sdk = "1.0.4" PREFERRED_VERSION_xvinfo = "1.0.2" PREFERRED_VERSION_xwininfo = "1.0.3" +PREFERRED_VERSION_mesa-dri = "7.1" +PREFERRED_VERSION_libdrm = "2.3.1" +PREFERRED_VERSION_xcb-proto = "1.0" +PREFERRED_VERSION_libxcb = "1.0" +PREFERRED_VERSION_libpciaccess = "0.10.3" +PREFERRED_VERSION_xf86-input-evdev = "2.0.4" +PREFERRED_VERSION_xf86-input-mouse = "1.3.0" +PREFERRED_VERSION_xf86-input-keyboard = "1.3.1" +PREFERRED_VERSION_xf86-input-synaptics = "0.15.0" +PREFERRED_VERSION_xf86-video-intel = "2.4.2" + diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index ab05ed707d..87ee7ce4f0 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -65,6 +65,7 @@ CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/meta/conf/machine/eee901.conf b/meta/conf/machine/eee901.conf index d5e0e29306..0fe7e06ce6 100644 --- a/meta/conf/machine/eee901.conf +++ b/meta/conf/machine/eee901.conf @@ -1,3 +1,8 @@ +#@TYPE: Machine +#@NAME: Asus EEE 901 PC + +#@DESCRIPTION: Machine configuration for the Asus EEE 901 PC + TARGET_ARCH = "i586" PACKAGE_EXTRA_ARCHS = "x86" @@ -8,6 +13,14 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi" KERNEL_IMAGETYPE = "bzImage" PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2" +PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite" +XSERVER = "xserver-xf86-dri-lite \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-input-synaptics \ + xf86-video-intel" +MACHINE_DRI_MODULES = "i915" MACHINE_EXTRA_RDEPENDS = "rt2860" @@ -15,9 +28,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" GUI_MACHINE_CLASS = "bigscreen" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -XSERVER="xserver-kdrive-fbdev" - IMAGE_ROOTFS_SIZE_ext3 = "250000" IMAGE_FSTYPES += "ext3 jffs2 cpio.gz" diff --git a/meta/packages/drm/libdrm_2.3.1.bb b/meta/packages/drm/libdrm_2.3.1.bb new file mode 100644 index 0000000000..9caf9b4bea --- /dev/null +++ b/meta/packages/drm/libdrm_2.3.1.bb @@ -0,0 +1,10 @@ +SECTION = "x11/base" +LICENSE = "MIT" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/libxslt/libxslt-native_1.1.22.bb b/meta/packages/libxslt/libxslt-native_1.1.22.bb new file mode 100644 index 0000000000..5157aaacbf --- /dev/null +++ b/meta/packages/libxslt/libxslt-native_1.1.22.bb @@ -0,0 +1,4 @@ +require libxslt_${PV}.bb +inherit native + +DEPENDS = "libxml2-native (>=2.6.27)" diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc index 18e9b4ebed..51b8f4644a 100644 --- a/meta/packages/mesa/mesa-common.inc +++ b/meta/packages/mesa/mesa-common.inc @@ -1,9 +1,21 @@ SECTION = "x11" -SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ - file://mklib-rpath-link.patch;patch=1" +DESCRIPTION = "An open source implementation of the OpenGL spec" +HOMEPAGE = "http://mesa3d.org" +LICENSE = "MIT" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2" S = "${WORKDIR}/Mesa-${PV}" -LICENSE = "LGPL" +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-glu \ + --disable-glw \ + --disable-glut \ + --enable-glx-tls" + +do_stage() { + autotools_stage_all +} + -DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice" diff --git a/meta/packages/mesa/mesa-dri_7.1.bb b/meta/packages/mesa/mesa-dri_7.1.bb new file mode 100644 index 0000000000..608bac0857 --- /dev/null +++ b/meta/packages/mesa/mesa-dri_7.1.bb @@ -0,0 +1,15 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PE = "1" +PR = "r0" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" + +EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" + diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb new file mode 100644 index 0000000000..137e1d4a33 --- /dev/null +++ b/meta/packages/mesa/mesa-dri_git.bb @@ -0,0 +1,20 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PV = "7.1+git${SRCREV}" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" +S = "${WORKDIR}/git" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" + +EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" + diff --git a/meta/packages/mesa/mesa-mesa.inc b/meta/packages/mesa/mesa-mesa.inc deleted file mode 100644 index d794f0c097..0000000000 --- a/meta/packages/mesa/mesa-mesa.inc +++ /dev/null @@ -1,41 +0,0 @@ -include mesa-common.inc - -PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" - -FILES_libgl = "${libdir}/libGL.so.*" -FILES_libglu = "${libdir}/libGLU.so.*" -FILES_libosmesa = "${libdir}/libOSMesa.so.*" - -FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL" -FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" -FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" - -do_configure() { - cd configs - - cp linux current - sed -e "s%CC *= *.*%CC = ${CC}%" -i current - sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current - sed -e "s%LD *= *.*%LD = ${LD}%" -i current - sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current - sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current - sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current - sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile - echo "SRC_DIRS = mesa glu glut/glx" >> current -} - -do_compile() { - oe_runmake default -} - -do_install() { - install -d ${D}${libdir} - cp -pP lib/* ${D}${libdir}/ - install -d ${D}${includedir} - cp -R include/GL ${D}${includedir}/ -} |