From bd98b7965337639e5d7cfd409cfafb56d97f8cb2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 23 May 2014 19:19:22 +0200
Subject: [PATCH] efl: add x11 build option (on by default).

---
 srcpkgs/efl/template | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 91d0438401d..3886949cc3e 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,19 +1,15 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-xinput22 --enable-multisense
  --enable-image-loader-webp CXX="
 hostmakedepends="pkg-config"
-makedepends="openssl-devel glib-devel libXdamage-devel
- libjpeg-turbo-devel fontconfig-devel fribidi-devel libXrender-devel libXi-devel
- giflib-devel libpng-devel tiff-devel libwebp-devel>=0.4.0 gst-plugins-base1-devel
- alsa-lib-devel libsndfile-devel libXcursor-devel libXcomposite-devel
- libXinerama-devel xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel
- xcb-util-renderutil-devel xcb-util-wm-devel pixman-devel libxkbcommon-devel
- printproto libXp-devel libXrandr-devel libXScrnSaver-devel libmount-devel
- LuaJIT-devel bullet-devel avahi-libs-devel libudev-devel"
+makedepends="openssl-devel glib-devel libjpeg-turbo-devel fontconfig-devel
+ fribidi-devel giflib-devel libpng-devel tiff-devel libwebp-devel>=0.4.0
+ gst-plugins-base1-devel avahi-libs-devel libudev-devel bullet-devel
+ alsa-lib-devel libsndfile-devel libmount-devel LuaJIT-devel"
 replaces="
  ecore>=0 evas>=0 edje>=0 eio>=0 eina>=0 emotion>=0 eeze>=0 e_dbus>=0 eet>=0
  embryo>=0 efreet>=0 ethumb>=0"
@@ -34,7 +30,7 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 # Package build options
-build_options="framebuffer gles2 harfbuzz opengl pulseaudio systemd wayland"
+build_options="framebuffer gles2 harfbuzz opengl pulseaudio systemd wayland x11"
 desc_option_framebuffer="Enable support for the Framebuffer"
 desc_option_gles2="Enable support for GLESv2"
 desc_option_harfbuzz="enable support for Harfbuzz"
@@ -42,9 +38,10 @@ desc_option_opengl="Enable support for OpenGL"
 desc_option_pulseaudio="Enable support for Pulseaudio"
 desc_option_systemd="Enable support for systemd"
 desc_option_wayland="Enable support for Wayland"
+desc_option_x11="Enable support for X11"
 
 # Enable harfbuzz, pulseaudio, systemd and wayland by default.
-build_options_default="harfbuzz pulseaudio systemd wayland"
+build_options_default="harfbuzz pulseaudio systemd wayland x11"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	# Enable opengl by default on x86.
@@ -90,11 +87,21 @@ fi
 
 if [ "$build_option_wayland" ]; then
 	configure_args+=" --enable-egl --enable-wayland"
-	makedepends+=" wayland-devel"
+	makedepends+=" libxkbcommon-devel wayland-devel"
 else
 	configure_args+=" --disable-egl --disable-wayland"
 fi
 
+if [ "$build_option_x11" ]; then
+	configure_args+=" --with-x"
+	makedepends+=" libXp-devel libXrandr-devel libXScrnSaver-devel"
+	makedepends+=" libXdamage-devel libXrender-devel libXi-devel libXinerama-devel"
+	makedepends+=" xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel"
+	makedepends+=" xcb-util-renderutil-devel xcb-util-wm-devel"
+else
+	configure_args+=" --without-x --with-x11=none"
+fi
+
 efl-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} efl>=${version}_${revision}"