Skip to contentSkip to conversation

mesa3d-demos: new package

PATCH New Bernd Kuhls 2 participants 2 messages Oct 17, 2014 – Oct 26, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 mesa3d-demos: new package

From: Spenser Gilliland <[email protected]>

---
v5: - fixed wrong position in package/Config.in
v4: - rebased Spenser?s patch: http://patchwork.ozlabs.org/patch/278305/
- bumped to 8.2.0
- added mandatory dependency to libglu and libglew for OpenGL support
- renamed options for virtual GL packages

 package/Config.in                                  |    1 +
 package/mesa3d-demos/Config.in                     |    8 +
 .../mesa3d-demos/mesa3d-demos-non-mesa-impl.patch  |  244 ++++++++++++++++++++
 .../mesa3d-demos/mesa3d-demos-optional-gl.patch    |   75 ++++++
 package/mesa3d-demos/mesa3d-demos-x11-fix.patch    |   30 +++
 package/mesa3d-demos/mesa3d-demos.mk               |   62 +++++
 6 files changed, 420 insertions(+)
 create mode 100644 package/mesa3d-demos/Config.in
 create mode 100644 package/mesa3d-demos/mesa3d-demos-non-mesa-impl.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos-optional-gl.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos-x11-fix.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos.mk
package/Config.in +1 -0
index 9aa9149..0d5f212 100644
@@ -185,6 +185,7 @@ comment "Graphic applications"
 	source "package/fswebcam/Config.in"
 	source "package/gnuplot/Config.in"
 	source "package/jhead/Config.in"
+	source "package/mesa3d-demos/Config.in"
 	source "package/rrdtool/Config.in"
 
 comment "Graphic libraries"
package/mesa3d-demos/Config.in new file +8 -0
new file mode 100644
index 0000000..e2b2e05
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_MESA3D_DEMOS
+	bool "mesa3d-demos"
+	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
+		|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
+	help
+	  OpenGL demos from the Mesa 3D project.
+
+	  http://mesa3d.org
package/mesa3d-demos/mesa3d-demos-non-mesa-impl.patch new file +244 -0

244 lines not on this page · raw message

package/mesa3d-demos/mesa3d-demos-optional-gl.patch new file +75 -0

75 lines not on this page · raw message

package/mesa3d-demos/mesa3d-demos-x11-fix.patch new file +30 -0
new file mode 100644
index 0000000..f6b3b0c
@@ -0,0 +1,30 @@
+This patch ensures that programs which depend on x11 are not build if x11
+is not available.
+
+Signed-off-by: Spenser Gilliland <[email protected]>
+---
+Index: mesa3d-demos-8.1.0/src/egl/opengles2/Makefile.am
+===================================================================
+--- mesa3d-demos-8.1.0.orig/src/egl/opengles2/Makefile.am
++++ mesa3d-demos-8.1.0/src/egl/opengles2/Makefile.am
+@@ -35,9 +35,10 @@ AM_LDFLAGS = \
+ 
+ if HAVE_EGL
+ if HAVE_GLESV2
+-bin_PROGRAMS = \
++bin_PROGRAMS = es2gears_screen
++if HAVE_X11
++bin_PROGRAMS += \
+ 	es2_info \
+-	es2gears_screen \
+ 	es2gears_x11 \
+ 	es2tri
+ if HAVE_WAYLAND
+@@ -45,6 +46,7 @@ bin_PROGRAMS += es2gears_wayland
+ endif
+ endif
+ endif
++endif
+ 
+ es2_info_LDADD = $(X11_LIBS)
+ es2tri_LDADD = $(X11_LIBS)
package/mesa3d-demos/mesa3d-demos.mk new file +62 -0

62 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v5 1/1 mesa3d-demos: new package

Dear Bernd Kuhls,

Quoted 10 lines · Bernd Kuhls

From: Spenser Gilliland <[email protected]>

---
v5: - fixed wrong position in package/Config.in
v4: - rebased Spenser?s patch: http://patchwork.ozlabs.org/patch/278305/
- bumped to 8.2.0
- added mandatory dependency to libglu and libglew for OpenGL support
- renamed options for virtual GL packages

Applied. I've just added MESA3D_DEMOS_LICENSE, and renamed the patches to follow the proper naming convention.

I must say I was a bit surprised by the following piece of code:

+ depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
+ || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG

but apparently, there are indeed independent options in the configure script. We'll see how things go in the autobuilders :-)

Thanks,

Thomas

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