Patchwork [05/17] xserver-xorg (1.10.0.902): enable xephyr

login
register
mail settings
Submitter Otavio Salvador
Date May 30, 2011, 2:54 p.m.
Message ID <1306767263-29895-6-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/5049/
State New, archived
Headers show

Comments

Otavio Salvador - May 30, 2011, 2:54 p.m.
---
 recipes/xorg-xserver/xserver-xorg_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - May 30, 2011, 9:42 p.m.
On Mon, May 30, 2011 at 02:54:11PM +0000, Otavio Salvador wrote:
> ---
>  recipes/xorg-xserver/xserver-xorg_git.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
> index d18bdd7..95ade9c 100644
> --- a/recipes/xorg-xserver/xserver-xorg_git.bb
> +++ b/recipes/xorg-xserver/xserver-xorg_git.bb
> @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>  DESCRIPTION = "the X.Org X server"
>  DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
>  PV = "1.10.0.902"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>  PR_append = "+gitr${SRCPV}"
>  PE = "2"
>  
> @@ -32,7 +32,7 @@ do_install_prepend() {
>  PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
>  XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
>  
> -EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
> +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"

as reported on IRC I still get ICE with gcc-4.5 from OE, with gcc-4.6
from meta-oe it builds fine. So I've enabled it only for meta-oe and
will push it with 1.10.2 after more tests.

Cheers,

>  EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs"
>  
>  export LDFLAGS += " -ldl "
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index d18bdd7..95ade9c 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -9,7 +9,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PV = "1.10.0.902"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 PR_append = "+gitr${SRCPV}"
 PE = "2"
 
@@ -32,7 +32,7 @@  do_install_prepend() {
 PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
 XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
 
-EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
 EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs"
 
 export LDFLAGS += " -ldl "