diff options
| author | Philip Balister <philip@balister.org> | 2006-10-19 11:13:32 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2006-10-19 11:13:32 +0000 |
| commit | 157fcb8d7c3d0c164aa81fd72b676c6620aa252e (patch) | |
| tree | ce079558f5a73ee9cdf34686c22210526d4bbc40 /packages/xorg-xserver | |
| parent | 435e8d5448a71c761e996bf60410d8e1dc2d6dcc (diff) | |
| parent | 8d4f949be4d1c5ba0bdd81f9bf0426d7c70e59d0 (diff) | |
merge of '4d2506a7328df70c3c1b58a19a5f52a6e6841a91'
and '95790f96b79f6c36ad3f1f583d73e9d450736479'
Diffstat (limited to 'packages/xorg-xserver')
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 26 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 28 |
2 files changed, 28 insertions, 26 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index c28f3a739b..b4b17e4e18 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,11 +1,11 @@ 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" -PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100 ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" @@ -54,14 +54,16 @@ S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" 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" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 198556c58d..4b9d820075 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,14 +1,14 @@ 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" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100 ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" @@ -56,16 +56,16 @@ S = "${WORKDIR}/git" 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_append_arm = " --enable-w100" -EXTRA_OECONF_append_x86 = " --disable-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" |