cleanup and restructure enlightenment and its libraries, remove and add workarounds...
authorMirko Vogt <mirko@openwrt.org>
Mon, 30 Mar 2009 11:53:33 +0000 (11:53 +0000)
committerMirko Vogt <mirko@openwrt.org>
Mon, 30 Mar 2009 11:53:33 +0000 (11:53 +0000)
SVN-Revision: 15075

18 files changed:
efl/ecore/Makefile
efl/edbus/Makefile
efl/edje/Makefile
efl/eet/Makefile
efl/efreet/Makefile
efl/eina/Makefile
efl/embryo/Makefile
efl/enlightenment/Config.in
efl/enlightenment/Makefile
efl/enlightenment/files/config/illume.cfg.src [new file with mode: 0644]
efl/enlightenment/files/uci-defaults/x11 [deleted file]
efl/enlightenment/files/uci-defaults/x11_illume [new file with mode: 0644]
efl/enlightenment/files/uci-defaults/x11_minimalist [new file with mode: 0644]
efl/enlightenment/files/uci-defaults/x11_netbook [new file with mode: 0644]
efl/enlightenment/files/uci-defaults/x11_scalable [new file with mode: 0644]
efl/enlightenment/files/uci-defaults/x11_standard [new file with mode: 0644]
efl/etk/Makefile
efl/evas/Makefile

index fcc42430ab9be6dc2843f77b4682a508ae6bde56..6e65d53cc67f8a32768fc5ddead60429d771e42c 100644 (file)
@@ -30,48 +30,62 @@ define Package/ecore
   SUBMENU:=libraries
   TITLE:=Ecore is the core event abstraction layer and X abstraction layer
   URL:=http://wiki.enlightenment.org/index.php/Ecore
-  DEPENDS:=+eet +evas +libXcursor +libXrandr +libXtst +libiconv @!LINUX_2_4 \
-  +libXdamage +libXfixes +libXrender +libXtst
+  DEPENDS:=+eet +evas +libiconv @!LINUX_2_4
 endef
 
 define Package/ecore/description
   Ecore is the core event abstraction layer and X abstraction layer that makes doing selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers fast, optimized, and convenient. It's a separate library so anyone can make use of the work put into Ecore to make this job easy for applications.
 endef
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-EXTRA_LDFLAGS+= \
-       -liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib
+# iconv needed for ecore-txt
+TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
+TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
        $(call Build/Configure/Default, \
-        --with-iconv-link \
-        --enable-ecore-txt \
-        --disable-ecore-config \
-        --disable-ecore-x-xcb \
-        --enable-ecore-x \
-        --enable-ecore-job \
-        --disable-ecore-directfb \
-        --disable-ecore-sdl \
-        --enable-ecore-fb \
-        --enable-ecore-evas \
-        --enable-ecore-evas-fb \
-        --disable-ecore-evas-x11-gl \
-        --enable-ecore-evas-xrender \
-        --disable-ecore-evas-dfb \
-        --disable-ecore-evas-sdl \
-        --disable-openssl \
-        --enable-abstract-sockets \
-        --enable-ecore-con \
-        --enable-ecore-ipc \
-        --enable-ecore-file \
-        --enable-inotify \
-        --disable-poll \
-        --disable-curl \
-        --disable-ecore-desktop \
-        --disable-gnutls \
+               --with-x \
+               --with-iconv-link \
+               --disable-gnutls \
+               --disable-openssl \
+               --disable-curl \
+               --disable-abstract-sockets \
+               --enable-ecore-job \
+               --enable-ecore-con \
+               --enable-ecore-ipc \
+               --disable-ecore-config \
+               --enable-ecore-txt \
+               --enable-ecore-evas \
+               --enable-ecore-x \
+               --enable-ecore-evas-xrender-x11 \
+               --disable-ecore-evas-dfb \
+               --disable-ecore-evas-fb \
+               --disable-ecore-evas-sdl \
+               --disable-ecore-evas-quartz \
+               --enable-ecore-evas-buffer \
+               --enable-ecore-file \
+               --disable-inotify \
+               --disable-poll \
+               --enable-ecore-imf \
+               --enable-ecore-imf_evas \
+               --disable-doc \
+               --disable-simple-x11 \
+               --disable-ecore-x-xcb \
+               --disable-ecore-evas-opengl-x11 \
+               --disable-ecore-evas-software-16-x11 \
+               --disable-ecore-evas-software-xcb \
+               --disable-ecore-evas-xrender-xcb \
+               --disable-ecore-win32 \
+               --disable-ecore-evas-software-ddraw \
+               --disable-ecore-evas-direct3d \
+               --disable-ecore-evas-opengl-glew \
+               --disable-ecore-evas-software-16-ddraw \
+               --disable-ecore-wince \
+               --disable-ecore-evas-software-16-wince \
+               --disable-ecore-directfb \
+               --disable-ecore-fb \
+               --disable-ecore-sdl \
+               --disable-ecore-quartz \
        )
 endef
 
@@ -88,6 +102,8 @@ endef
 define Package/ecore/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+       $(FIND) $(1)/ -name "*.la" | $(XARGS) rm
+       $(FIND) $(1)/ -name "*.a" | $(XARGS) rm
 endef
 
 $(eval $(call BuildPackage,ecore))
index 4c7d0b4967eb47b0d2b11899ad8561a7e99d5150..116ef95ef1f8e52350fb3895558b5e016fc5b62b 100644 (file)
@@ -33,11 +33,13 @@ define Package/edbus
   DEPENDS:=+libdbus +ecore
 endef
 
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-       $(call Build/Configure/Default)
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       $(call Build/Configure/Default, \
+               --enable-ehal \
+               --disable-enm \
+               --disable-enotify \
+       )
 endef
 
 define Build/Compile
index b0f446e530b08dc910627fa7c266c10317efc53b..97653fc4f18459b81b3fe7481f94863d58df9b1c 100644 (file)
@@ -30,19 +30,18 @@ define Package/edje
   SUBMENU:=libraries
   TITLE:=Edje is a graphical design and layout library
   URL:=http://wiki.enlightenment.org/index.php/Edje
-  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
+  DEPENDS:=+evas +ecore +embryo
 endef
 
 define Package/edje/description
-Edje is a graphical design and layout library based on Evas that provides an abstraction layer between the application code and the interface, while allowing extremely flexible dynamic layouts and animations.
+  Edje is a graphical design and layout library based on Evas that provides an abstraction layer between the application code and the interface, while allowing extremely flexible dynamic layouts and animations.
 endef
 
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
        $(call Build/Configure/Default, \
                --disable-edje-cc \
+               --disable-doc \
        )
 endef
 
index e65a0645139886358d303c4a033c3cac0bc6cde2..ec6203fe7b804d2edd9dfb7cca86f1609ba54834 100644 (file)
@@ -38,10 +38,17 @@ define Package/eet/description
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
        $(call Build/Configure/Default, \
-               --disable-openssl \
+               --disable-old-eet-file-format \
                --disable-gnutls \
+               --disable-openssl \
+               --disable-cipher \
+               --disable-signature \
+               --disable-doc \
+               --disable-assert \
+               --disable-tests \
+               --disable-coverage \
        )
 endef
 
index 6e6b87e270f18543487b8ffa273c025451e176c0..0f17cd59b5d0dffca09f53d7fe4d60adf6e0d50c 100644 (file)
@@ -34,12 +34,16 @@ define Package/efreet
 endef
 
 define Package/efreet/description
- Efreet is an implementation of several specifications from freedesktop.org intended for use in Enlightenment DR17 (e17) and other applications using the Enlightenment Foundation Libraries (EFL).
 Efreet is an implementation of several specifications from freedesktop.org intended for use in Enlightenment DR17 (e17) and other applications using the Enlightenment Foundation Libraries (EFL).
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-       $(call Build/Configure/Default)
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       $(call Build/Configure/Default, \
+               --disable-sloppy-spec \
+               --disable-doc \
+               --enable-hidden-visibility \
+       )
 endef
 
 define Build/Compile
index 9da74c5590963478f9eb1a7bda36c093da2ed9c4..2bafb6c599208772408784212632915419bd4cff 100644 (file)
@@ -30,18 +30,17 @@ define Package/eina
   SUBMENU:=libraries
   TITLE:=Eina
   URL:=http://wiki.enlightenment.org/index.php/Eina
-#  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
 endef
 
-define Package/eina/description
-foobar
-endef
-
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-       $(call Build/Configure/Default)
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       $(call Build/Configure/Default, \
+               --disable-cpu-mmx \
+               --disable-cpu-sse \
+               --disable-cpu-sse2 \
+               --disable-magic-debug \
+               --disable-doc \
+       )
 endef
 
 define Build/Compile
@@ -57,7 +56,8 @@ endef
 define Package/eina/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-       find $(1)/usr/lib -name *.la -name *.a | xargs rm -f
+       $(FIND) $(1)/ -name "*.la" | $(XARGS) rm
+       $(FIND) $(1)/ -name "*.a" | $(XARGS) rm
 endef
 
 $(eval $(call BuildPackage,eina))
index f0299d9500b6fed20f6ceb2faa1288bd9bc68c8d..fc1816363959aa12da31ed134998ded6c8ca20b4 100644 (file)
@@ -30,7 +30,6 @@ define Package/embryo
   SUBMENU:=libraries
   TITLE:=Embryo implements a C like scripting language used in various parts of the Enlightenment project (edje)
   URL:=http://wiki.enlightenment.org/index.php/Embryo
-  DEPENDS:=+eet +evas +libXtst +libXcursor +libXrandr 
 endef
 
 define Package/embryo/description
@@ -38,8 +37,10 @@ define Package/embryo/description
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-       $(call Build/Configure/Default)
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       $(call Build/Configure/Default, \
+               --disable-doc \
+       )
 endef
 
 define Build/Compile
index 989b5722dd9255a06ae1cb279a201d5af412eee8..aea0dff93071f06d5955d3020625167ef8498680 100644 (file)
@@ -1,24 +1,24 @@
 choice
        prompt "default enlightenment profile"
-       default E17_STANDARD
+       default E17_standard
 
-config E17_ILLUME
+config E17_illume
        bool
        prompt "illume"
 
-config E17_MINIMALIST
+config E17_minimalist
        bool
        prompt "minimalist"
 
-config E17_NETBOOK
+config E17_netbook
        bool
        prompt "netbook"
 
-config E17_SCALEABLE
+config E17_scalable
        bool
        prompt "scalable"
 
-config E17_STANDARD
+config E17_standard
        bool
        prompt "standard"
 
index 224ab22f4c0a017b2867a1b4885e5783eacb43bd..cb64dddedb18835274f2748402f2f1f4605e3c6e 100644 (file)
@@ -30,34 +30,72 @@ define Package/enlightenment
   SUBMENU:=window manager
   TITLE:=Enlightenment e17 window manager
   URL:=http://enlightenment.org
-  DEPENDS:=+libintl +libpthread +eet +evas +ecore +edje +efreet +dbus +edbus +dejavu-fonts-ttf +freedesktop-compliant
+  DEPENDS:=+libintl +eet +evas +ecore +edje +efreet +dbus +edbus +dejavu-fonts-ttf +freedesktop-compliant
 endef
 
 define Package/enlightenment/config
-       menu "Configuration"
-       depends on PACKAGE_enlightenment
-       source "$(SOURCE)/Config.in"
-       endmenu
+  menu "Configuration"
+  depends on PACKAGE_enlightenment
+  source "$(SOURCE)/Config.in"
+  endmenu
 endef
 
 define Package/enlightenment/description
    Enlightenment is a window manager. Enlightenment is a desktop shell. Enlightenment is the building blocks to create beautiful applications. Enlightenment, or simply e, is a group of people trying to make a new generation of software.
 endef
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
-EXTRA_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
+TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
+TARGET_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-       $(call Build/Configure/Default, --with-edje-cc=$(STAGING_DIR_HOST)/usr/bin/edje_cc  --with-eet-eet=$(STAGING_DIR_HOST)/usr/bin/eet)
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       $(call Build/Configure/Default, \
+               --with-x \
+               --with-edje-cc=$(STAGING_DIR_HOST)/usr/bin/edje_cc \
+               --with-eet-eet=$(STAGING_DIR_HOST)/usr/bin/eet \
+               --disable-nls \
+               --disable-rpath \
+               --enable-ibar \
+               --enable-dropshadow \
+               --enable-clock \
+               --enable-pager \
+               --enable-battery \
+               --enable-temperature \
+               --enable-cpufreq \
+               --enable-ibox \
+               --enable-start \
+               --enable-exebuf \
+               --enable-winlist \
+               --enable-fileman \
+               --disable-wizard \
+               --disable-msgbus-lang \
+               --enable-gadman \
+               --enable-mixer \
+               --disable-connman \
+               --enable-illume \
+               --enable-syscon \
+               --disable-pam \
+               --disable-simple-x11 \
+               --enable-files \
+       )
 endef
 
+PROFILES:=\
+       illume \
+       minimalist \
+       netbook \
+       scalable \
+       standard \
+
 define Build/Compile
        mkdir -p $(STAGING_DIR_HOST)/usr/bin
        # let's see who is workarounding the edje[_cc]/eet-issue most dirrty ^^
        ln -sf `which edje_cc` $(STAGING_DIR_HOST)/usr/bin/
        ln -sf `which eet` $(STAGING_DIR_HOST)/usr/bin/
        DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+       $(foreach c, $(PROFILES), \
+               ! [ -f ./files/config/$(c).cfg.src ] || $(STAGING_DIR_HOST)/usr/bin/eet -e $(PKG_INSTALL_DIR)/usr/share/enlightenment/data/config/$(c)/e.cfg config ./files/config/$(c).cfg.src 1
+       )
        rm -f $(STAGING_DIR_HOST)/usr/bin/{edje_cc,eet}
 endef
 
@@ -74,22 +112,20 @@ define Package/enlightenment/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
-       $(INSTALL_DATA) ./files/uci-defaults/x11 $(1)/etc/uci-defaults/
-       $(if $(CONFIG_E17_ILLUME),echo -n "illume" >> $(1)/etc/uci-defaults/x11)
-       $(if $(CONFIG_E17_MINIMALIST),echo -n "minimalist" >> $(1)/etc/uci-defaults/x11)
-       $(if $(CONFIG_E17_NETBOOK),echo -n "netbook" >> $(1)/etc/uci-defaults/x11)
-       $(if $(CONFIG_E17_SCALEABLE),echo -n "scaleable" >> $(1)/etc/uci-defaults/x11)
-       $(if $(CONFIG_E17_STANDARD),echo -n "standard" >> $(1)/etc/uci-defaults/x11)
-       echo "'" >> $(1)/etc/uci-defaults/x11
-       find $(1)/ -name *.la | xargs rm -f
-       find $(1)/ -name *.a | xargs rm -f
+       $(foreach c, $(PROFILES), \
+               $(if $(CONFIG_E17_$(c)), \
+                       $(INSTALL_DATA) ./files/uci-defaults/x11_$(c) $(1)/etc/uci-defaults/
+               )
+       )
+       $(FIND) $(1)/ -name "*.la" | $(XARGS) rm
+       $(FIND) $(1)/ -name "*.a" | $(XARGS) rm
 endef
 
 define Package/enlightenment/postinst
-       #!/bin/sh
-       [ -n "$${IPKG_INSTROOT}" ] && exit
-       . /etc/functions.sh
-       uci_apply_defaults
+  #!/bin/sh
+  [ -n "$${IPKG_INSTROOT}" ] && exit
+  . /etc/functions.sh
+  uci_apply_defaults
 endef
 
 $(eval $(call BuildPackage,enlightenment))
diff --git a/efl/enlightenment/files/config/illume.cfg.src b/efl/enlightenment/files/config/illume.cfg.src
new file mode 100644 (file)
index 0000000..babc87b
--- /dev/null
@@ -0,0 +1,786 @@
+group "E_Config" struct {
+  value "config_version" int: 65836;
+  value "show_splash" int: 0;
+  value "init_default_theme" string: "illume_init.edj";
+  value "desktop_default_name" string: "Desktop %i, %i";
+  value "menus_scroll_speed" double: 1000.0000000000000000000000000;
+  value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000;
+  value "menus_click_drag_timeout" double: 0.2500000000000000000000000;
+  value "border_shade_animate" int: 1;
+  value "border_shade_transition" int: 3;
+  value "border_shade_speed" double: 3000.0000000000000000000000000;
+  value "framerate" double: 25.0000000000000000000000000;
+  value "image_cache" int: 2048;
+  value "font_cache" int: 512;
+  value "edje_cache" int: 8;
+  value "edje_collection_cache" int: 24;
+  value "zone_desks_x_count" int: 1;
+  value "zone_desks_y_count" int: 1;
+  value "use_virtual_roots" int: 0;
+  value "show_desktop_icons" int: 0;
+  value "edge_flip_dragging" int: 0;
+  value "edge_flip_moving" int: 0;
+  value "edge_flip_timeout" double: 0.2500000000000000000000000;
+  value "evas_engine_default" int: 4;
+  value "evas_engine_container" int: 0;
+  value "evas_engine_init" int: 0;
+  value "evas_engine_menus" int: 0;
+  value "evas_engine_borders" int: 0;
+  value "evas_engine_errors" int: 0;
+  value "evas_engine_popups" int: 0;
+  value "evas_engine_drag" int: 0;
+  value "evas_engine_win" int: 0;
+  value "evas_engine_zone" int: 0;
+  value "use_composite" int: 0;
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 1;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_desk";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_dialogs";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_imc";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_keybindings";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_intl";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_mouse_cursor";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_transitions";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_display";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_profiles";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_performance";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_fonts";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_engine";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_startup";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_theme";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_wallpaper";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_desks";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_scale";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "gadman";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: -100;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "battery";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "mixer";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "clock";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "pager";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "syscon";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "themes" list {
+    group "E_Config_Theme" struct {
+      value "category" string: "theme";
+      value "file" string: "illume.edj";
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 0;
+      value "key" string: "Execute";
+      value "action" string: "delayed_action";
+      value "params" string: "[0.0 syscon] [2.0 halt_now]";
+      value "any_mod" uchar: 1;
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,[12]";
+      value "source" string: "e.event.close";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_close";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,up,1";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+      value "params" string: "end";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.tl";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "tl";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.t";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "t";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.tr";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "tr";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.r";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "r";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.br";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "br";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.b";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "b";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.bl";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "bl";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.l";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "l";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,up,1";
+      value "source" string: "e.event.resize.*";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "end";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,3";
+      value "source" string: "e.event.resize.*";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,up,3";
+      value "source" string: "e.event.resize.*";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+      value "params" string: "end";
+    }
+  }
+  value "window_placement_policy" int: 0;
+  value "focus_policy" int: 0;
+  value "focus_setting" int: 1;
+  value "pass_click_on" int: 1;
+  value "always_click_to_raise" int: 0;
+  value "always_click_to_focus" int: 0;
+  value "use_auto_raise" int: 0;
+  value "auto_raise_delay" double: 0.5000000000000000000000000;
+  value "use_resist" int: 1;
+  value "drag_resist" int: 16;
+  value "desk_resist" int: 32;
+  value "window_resist" int: 12;
+  value "gadget_resist" int: 32;
+  value "winlist_warp_while_selecting" int: 1;
+  value "winlist_warp_at_end" int: 1;
+  value "winlist_warp_speed" double: 0.1000000000000000055511151;
+  value "winlist_scroll_animate" int: 1;
+  value "winlist_scroll_speed" double: 0.1000000000000000055511151;
+  value "winlist_list_show_iconified" int: 1;
+  value "winlist_list_show_other_desk_iconified" int: 1;
+  value "winlist_list_show_other_screen_iconified" int: 0;
+  value "winlist_list_show_other_desk_windows" int: 0;
+  value "winlist_list_show_other_screen_windows" int: 0;
+  value "winlist_list_uncover_while_selecting" int: 0;
+  value "winlist_list_jump_desk_while_selecting" int: 0;
+  value "winlist_list_focus_while_selecting" int: 1;
+  value "winlist_list_raise_while_selecting" int: 1;
+  value "winlist_pos_align_x" double: 0.5000000000000000000000000;
+  value "winlist_pos_align_y" double: 0.5000000000000000000000000;
+  value "winlist_pos_size_w" double: 0.5000000000000000000000000;
+  value "winlist_pos_size_h" double: 0.5000000000000000000000000;
+  value "winlist_pos_min_w" int: 0;
+  value "winlist_pos_min_h" int: 0;
+  value "winlist_pos_max_w" int: 320;
+  value "winlist_pos_max_h" int: 320;
+  value "maximize_policy" int: 50;
+  value "allow_manip" int: 0;
+  value "border_fix_on_shelf_toggle" int: 0;
+  value "allow_above_fullscreen" int: 0;
+  value "kill_if_close_not_possible" int: 1;
+  value "kill_process" int: 1;
+  value "kill_timer_wait" double: 10.0000000000000000000000000;
+  value "ping_clients" int: 1;
+  value "transition_desk" string: "vswipe";
+  value "transition_change" string: "crossfade";
+  value "remember_internal_windows" int: 0;
+  value "move_info_follows" int: 1;
+  value "resize_info_follows" int: 1;
+  value "move_info_visible" int: 1;
+  value "resize_info_visible" int: 1;
+  value "focus_last_focused_per_desktop" int: 1;
+  value "focus_revert_on_hide_or_close" int: 1;
+  value "pointer_slide" int: 0;
+  value "use_e_cursor" int: 1;
+  value "cursor_size" int: 32;
+  value "menu_autoscroll_margin" int: 0;
+  value "menu_autoscroll_cursor_margin" int: 1;
+  value "transient.move" int: 1;
+  value "transient.resize" int: 0;
+  value "transient.raise" int: 1;
+  value "transient.lower" int: 1;
+  value "transient.layer" int: 1;
+  value "transient.desktop" int: 1;
+  value "transient.iconify" int: 1;
+  value "modal_windows" int: 1;
+  value "menu_eap_name_show" int: 1;
+  value "menu_eap_generic_show" int: 1;
+  value "menu_eap_comment_show" int: 0;
+  value "fullscreen_policy" int: 0;
+  value "exebuf_max_exe_list" int: 20;
+  value "exebuf_max_eap_list" int: 20;
+  value "exebuf_max_hist_list" int: 20;
+  value "exebuf_scroll_animate" int: 1;
+  value "exebuf_scroll_speed" double: 0.1000000000000000055511151;
+  value "exebuf_pos_align_x" double: 0.5000000000000000000000000;
+  value "exebuf_pos_align_y" double: 0.5000000000000000000000000;
+  value "exebuf_pos_size_w" double: 0.7500000000000000000000000;
+  value "exebuf_pos_size_h" double: 0.2500000000000000000000000;
+  value "exebuf_pos_min_w" int: 200;
+  value "exebuf_pos_min_h" int: 160;
+  value "exebuf_pos_max_w" int: 400;
+  value "exebuf_pos_max_h" int: 320;
+  value "exebuf_term_cmd" string: "xterm -hold -e";
+  value "use_app_icon" int: 0;
+  value "cnfmdlg_disabled" int: 0;
+  value "cfgdlg_auto_apply" int: 0;
+  value "cfgdlg_default_mode" int: 0;
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "slipshelf";
+      value "id" int: 0;
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "clock";
+          value "id" string: "clock";
+          value "geom.pos" int: 720;
+          value "geom.size" int: 42;
+          value "geom.res" int: 138;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 1;
+          value "state_info.flags" int: 1;
+          value "style" string: "plain";
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "battery";
+          value "id" string: "battery";
+          value "geom.pos" int: 720;
+          value "geom.size" int: 52;
+          value "geom.res" int: 142;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 4;
+          value "state_info.flags" int: 1;
+          value "style" string: "plain";
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "illume-gsm";
+          value "id" string: "illume-gsm";
+          value "geom.pos" int: 720;
+          value "geom.size" int: 29;
+          value "geom.res" int: 142;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 3;
+          value "state_info.flags" int: 1;
+          value "style" string: "plain";
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "illume-wifi";
+          value "id" string: "illume-wifi";
+          value "geom.pos" int: 720;
+          value "geom.size" int: 19;
+          value "geom.res" int: 138;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 2;
+          value "state_info.flags" int: 1;
+          value "style" string: "plain";
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "slipshelf_extra";
+      value "id" int: 0;
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "illume-bluetooth";
+          value "id" string: "illume-bluetooth";
+          value "geom.pos" int: 440;
+          value "geom.size" int: 32;
+          value "geom.res" int: 472;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 3;
+          value "state_info.flags" int: 3;
+          value "style" string: "plain";
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "configuration";
+          value "id" string: "configuration";
+          value "geom.pos" int: 0;
+          value "geom.size" int: 32;
+          value "geom.res" int: 472;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 1;
+          value "state_info.flags" int: 1;
+          value "style" string: "plain";
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "pager";
+          value "id" string: "pager";
+          value "geom.pos" int: 376;
+          value "geom.size" int: 96;
+          value "geom.res" int: 472;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 4;
+          value "state_info.flags" int: 0;
+          value "style" string: "inset";
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "gadman";
+      value "id" int: 114;
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "gadman_top";
+      value "id" int: 115;
+    }
+  }
+  value "font_hinting" int: 0;
+  value "desklock_auth_method" int: 0;
+  value "desklock_login_box_zone" int: -1;
+  value "desklock_start_locked" int: 0;
+  value "desklock_autolock_screensaver" int: 0;
+  value "desklock_autolock_idle" int: 0;
+  value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
+  value "desklock_use_custom_desklock" int: 0;
+  value "display_res_restore" int: 0;
+  value "display_res_width" int: 1;
+  value "display_res_height" int: 1;
+  value "display_res_hz" int: 0;
+  value "display_res_rotation" int: 0;
+  value "screensaver_enable" int: 1;
+  value "screensaver_timeout" int: 30;
+  value "screensaver_interval" int: 5;
+  value "screensaver_blanking" int: 2;
+  value "screensaver_expose" int: 2;
+  value "dpms_enable" int: 0;
+  value "dpms_standby_enable" int: 0;
+  value "dpms_suspend_enable" int: 0;
+  value "dpms_off_enable" int: 0;
+  value "dpms_standby_timeout" int: 0;
+  value "dpms_suspend_timeout" int: 0;
+  value "dpms_off_timeout" int: 0;
+  value "clientlist_group_by" int: 0;
+  value "clientlist_include_all_zones" int: 0;
+  value "clientlist_separate_with" int: 0;
+  value "clientlist_sort_by" int: 0;
+  value "clientlist_separate_iconified_apps" int: 0;
+  value "clientlist_warp_to_iconified_desktop" int: 0;
+  value "clientlist_limit_caption_len" int: 0;
+  value "clientlist_max_caption_len" int: 2;
+  value "mouse_hand" int: 1;
+  value "mouse_accel_numerator" int: 2;
+  value "mouse_accel_denominator" int: 1;
+  value "mouse_accel_threshold" int: 4;
+  value "border_raise_on_mouse_action" int: 1;
+  value "border_raise_on_focus" int: 1;
+  value "desk_flip_wrap" int: 0;
+  value "icon_theme" string: "Tango";
+  value "desk_flip_animate_mode" int: 0;
+  value "desk_flip_animate_interpolation" int: 0;
+  value "desk_flip_animate_time" double: 0.2000000000000000111022302;
+  value "wallpaper_import_last_dev" string: "~/";
+  value "wallpaper_import_last_path" string: "/";
+  value "wallpaper_grad_c1_r" int: 0;
+  value "wallpaper_grad_c1_g" int: 0;
+  value "wallpaper_grad_c1_b" int: 0;
+  value "wallpaper_grad_c2_r" int: 255;
+  value "wallpaper_grad_c2_g" int: 255;
+  value "wallpaper_grad_c2_b" int: 255;
+  value "theme_default_border_style" string: "default";
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/jpeg";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/png";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/x-pixmap";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/x-xpixmap";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/gif";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "application/x-desktop";
+      value "icon" string: "DESKTOP";
+    }
+  }
+  value "desk_auto_switch" int: 0;
+  value "thumb_nice" int: 0;
+  value "menu_favorites_show" int: 1;
+  value "menu_apps_show" int: 1;
+  value "ping_clients_interval" int: 128;
+  value "cache_flush_poll_interval" int: 512;
+  value "thumbscroll_enable" int: 1;
+  value "thumbscroll_threshhold" int: 24;
+  value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000;
+  value "thumbscroll_friction" double: 1.0000000000000000000000000;
+  value "hal_desktop" int: 0;
+  value "border_keyboard.timeout" double: 5.0000000000000000000000000;
+  value "border_keyboard.move.dx" uchar: 5;
+  value "border_keyboard.move.dy" uchar: 5;
+  value "border_keyboard.resize.dx" uchar: 5;
+  value "border_keyboard.resize.dy" uchar: 5;
+  value "hal_desktop" int: 0;
+  value "scale.min" double: 1.0000000000000000000000000;
+  value "scale.max" double: 3.0000000000000000000000000;
+  value "scale.factor" double: 1.0000000000000000000000000;
+  value "scale.base_dpi" int: 142;
+  value "scale.use_dpi" uchar: 1;
+  value "scale.use_custom" uchar: 0;
+  value "show_cursor" uchar: 0;
+  value "idle_cursor" uchar: 0;
+  value "default_system_menu" string: "";
+  value "cfgdlg_normal_wins" uchar: 1;
+  value "syscon.main.icon_size" int: 64;
+  value "syscon.secondary.icon_size" int: 48;
+  value "syscon.extra.icon_size" int: 48;
+  value "syscon.timeout" double: 5.0000000000000000000000000;
+  value "syscon.do_input" uchar: 0;
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "suspend";
+      value "params" string: "now";
+      value "button" string: "button";
+      value "icon" string: "enlightenment/suspend";
+      value "is_main" int: 1;
+    }
+  }
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "desk_lock";
+      value "button" string: "button";
+      value "icon" string: "enlightenment/desklock_menu";
+      value "is_main" int: 1;
+    }
+  }
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "halt";
+      value "params" string: "now";
+      value "button" string: "button";
+      value "icon" string: "enlightenment/halt";
+      value "is_main" int: 0;
+    }
+  }
+}
diff --git a/efl/enlightenment/files/uci-defaults/x11 b/efl/enlightenment/files/uci-defaults/x11
deleted file mode 100644 (file)
index d253591..0000000
+++ /dev/null
@@ -1 +0,0 @@
-uci set x11.@desktop[0].autostart='enlightenment_start -profile 
\ No newline at end of file
diff --git a/efl/enlightenment/files/uci-defaults/x11_illume b/efl/enlightenment/files/uci-defaults/x11_illume
new file mode 100644 (file)
index 0000000..e2eee4f
--- /dev/null
@@ -0,0 +1 @@
+uci set x11.@desktop[0].autostart='enlightenment_start -profile illume'
diff --git a/efl/enlightenment/files/uci-defaults/x11_minimalist b/efl/enlightenment/files/uci-defaults/x11_minimalist
new file mode 100644 (file)
index 0000000..1087815
--- /dev/null
@@ -0,0 +1 @@
+uci set x11.@desktop[0].autostart='enlightenment_start -profile minimalist'
diff --git a/efl/enlightenment/files/uci-defaults/x11_netbook b/efl/enlightenment/files/uci-defaults/x11_netbook
new file mode 100644 (file)
index 0000000..e9fd0e7
--- /dev/null
@@ -0,0 +1 @@
+uci set x11.@desktop[0].autostart='enlightenment_start -profile netbook'
diff --git a/efl/enlightenment/files/uci-defaults/x11_scalable b/efl/enlightenment/files/uci-defaults/x11_scalable
new file mode 100644 (file)
index 0000000..4f72ea5
--- /dev/null
@@ -0,0 +1 @@
+uci set x11.@desktop[0].autostart='enlightenment_start -profile scalable'
diff --git a/efl/enlightenment/files/uci-defaults/x11_standard b/efl/enlightenment/files/uci-defaults/x11_standard
new file mode 100644 (file)
index 0000000..c7c7edf
--- /dev/null
@@ -0,0 +1 @@
+uci set x11.@desktop[0].autostart='enlightenment_start -profile standard'
index 33576a37cf87abad9c93b4ea2f1dd694d597ef1f..ab5613d2debc37cc3678d0567fb4e690e6e00a18 100644 (file)
@@ -37,12 +37,16 @@ define Package/etk/description
   Etk is a toolkit based on the EFL
 endef
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
-EXTRA_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib
+TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
+TARGET_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-       $(call Build/Configure/Default)
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       $(call Build/Configure/Default, \
+               --disable-nls \
+               --disable-rpath \
+               --disable-ecore-fb-x11-support \
+       )
 endef
 
 define Build/Compile
index d7dba941ed2754062563985d2c68b133984abf02..9d7e8b5d56d44cf111973deca84530c265dc884b 100644 (file)
@@ -30,7 +30,7 @@ define Package/evas
   SUBMENU:=libraries
   TITLE:=Evas is a hardware-accelerated canvas API for X-Windows
   URL:=http://wiki.enlightenment.org/index.php/Evas
-  DEPENDS:=+eet +libfreetype +libjpeg +libpng +libX11 +libXext +libXrender +fontconfig
+  DEPENDS:=+libXext +libfreetype +libX11 +fontconfig +eet +libfreetype +libjpeg +libpng +libXrender +libpthread
 endef
 
 define Package/evas/description
@@ -38,64 +38,83 @@ define Package/evas/description
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
        $(call Build/Configure/Default, \
-               --disable-pthreads              \
-               --enable-fb                     \
-               --disable-directfb              \
-               --disable-sdl                   \
-               --enable-buffer                 \
-               --disable-software-ddraw        \
-               --disable-software-qtopia       \
-               --enable-simple-x11             \
-               --enable-software-x11           \
-               --enable-software-16-x11        \
-               --disable-software-xcb          \
-               --disable-gl-x11                \
-               --enable-xrender-x11            \
-               --disable-xrender-xcb           \
-               --disable-glitz-x11             \
-               --enable-image-loader-eet       \
-               --disable-image-loader-edb      \
-               --disable-image-loader-gif      \
-               --enable-image-loader-png       \
-               --enable-image-loader-jpeg      \
-               --enable-image-loader-tiff      \
-               --enable-image-loader-xpm       \
-               --enable-image-loader-svg       \
-               --enable-cpu-c                  \
-               --enable-fontconfig             \
-               --enable-font-loader-eet        \
-               --enable-scale-sample           \
-               --enable-scale-smooth           \
-               --enable-convert-yuv            \
-               --enable-small-dither-mask      \
-               --enable-no-dither-mask \
-               --enable-convert-8-rgb-332      \
-               --enable-convert-8-rgb-666      \
-               --enable-convert-8-rgb-232      \
-               --enable-convert-8-rgb-222      \
-               --enable-convert-8-rgb-221      \
-               --enable-convert-8-rgb-121      \
-               --enable-convert-8-rgb-111      \
-               --enable-convert-16-rgb-565     \
-               --enable-convert-16-rgb-555     \
-               --enable-convert-16-rgb-444     \
-               --enable-convert-16-rgb-ipq     \
-               --enable-convert-16-rgb-rot-0   \
-               --enable-convert-16-rgb-rot-90  \
-               --enable-convert-16-rgb-rot-180\
-               --enable-convert-16-rgb-rot-270 \
-               --enable-convert-24-rgb-888     \
-               --enable-convert-24-bgr-888     \
-               --enable-convert-32-rgb-8888    \
-               --enable-convert-32-rgbx-8888   \
-               --enable-convert-32-bgr-8888    \
-               --enable-convert-32-bgrx-8888   \
-               --enable-convert-32-rgb-rot-0   \
-               --enable-convert-32-rgb-rot-90  \
+               --with-x \
+               --enable-fontconfig \
+               --disable-image-loader-edb \
+               --enable-image-loader-eet \
+               --enable-font-loader-eet \
+               --enable-image-loader-gif \
+               --enable-image-loader-jpeg \
+               --disable-image-loader-pmaps \
+               --enable-image-loader-png \
+               --disable-image-loader-svg \
+               --disable-image-loader-tiff \
+               --enable-image-loader-xpm \
+               --enable-evas-magic-debug \
+               --enable-convert-8-rgb-332 \
+               --enable-convert-8-rgb-666 \
+               --enable-convert-8-rgb-232 \
+               --enable-convert-8-rgb-222 \
+               --enable-convert-8-rgb-221 \
+               --enable-convert-8-rgb-121 \
+               --enable-convert-8-rgb-111 \
+               --enable-convert-16-rgb-565 \
+               --enable-convert-16-bgr-565 \
+               --enable-convert-16-rgb-555 \
+               --enable-convert-16-rgb-444 \
+               --enable-convert-16-rgb-ipq \
+               --enable-convert-16-rgb-rot-0 \
+               --enable-convert-16-rgb-rot-180 \
+               --enable-convert-16-rgb-rot-270 \
+               --enable-convert-16-rgb-rot-90 \
+               --enable-convert-24-rgb-888 \
+               --enable-convert-24-bgr-888 \
+               --enable-convert-32-rgb-8888 \
+               --enable-convert-32-rgbx-8888 \
+               --enable-convert-32-bgr-8888 \
+               --enable-convert-32-bgrx-8888 \
+               --enable-convert-32-rgb-rot-0 \
                --enable-convert-32-rgb-rot-180 \
                --enable-convert-32-rgb-rot-270 \
+               --enable-convert-32-rgb-rot-90 \
+               --disable-doc \
+               --disable-simple-x11 \
+               --enable-buffer \
+               --enable-software-x11 \
+               --enable-xrender-x11 \
+               --disable-gl-x11 \
+               --disable-glitz-x11 \
+               --disable-cairo-x11 \
+               --disable-software-xcb \
+               --disable-xrender-xcb \
+               --disable-software-ddraw \
+               --disable-direct3d \
+               --disable-quartz \
+               --disable-gl-glew \
+               --disable-software-sdl \
+               --disable-fb \
+               --disable-directfb \
+               --disable-software-qtopia \
+               --disable-software-16-x11 \
+               --disable-software-16-ddraw \
+               --disable-software-16-wince \
+               --disable-sdl-primitive \
+               --enable-pthreads \
+               --disable-async-events \
+               --disable-async-preload \
+               --disable-cpu-mmx \
+               --disable-cpu-sse \
+               --disable-cpu-altivec \
+               --enable-cpu-c \
+               --enable-scale-sample \
+               --enable-scale-smooth \
+               --disable-convert-yuv \
+               --disable-small-dither-mask \
+               --disable-line-dither-mask \
+               --disable-no-dither-mask \
+               --disable-valgrind \
        )
 endef
 
@@ -113,8 +132,8 @@ define Package/evas/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevas.so* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/evas $(1)/usr/lib/
-       find $(1)/usr/lib/evas -name *.la | xargs rm -rf
-       find $(1)/usr/lib/evas -name *.a | xargs rm -rf
+       $(FIND) $(1)/ -name "*.la" | $(XARGS) rm
+       $(FIND) $(1)/ -name "*.a" | $(XARGS) rm
 endef
 
 $(eval $(call BuildPackage,evas))