Message ID | 20170612205410.20230-7-romain.naour@gmail.com |
---|---|
State | Changes Requested |
Headers | show |
Hello, On Mon, 12 Jun 2017 22:54:04 +0200, Romain Naour wrote: > Signed-off-by: Romain Naour <romain.naour@gmail.com> > --- > package/minetest/minetest.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk > index 5075fc0..0302bd3 100644 > --- a/package/minetest/minetest.mk > +++ b/package/minetest/minetest.mk > @@ -14,7 +14,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib > MINETEST_CONF_OPTS = \ > -DDEFAULT_RUN_IN_PLACE=OFF \ > -DENABLE_SOUND=OFF \ > - -DENABLE_GLES=OFF \ > -DENABLE_LUAJIT=ON \ > -DENABLE_CURSES=OFF \ > -DENABLE_POSTGRESQL=OFF \ > @@ -52,6 +51,13 @@ else > MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF > endif > > +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) > +MINETEST_DEPENDENCIES += libgles > +MINETEST_CONF_OPTS += -DENABLE_GLES=ON > +else > +MINETEST_CONF_OPTS += -DENABLE_GLES=OFF > +endif The overall minetest package already depends on libGL support, inherited from irrlicht. Do we have useful situations where GLES support can be leveraged, since anyway you require libGL+X11 ? Best regards, Thomas
Hi Thomas, Le 24/06/2017 à 17:21, Thomas Petazzoni a écrit : > Hello, > > On Mon, 12 Jun 2017 22:54:04 +0200, Romain Naour wrote: >> Signed-off-by: Romain Naour <romain.naour@gmail.com> >> --- >> package/minetest/minetest.mk | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk >> index 5075fc0..0302bd3 100644 >> --- a/package/minetest/minetest.mk >> +++ b/package/minetest/minetest.mk >> @@ -14,7 +14,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib >> MINETEST_CONF_OPTS = \ >> -DDEFAULT_RUN_IN_PLACE=OFF \ >> -DENABLE_SOUND=OFF \ >> - -DENABLE_GLES=OFF \ >> -DENABLE_LUAJIT=ON \ >> -DENABLE_CURSES=OFF \ >> -DENABLE_POSTGRESQL=OFF \ >> @@ -52,6 +51,13 @@ else >> MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF >> endif >> >> +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) >> +MINETEST_DEPENDENCIES += libgles >> +MINETEST_CONF_OPTS += -DENABLE_GLES=ON >> +else >> +MINETEST_CONF_OPTS += -DENABLE_GLES=OFF >> +endif > > The overall minetest package already depends on libGL support, > inherited from irrlicht. Do we have useful situations where GLES > support can be leveraged, since anyway you require libGL+X11 ? I looked in the code and it seems that GLES is used only for Android build. https://github.com/minetest/minetest/blob/master/src/client/tile.cpp#L43 I'll remove this patch the v3. Best regards, Romain > > Best regards, > > Thomas >
diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 5075fc0..0302bd3 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -14,7 +14,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib MINETEST_CONF_OPTS = \ -DDEFAULT_RUN_IN_PLACE=OFF \ -DENABLE_SOUND=OFF \ - -DENABLE_GLES=OFF \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \ -DENABLE_POSTGRESQL=OFF \ @@ -52,6 +51,13 @@ else MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +MINETEST_DEPENDENCIES += libgles +MINETEST_CONF_OPTS += -DENABLE_GLES=ON +else +MINETEST_CONF_OPTS += -DENABLE_GLES=OFF +endif + ifeq ($(BR2_PACKAGE_LIBCURL),y) MINETEST_DEPENDENCIES += libcurl MINETEST_CONF_OPTS += -DENABLE_CURL=ON
Signed-off-by: Romain Naour <romain.naour@gmail.com> --- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)