Menu
▾
▴
Re: [E-devel] E SVN: devilhorns IN trunk/evas: . m4 src/modules/engines src/modules/engines/wayland_egl
|
From: Daniel J. S. <seo...@gm...> - 2011-12-27 00:41:49
|
No evas-wayland-egl.pc.in. Please add it. configure.ac:1876: required file `evas-wayland-egl.pc.in' not found Thanks. Daniel Juyung Seo (SeoZ) On Tue, Dec 27, 2011 at 8:13 AM, Enlightenment SVN <no-...@en...> wrote: > Log: > Evas: Add Wayland EGL engine (still experimental). > > > > Author: devilhorns > Date: 2011-12-26 15:13:52 -0800 (Mon, 26 Dec 2011) > New Revision: 66541 > Trac: http://trac.enlightenment.org/e/changeset/66541 > > Added: > trunk/evas/src/modules/engines/wayland_egl/ trunk/evas/src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h trunk/evas/src/modules/engines/wayland_egl/Makefile.am trunk/evas/src/modules/engines/wayland_egl/evas_engine.c trunk/evas/src/modules/engines/wayland_egl/evas_engine.h trunk/evas/src/modules/engines/wayland_egl/evas_outbuf.c > Modified: > trunk/evas/Makefile.am trunk/evas/configure.ac trunk/evas/m4/evas_check_engine.m4 trunk/evas/src/modules/engines/Makefile.am > > Modified: trunk/evas/Makefile.am > =================================================================== > --- trunk/evas/Makefile.am 2011-12-26 23:12:50 UTC (rev 66540) > +++ trunk/evas/Makefile.am 2011-12-26 23:13:52 UTC (rev 66541) > @@ -46,6 +46,7 @@ > evas-software-sdl.pc.in \ > evas-psl1ght.pc.in \ > evas-wayland-shm.pc.in \ > +evas-wayland-egl.pc.in \ > evas.spec.in \ > evas.spec \ > m4/efl_attribute.m4 \ > @@ -132,6 +133,10 @@ > pkgconfig_DATA += evas-wayland-shm.pc > endif > > +if BUILD_ENGINE_WAYLAND_EGL > +pkgconfig_DATA += evas-wayland-egl.pc > +endif > + > .PHONY: doc coverage > > doc: > > Modified: trunk/evas/configure.ac > =================================================================== > --- trunk/evas/configure.ac 2011-12-26 23:12:50 UTC (rev 66540) > +++ trunk/evas/configure.ac 2011-12-26 23:13:52 UTC (rev 66541) > @@ -113,6 +113,7 @@ > want_evas_engine_directfb="no" > want_evas_engine_psl1ght="no" > want_evas_engine_wayland_shm="no" > +want_evas_engine_wayland_egl="no" > > want_evas_image_loader_edb="yes" > want_evas_image_loader_eet="yes" > @@ -159,6 +160,8 @@ > want_evas_engine_software_xcb="no" > want_evas_engine_gl_xcb="no" > want_evas_engine_fb="auto" > + want_evas_engine_wayland_shm="auto" > + want_evas_engine_wayland_egl="auto" > ### no - not ready/usable/complete > # want_evas_engine_software_8_x11="auto" > # want_evas_engine_software_16_x11="auto" > @@ -769,6 +772,8 @@ > > EVAS_CHECK_ENGINE([wayland-shm], [${want_evas_engine_wayland_shm}], [no], [Wayland Shm]) > > +EVAS_CHECK_ENGINE([wayland-egl], [${want_evas_engine_wayland_egl}], [no], [Wayland Egl]) > + > # SDL primitive > sdl_primitive="no" > > @@ -1887,6 +1892,7 @@ > evas-software-sdl.pc > evas-psl1ght.pc > evas-wayland-shm.pc > +evas-wayland-egl.pc > evas.pc > doc/evas.dox > doc/Makefile > @@ -1932,6 +1938,7 @@ > src/modules/engines/software_16_ddraw/Makefile > src/modules/engines/software_16_sdl/Makefile > src/modules/engines/wayland_shm/Makefile > +src/modules/engines/wayland_egl/Makefile > src/modules/loaders/Makefile > src/modules/loaders/edb/Makefile > src/modules/loaders/eet/Makefile > @@ -2029,6 +2036,7 @@ > echo " Software 16bit WinCE.......: $have_evas_engine_software_16_wince" > echo " Software 16bit SDL.........: $have_evas_engine_software_16_sdl (primitive: $sdl_primitive)" > echo " Wayland Shm................: $have_evas_engine_wayland_shm" > +echo " Wayland Egl................: $have_evas_engine_wayland_egl" > echo > echo "Image Loaders:" > echo " BMP.....................: $have_evas_image_loader_bmp" > > Modified: trunk/evas/m4/evas_check_engine.m4 > =================================================================== > --- trunk/evas/m4/evas_check_engine.m4 2011-12-26 23:12:50 UTC (rev 66540) > +++ trunk/evas/m4/evas_check_engine.m4 2011-12-26 23:13:52 UTC (rev 66541) > @@ -906,10 +906,10 @@ > evas_engine_[]$1[]_libs="" > > PKG_CHECK_MODULES([WAYLAND_EGL], > - [wayland-egl], > + [egl >= 7.10 glesv2 gl wayland-client wayland-egl], > [ > have_dep="yes" > - requirement="wayland-egl" > + requirement="egl >= 7.10 glesv2 gl wayland-client wayland-egl" > evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" > evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}" > ],[ > @@ -918,16 +918,18 @@ > ) > > if test "x${have_dep}" = "xyes" ; then > + PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) > AC_CHECK_HEADER([GLES2/gl2.h], > [have_egl="yes"], > [have_egl="no"], > [ > #include <GLES2/gl2.h> > #include <EGL/egl.h> > +#include <GL/gl.h> > ]) > if test "x${have_egl}" = "xyes" ; then > evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" > - evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGLESv2 -lEGL" > + evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL" > fi > fi > > > Modified: trunk/evas/src/modules/engines/Makefile.am > =================================================================== > --- trunk/evas/src/modules/engines/Makefile.am 2011-12-26 23:12:50 UTC (rev 66540) > +++ trunk/evas/src/modules/engines/Makefile.am 2011-12-26 23:13:52 UTC (rev 66541) > @@ -71,3 +71,6 @@ > if !EVAS_STATIC_BUILD_WAYLAND_SHM > SUBDIRS += wayland_shm > endif > +if !EVAS_STATIC_BUILD_WAYLAND_EGL > +SUBDIRS += wayland_egl > +endif > > > ------------------------------------------------------------------------------ > Write once. Port to many. > Get the SDK and tools to simplify cross-platform app development. Create > new or port existing apps to sell to consumers worldwide. Explore the > Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join > http://p.sf.net/sfu/intel-appdev > _______________________________________________ > enlightenment-svn mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn |