diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:29:24 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:29:24 +0100 |
commit | 506553cd1f0ed2e5eed2d4e1d1acb39db68516cf (patch) | |
tree | d3fb5c2d04496ec988e6d456f97914785ca5eae7 | |
parent | 54fa869952dc6b7c2f05018f65434877257d44de (diff) | |
parent | fdb5cf6eed330eeaf173afd3f0101e01b0c2ede1 (diff) | |
download | openembedded-506553cd1f0ed2e5eed2d4e1d1acb39db68516cf.tar.gz |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into martin_jansa/srcpv
Conflicts:
recipes/mesa/mesa-dri_git.bb
-rw-r--r-- | conf/machine/om-gta01.conf | 2 | ||||
-rw-r--r-- | conf/machine/om-gta02.conf | 4 | ||||
-rw-r--r-- | recipes/mesa/mesa-dri_7.6.bb | 28 | ||||
-rw-r--r-- | recipes/mesa/mesa-dri_git.bb | 17 | ||||
-rw-r--r-- | recipes/mesa/mesa-xlib_7.6.bb | 15 | ||||
-rw-r--r-- | recipes/mesa/mesa_7.6.bb | 2 | ||||
-rw-r--r-- | recipes/xorg-xserver/xorg-xserver-common.inc | 2 |
7 files changed, 61 insertions, 9 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 5bdeba01f3..e1c5127072 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev" -PREFERRED_PROVIDER_mesa_shr = "mesa" +PREFERRED_PROVIDER_virtual/libgl = "mesa" XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 5fc96ec4ed..8e8355ba6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -15,8 +15,8 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" -MACHINE_DRI_MODULES_shr = "glamo" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" +MACHINE_DRI_MODULES = "glamo" XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse" diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb new file mode 100644 index 0000000000..0eed2ef8d4 --- /dev/null +++ b/recipes/mesa/mesa-dri_7.6.bb @@ -0,0 +1,28 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto dri2proto expat" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \ + " +PE = "1" +PR = "${INC_PR}.0" + +# most of our targets do not have DRI so will use mesa-xlib +DEFAULT_PREFERENCE = "-1" + +DEFAULT_PREFERENCE_om-gta01 = "2" + +# ASUS EeePC 901 has DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_eee901 = "1" + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +EXTRA_OECONF += "--disable-gallium --with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb index b03474d862..0d2a99f9ec 100644 --- a/recipes/mesa/mesa-dri_git.bb +++ b/recipes/mesa/mesa-dri_git.bb @@ -1,19 +1,26 @@ include mesa-common.inc PROTO_DEPS = "xf86driproto glproto dri2proto" -LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PV = "7.2+gitr${SRCPV}" -PR = "${INC_PR}.0" +PV = "7.6.1+gitr${SRCREV}" +PR = "${INC_PR}.3" -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "-2" +DEFAULT_PREFERENCE_om-gta02 = "2" + +SRCREV_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e" SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" +SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo" S = "${WORKDIR}/git" +PACKAGES =+ " mesa-utils " + FILES_${PN} += "${libdir}/dri/*.so" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_mesa-utils = "${bindir}/*" -EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" +EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" diff --git a/recipes/mesa/mesa-xlib_7.6.bb b/recipes/mesa/mesa-xlib_7.6.bb new file mode 100644 index 0000000000..3085e8d0ff --- /dev/null +++ b/recipes/mesa/mesa-xlib_7.6.bb @@ -0,0 +1,15 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \ + " + +PE = "1" +PR = "${INC_PR}.0" + +EXTRA_OECONF += "--disable-gallium --with-driver=xlib" diff --git a/recipes/mesa/mesa_7.6.bb b/recipes/mesa/mesa_7.6.bb new file mode 100644 index 0000000000..43cde679a1 --- /dev/null +++ b/recipes/mesa/mesa_7.6.bb @@ -0,0 +1,2 @@ +# This is a dummy package so OE can use the poky mesa files +require mesa-dri_${PV}.bb diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc index cfd350e886..437ab2fddc 100644 --- a/recipes/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/xorg-xserver/xorg-xserver-common.inc @@ -13,7 +13,7 @@ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ -libxkbui libxxf86misc libxi libdmx libxtst libxres mesa libxcalibrate \ +libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \ libxv" RECOMMENDS_${PN} = "hal libpciaccess" |