From feaa0a4131c94ba9a2f7ab85f1c8185864a41024 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 23 Jan 2006 15:52:47 +0000
Subject: [PATCH] more checks at runtime if e is ok - ie evas and ecore_evas
 supoprt is all there.

SVN revision: 19990
---
 data/images/Makefile.am |   5 +++-
 data/images/test.edj    | Bin 0 -> 1534 bytes
 data/images/test.jpg    | Bin 0 -> 620 bytes
 data/images/test.png    | Bin 0 -> 653 bytes
 enlightenment.spec.in   |   9 ++++---
 src/bin/e_main.c        |  54 ++++++++++++++++++++++++++++++++++++++--
 6 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 data/images/test.edj
 create mode 100644 data/images/test.jpg
 create mode 100644 data/images/test.png

diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index e23613012..2466fe811 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -4,6 +4,9 @@ files_DATA = \
 button_in.png \
 button_out.png \
 e.png \
-error_bg.png
+error_bg.png \
+test.png \
+test.jpg \
+test.edj
 
 EXTRA_DIST = $(files_DATA)
diff --git a/data/images/test.edj b/data/images/test.edj
new file mode 100644
index 0000000000000000000000000000000000000000..0ed35f94b95f6cf2ed3f4612c5b022e62e226f79
GIT binary patch
literal 1534
zcmb1p{+|H|n1MJFh*Lov1_qW%5X``lnVXoNTC8sX<bMZBFamKR5Z3}RPijh5YJ72i
zX;E@&F#`i@1XO+*P?-Rb%?XxI%gjmT{qTO@H6{jz4M6SxZ~TA2AmHWZ>Bhha<T8Sc
z{C}IlnSqO)or9f?i-UuMn~RH^PeOo?mzPggR7_ApSzc8|NnS}&P1{^wP18hEQOUs3
z(8SW(&dyF%&&AW(#>3p!&KhJ0BNsO}A1|MbfPjp(hLVOg$>9G120;!60R{nPMkNL&
zK}Kdl#{Wkc<bm#FWdsADzrcWziJ66!jh%y&iyNq5s{jKNBQrA-3o|P#3ky(nEl{3;
zMUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_YU1P)6PJ*bQdLve(9|+9H8Z!c
zv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136tZHs)ZENr7?3y%r%G7DoXUv?n
zXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G<f%)SuUx%${l?8(4<9{#^7PsB7cXCZ
z{Pg+D*Kgl{{QL#-7b62R#9KfTtG@(+{$gTbVP;_m`HPXM9Eh0(Sy&Yf*@PSe*%J$e
zm5drWM4Tor+<1^v**NHfXj0KdE-@98hpHbzUIY7#IFB`v<uka)5dONwz{AW4j67yR
z2789j{JbyRWA|okpXzZycl*lo4qDH9Y_#>;Qn%h`xu|<+yU>J6i7($2{+W6^URkTt
zdv))pQ@QIFbKQ$P7{urJhhz0Vy^lt(?<a5X@}8Nn$!VqPnbtecC12m}`}6r_W5n-&
zmrq>2`_%sbP1>dE0}R~Y1j)!K$S`b^;w=UaPy)1Pcw{H@L#E<(_$<kHQTMK0Wj=Mn
z=<MVM_QVTU-*?_)-25SBTG7k%rK)?+Jyk1O&SQ9?!8S|2E$Z9srFXN!q_&>fcI{S=
z)}n~nneJhy=6qY*-?dNs^44Cv%RU=+XHVT;d+_G=&4taA<Nx2RxK;e^#Am(Kgai#e
zFTc}gJbTZd)X_^UVB=C_V0}0zp@qv}KL3gH-e-JMH9U3oE_(ZVvUR^=ay{r}R4jZs
zxLb79&I3H!tg0I}HSH-;WtIQ`;DHBgF?061C_OfY7dgt?DsGkb1@awI;Ayjt|8mf!
zTu|R|dxi~*Vt{xLbI=UV^>IgxE1bC}{Z!FkdjI;e`tnWFeVH%3mhL)uN6<=5mqEk4
z@*Ssv_R_8!n<^AoAM337G5_Yg*P^L&I9aVTwCamZC(8t8IJfRuAZI0BW748!<>hJ@
zxu`eAV9LCIJl*r!_i69mHAx|<gFXMaYCwUprifu>Ow%^|cd92j+qAA(u59~b#~JQ@
F8~~kJE&>1m

literal 0
HcmV?d00001

diff --git a/data/images/test.jpg b/data/images/test.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..edbae975971c972d542c70cc7e693d990287348e
GIT binary patch
literal 620
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!5PG(2!ITs$N-S${|6WZIT!>O1eh6>7?=bZ
znFSgDA7Ky!JCy+muyb$$#T5h?n3$ND8JHPiQY@^@Y)tHo9Gt=;qGCW5B0w*q0ydzi
ztRP4W6G9sUBNH<Vt1z382*dwd3_Ku7L1sY)dxqobj=R$0i_MB>ZRwTJS|2L5KIOHl
zq5H2h9eHKmmzPFGCQsO6bYrr}jfaXAC-o{^)fu}&_N4al&0F?!XUgZh@8<R{)la@6
z`nFW;r($!$mUSkx%u5bkNH`!^&lAuSKQBw?>TCAPc{VpwHXT@%*gs)i)M_8*OM8E=
zD%Go=9RJ>6-LY45ANn}Qmg-6@Jd)RT*nivFotNJ(K6_knbIY&Ksdvt-S-QmgK&s&9
z8FQ~#JTfWaUlG^JcsH)ZZr^JAyW+l;*R>uWG5J03_uk!m?$4_C5%maroKn3_S9;QN
z&R5JPvb}2;ueNF5p0Xur(&ezwtd2voeo9yF_vT%F;GEqj&R&06k3U?pYfsd!aJzgm
zvMI$v=a6J;TT8g{pDCxi;$@?ipW1Y9R-O8;?&`*CK1Yg61dR1GnSGg^nxns#Op7o6
Ge-i+9KDh}1

literal 0
HcmV?d00001

diff --git a/data/images/test.png b/data/images/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f7ee7090e403e147223fa16162eec57ef73382e
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0006+Nkl<ZI8S3>7-+zV&jI{A>>@&ZoKpY({rmmw^_Tm<|Ni@dt{$raLVO$&
zW;!x4`sxyqtZW>zBD}0jOn-hn*m&sH^u6bvE(RL%3uX`tx`{wrMO`eETMRU%BfkG-
z<@)iLk>Tx6#{d6;TI9ufLxJi~0r6#+J|;8+7>zY06V3GG<GI)vxp+Ak7&w^!{lE9<
z#S=p<N!|+&Ki>nYe~qjM!v%~?%wjyO|Csssc^TN*m>ERH_!ybp^o7|uxW4w(N`*K_
z_RRXv!0-Z>3z$qa#moiS|1o^|^yQm|6bFNiw=ILYYZMn7n~;ExuAzv8Ft<NYGtg}i
zfbIo0p!Fi+f?N!_-Mf|)PdIS&+%1kzOl%qqiu%C}f4=@^`1kL>JWwkSE&~{zzWn&)
zKO+l+qLje#9VZ?(n3#vn^7RWiapn5$kH-(~{{Hg)H&9f<V-MX0zt$bTxBct)?|*Yc
z4N48wME+&?YWye<=T~Z}%(%fMX7oc|O6W7tfUhtYpa<e#6)D~yKmYt^;$&x3tcWq*
zCd$Xk&iLgULw>R~<NB?uPd<C~;VDovClG%F8Nv)R2}XbX_FI^njnPy_m`m{8#~+`$
z*qDF+`uXSQ*8R8c%wB(P*Y7|7K#AxT5WfNG!Il!GfZ~1{a)N$pGQ84EjEq07Kl*t0
z=Hm~KfZ`v4_#_aY0AjEUuo(an69ZyXAl3q6J|O-M#2}|%2jVM03=acr1_0&3fDMQR
nfEeW8zd#Jq^a;ua$%6p^{Y<*>On>-n00000NkvXXu0mjf;@&xB

literal 0
HcmV?d00001

diff --git a/enlightenment.spec.in b/enlightenment.spec.in
index 0f98df5ba..6ac4be6c5 100644
--- a/enlightenment.spec.in
+++ b/enlightenment.spec.in
@@ -11,8 +11,9 @@ Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 Prefix: %{_prefix}
 #BuildSuggests: xorg-x11-devel
-BuildRequires: libjpeg-devel XFree86-devel eet-devel embryo-devel
-BuildRequires: evas-devel edb-devel edje-devel imlib2-devel ecore-devel
+BuildRequires: XFree86-devel
+BuildRequires: evas-devel edje-devel ecore-devel eet-devel
+Requires: evas edje ecore eet evas-module_loader_eet evas-module_saver_eet evas-module_loader_png evas-module_saver_png evas-module_loader_jpeg evas-module_saver_jpeg evas-module_engine_software_x11 evas-module_engine_buffer
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -22,8 +23,8 @@ Enlightenment is a window manager.
 Summary: Development headers for Enlightenment. 
 Group: User Interface/Desktops
 Requires: %{name} = %{version}
-Requires: libjpeg-devel XFree86-devel eet-devel embryo-devel
-Requires: evas-devel edb-devel edje-devel imlib2-devel ecore-devel
+Requires: XFree86-devel eet-devel
+Requires: evas-devel edje-devel ecore-devel
 
 %description devel
 Development headers for Enlightenment.
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 4877f3571..7deaeecdb 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -354,11 +354,61 @@ main(int argc, char **argv)
     }
    if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_X11))
      {
-	e_error_message_show(_("Enlightenment found ecore_evas doesnt support Software X11\n"
+	e_error_message_show(_("Enlightenment found ecore_evas doesn't support the Software X11\n"
 			       "rendering in Evas. Please check your installation of Evas and\n"
-			       "Ecore and check they support Software X11 rendering."));
+			       "Ecore and check they support the Software X11 rendering engine."));
 	_e_main_shutdown(-1);
      }
+   if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_BUFFER))
+     {
+	e_error_message_show(_("Enlightenment found ecore_evas doesn't support the Software Buffer\n"
+			       "rendering in Evas. Please check your installation of Evas and\n"
+			       "Ecore and check they support the Software Buffer rendering engine."));
+	_e_main_shutdown(-1);
+     }
+     {
+	Ecore_Evas *ee;
+	Evas_Object *im;
+	char buf[4096];
+	
+	ee = ecore_evas_buffer_new(1, 1);
+	if (!ee)
+	  {
+	     e_error_message_show(_("Enlightenment found evas can't create a buffer canvas. Please check\n"
+				    "Evas has Software Buffer engine support.\n"));
+	     _e_main_shutdown(-1);
+	  }
+	im = evas_object_image_add(ecore_evas_get(ee));
+
+	snprintf(buf, sizeof(buf), "%s/data/images/test.png", e_prefix_data_get());
+	evas_object_image_file_set(im, buf, NULL);
+	if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
+	  {
+	     e_error_message_show(_("Enlightenment found evas can't load PNG files. Check Evas has PNG\n"
+				    "loader support.\n"));
+	     _e_main_shutdown(-1);
+	  }
+	
+	snprintf(buf, sizeof(buf), "%s/data/images/test.jpg", e_prefix_data_get());
+	evas_object_image_file_set(im, buf, NULL);
+	if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
+	  {
+	     e_error_message_show(_("Enlightenment found evas can't load JPEG files. Check Evas has JPEG\n"
+				    "loader support.\n"));
+	     _e_main_shutdown(-1);
+	  }
+
+	snprintf(buf, sizeof(buf), "%s/data/images/test.edj", e_prefix_data_get());
+	evas_object_image_file_set(im, buf, "images/0");
+	if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
+	  {
+	     e_error_message_show(_("Enlightenment found evas can't load EET files. Check Evas has EET\n"
+				    "loader support.\n"));
+	     _e_main_shutdown(-1);
+	  }
+	evas_object_del(im);
+	ecore_evas_free(ee);
+     }
    _e_main_shutdown_push(ecore_evas_shutdown);        
    
    /* init the enlightenment thumbnailing system */