[oe-commits] org.oe.dev xserver-kdrive * disable w100 by default, enable it for arm

[mickeyl commit]

xserver-kdrive * disable w100 by default, enable it for arm

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7d9d43a22af37a8b4ac0bfcbea925695287659e7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7d9d43a22af37a8b4ac0bfcbea925695287659e7
Files:
1
packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
packages/xorg-xserver/xserver-kdrive_git.bb
Diffs:

#
# mt diff -r72be69ab8f3846addd2317cf617e438951a66d7d -r7d9d43a22af37a8b4ac0bfcbea925695287659e7
#
# 
# 
# patch "packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb"
#  from [fb32f79f0aabb3aec553783a14be2e9ac05db80c]
#    to [660d4d10b3ad1f6db8c09b9b75e0e56d52225d87]
# 
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
#  from [e7bff6e4082b486c7234a4523f087527a01cc8b5]
#    to [0ea2e0b71ee1227260bfd874bec6e464eb570c38]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb	fb32f79f0aabb3aec553783a14be2e9ac05db80c
+++ packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb	660d4d10b3ad1f6db8c09b9b75e0e56d52225d87
@@ -1,7 +1,7 @@ DEPENDS = "tslib virtual/libsdl xproto l
 LICENSE = "MIT"
 DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
 
-PR = "r4"
+PR = "r5"
 
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
@@ -54,14 +54,16 @@ inherit autotools pkgconfig 
 
 inherit autotools pkgconfig 
 
-EXTRA_OECONF = "--enable-composite --enable-kdrive \
-		--disable-dga --disable-dri --disable-xinerama \
-		--disable-xf86misc --disable-xf86vidmode \
-		--disable-xorg --disable-xorgcfg \
-		--disable-xkb --disable-xnest --disable-xvfb \
-		--disable-xevie --disable-xprint --disable-xtrap \
-		--disable-dmx --enable-w100 \
-		--with-default-font-path=built-ins \
-		--enable-tslib --enable-xcalibrate \
-		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+W100_OECONF = "--disable-w100"
+W100_OECONF_arm = "--enable-w100"
 
+EXTRA_OECONF = "--enable-composite --enable-kdrive \       
+                --disable-dga --disable-dri --disable-xinerama \
+                --disable-xf86misc --disable-xf86vidmode \
+                --disable-xorg --disable-xorgcfg \
+                --disable-xkb --disable-xnest --disable-xvfb \
+                --disable-xevie --disable-xprint --disable-xtrap \
+                --disable-dmx ${W100_OECONF} \
+                --with-default-font-path=built-ins \
+                --enable-tslib --enable-xcalibrate \
+                ac_cv_file__usr_share_X11_sgml_defs_ent=no"
============================================================
--- packages/xorg-xserver/xserver-kdrive_git.bb	e7bff6e4082b486c7234a4523f087527a01cc8b5
+++ packages/xorg-xserver/xserver-kdrive_git.bb	0ea2e0b71ee1227260bfd874bec6e464eb570c38
@@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-2"
 PV = "1.1.0+git${SRCDATE}"
 DEFAULT_PREFERENCE = "-2"
 
-PR = "r6"
+PR = "r7"
 
 LICENSE = "MIT"
 DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
@@ -56,16 +56,16 @@ inherit autotools pkgconfig 
 
 inherit autotools pkgconfig 
 
-EXTRA_OECONF = "--enable-composite --enable-sdl --enable-kdrive \
-		--disable-dga --disable-dri --disable-xinerama \
-		--disable-xf86misc --disable-xf86vidmode \
-		--disable-xorg --disable-xorgcfg \
-		--disable-xkb --disable-xnest --disable-xvfb \
-		--disable-xevie --disable-xprint --disable-xtrap \
-		--disable-dmx \
-		--with-default-font-path=built-ins \
-		--enable-tslib --enable-xcalibrate \
-		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+W100_OECONF = "--disable-w100"
+W100_OECONF_arm = "--enable-w100"
 
+EXTRA_OECONF = "--enable-composite --enable-kdrive \       
+                --disable-dga --disable-dri --disable-xinerama \
+                --disable-xf86misc --disable-xf86vidmode \
+                --disable-xorg --disable-xorgcfg \
+                --disable-xkb --disable-xnest --disable-xvfb \
+                --disable-xevie --disable-xprint --disable-xtrap \
+                --disable-dmx ${W100_OECONF} \
+                --with-default-font-path=built-ins \
+                --enable-tslib --enable-xcalibrate \
+                ac_cv_file__usr_share_X11_sgml_defs_ent=no"
-EXTRA_OECONF_append_arm = " --enable-w100"
-EXTRA_OECONF_append_x86 = " --disable-w100"