diff options
author | Eric Sandall | 2013-01-08 11:39:30 -0800 |
---|---|---|
committer | Eric Sandall | 2013-01-08 11:39:30 -0800 |
commit | 9a84379b45a728f934f25428d0d4061819e6a152 (patch) | |
tree | 952e3e55c52ee22cdcfb5bb2bb07aee1f113ca6e /e-17 | |
parent | 064fe1a615f9c5de1ccd0545bd497103813e09be (diff) |
evas: X11 and XCB are mutually exclusive
Diffstat (limited to 'e-17')
-rwxr-xr-x | e-17/evas/BUILD | 10 | ||||
-rwxr-xr-x | e-17/evas/CONFIGURE | 3 | ||||
-rwxr-xr-x | e-17/evas/DEPENDS | 17 | ||||
-rw-r--r-- | e-17/evas/HISTORY | 1 |
4 files changed, 20 insertions, 11 deletions
diff --git a/e-17/evas/BUILD b/e-17/evas/BUILD index b1976c06dd..c795dcbb37 100755 --- a/e-17/evas/BUILD +++ b/e-17/evas/BUILD @@ -42,7 +42,15 @@ fi && if is_depends_enabled $SPELL fribidi && is_depends_enabled fribidi glib2 ; then CFLAGS="$CFLAGS -I/usr/include/glib-2.0" -fi +fi && + +if [[ "x${EVAS_X11XCB}" == "xnone" ]]; then + OPTS="--disable-software-xlib \ + --without-x \ + --disable-software-xcb \ + --disable-async-events \ + $OPTS" +fi && # We don't have wayland spells yet, http://wayland.freedesktop.org/ OPTS="--disable-wayland-shm --disable-wayland-egl $OPTS" && diff --git a/e-17/evas/CONFIGURE b/e-17/evas/CONFIGURE index f4190a5aa8..e78a84156c 100755 --- a/e-17/evas/CONFIGURE +++ b/e-17/evas/CONFIGURE @@ -5,6 +5,9 @@ config_query EVAS_YUV "Enable YUV converter code?" y && config_query EVAS_DITHER_MASK "Enable small dither mask code?" n && config_query EVAS_ASYNC_RENDER "Enable asynchrone render?(use carefully!!)" n && +config_query_list EVAS_X11XCB "Use X11 (recommended) or XCB software rendering?" \ + x11 xcb none + config_query_option EVAS_PMAPS "Enable portable pixmap support?" y \ '--enable-image-loader-pmaps' '--disable-image-loader-pmaps' && diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS index 8a934c90f0..07b588abbb 100755 --- a/e-17/evas/DEPENDS +++ b/e-17/evas/DEPENDS @@ -4,6 +4,13 @@ depends eina && depends libtool && depends freetype2 && +if [[ "x${EVAS_X11XCB}" == "xx11" ]]; then + depends xorg-libs "--enable-software-xlib --with-x" +elif [[ "x${EVAS_X11XCB}" == "xxcb" ]]; then + depends libxcb "--enable-software-xcb --enable-async-events" +# else "none" handled in BUILD +fi && + optional_depends doxygen \ '--enable-doc' \ '--disable-doc' \ @@ -44,16 +51,6 @@ optional_depends sdl \ "--disable-software-16-sdl" \ "Enable software 16bit SDL rendering backend?" && -optional_depends xorg-libs \ - "--enable-software-xlib --with-x" \ - "--disable-software-xlib --without-x" \ - "for software X11 rendering backend" && - -optional_depends libxcb \ - "--enable-software-xcb --enable-async-events" \ - "--disable-software-xcb --disable-async-events" \ - "Enable software XCB engine and rendering backend?" && - optional_depends OPENGL \ "--enable-gl-xlib" \ "--disable-gl-xlib" \ diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY index 14a5b00bfc..725cae2a3d 100644 --- a/e-17/evas/HISTORY +++ b/e-17/evas/HISTORY @@ -1,4 +1,5 @@ 2013-01-08 Eric Sandall <sandalle@sourcemage.org> + * BUILD, CONFIGURE, DEPENDS: X11 and XCB are mutually exclusive * DEPENDS: eet is required, not optional 2013-01-04 Eric Sandall <sandalle@sourcemage.org> |