Skip to contentSkip to conversation

package/mesa3d-demos: add glut support

PATCH New Bernd Kuhls 2 participants 2 messages Dec 18, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v2 1/1 package/mesa3d-demos: add glut support

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: rebased

 package/mesa3d-demos/mesa3d-demos.mk | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
package/mesa3d-demos/mesa3d-demos.mk +13 -1
index 094239c..cbc15c3 100644
@@ -12,7 +12,6 @@ MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
 MESA3D_DEMOS_CONF_OPTS += \
-	--without-glut \
 	--disable-osmesa \
 	--disable-gles1
 

@@ -58,6 +57,19 @@ else
 MESA3D_DEMOS_CONF_OPTS += --disable-freetype2
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
+MESA3D_DEMOS_DEPENDENCIES += libfreeglut
+MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr
+# osmesa support depends on glut
+ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
+MESA3D_DEMOS_CONF_OPTS += --enable-osmesa
+else
+MESA3D_DEMOS_CONF_OPTS += --disable-osmesa
+endif
+else
+MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa
+endif
+
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
 MESA3D_DEMOS_DEPENDENCIES += wayland
 MESA3D_DEMOS_CONF_OPTS += --enable-wayland
Signature · 1 line
2.6.4
Applied
#1 lore raw

PATCH v2 1/1 package/mesa3d-demos: add glut support

Dear Bernd Kuhls,

Quoted 3 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v2: rebased

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com