summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-02 16:48:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 14:18:52 (GMT)
commit8b4015a52b3b28578a4454a7f3fac72022a7fd2f (patch)
tree8aa1dbadd639b73091b6d484ace96d48a11d3c12
parentcf247a407586787be59d58660273e43ba2b6ca06 (diff)
downloadpoky-8b4015a52b3b28578a4454a7f3fac72022a7fd2f.tar.gz
mesa: add --enable-shared-glapi, and package it in libglapi
(From OE-Core rev: d856f4c18425b9e3e5a0898d7f29cffc1998ca12) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index e508b6d..6582bcf 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
14 14
15INC_PR = "r16" 15INC_PR = "r17"
16PE = "2" 16PE = "2"
17 17
18 18
@@ -31,7 +31,8 @@ inherit autotools pkgconfig pythonnative
31EXTRA_OECONF = "--enable-glu \ 31EXTRA_OECONF = "--enable-glu \
32 --disable-glw \ 32 --disable-glw \
33 --disable-glut \ 33 --disable-glut \
34 --enable-glx-tls" 34 --enable-glx-tls \
35 --enable-shared-glapi"
35 36
36# Multiple virtual/gl providers being built breaks staging 37# Multiple virtual/gl providers being built breaks staging
37EXCLUDE_FROM_WORLD = "1" 38EXCLUDE_FROM_WORLD = "1"
@@ -43,15 +44,18 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
43 libglu libglu-dev \ 44 libglu libglu-dev \
44 libosmesa libosmesa-dev \ 45 libosmesa libosmesa-dev \
45 libgl libgl-dev \ 46 libgl libgl-dev \
47 libglapi libglapi-dev \
46 " 48 "
47 49
48FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" 50FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
49FILES_libgl = "${libdir}/libGL.so.*" 51FILES_libgl = "${libdir}/libGL.so.*"
52FILES_libglapi = "${libdir}/libglapi.so.*"
50FILES_libglu = "${libdir}/libGLU.so.*" 53FILES_libglu = "${libdir}/libGLU.so.*"
51FILES_libosmesa = "${libdir}/libOSMesa.so.*" 54FILES_libosmesa = "${libdir}/libOSMesa.so.*"
52 55
53FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" 56FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
54FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" 57FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
58FILES_libglapi-dev = "${libdir}/libglapi.*"
55FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc" 59FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
56FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" 60FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
57 61