diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a210415eb7..6207bb6ff1 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -37,7 +37,6 @@ DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" | |||
37 | DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" | 37 | DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" |
38 | PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm udev" | 38 | PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm udev" |
39 | 39 | ||
40 | EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" | ||
41 | EXTRA_OECONF += "--enable-gbm" | 40 | EXTRA_OECONF += "--enable-gbm" |
42 | 41 | ||
43 | PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" | 42 | PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" |
@@ -47,6 +46,9 @@ EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" | |||
47 | EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" | 46 | EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" |
48 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" | 47 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" |
49 | 48 | ||
49 | GALLIUMDRIVERS = "swrast" | ||
50 | PACKAGECONFIG[gallium] = "--enable-gallium --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers" | ||
51 | |||
50 | # Multiple virtual/gl providers being built breaks staging | 52 | # Multiple virtual/gl providers being built breaks staging |
51 | EXCLUDE_FROM_WORLD = "1" | 53 | EXCLUDE_FROM_WORLD = "1" |
52 | 54 | ||
@@ -63,6 +65,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ | |||
63 | libgles2-mesa libgles2-mesa-dev \ | 65 | libgles2-mesa libgles2-mesa-dev \ |
64 | libgles3-mesa libgles3-mesa-dev \ | 66 | libgles3-mesa libgles3-mesa-dev \ |
65 | libwayland-egl libwayland-egl-dev \ | 67 | libwayland-egl libwayland-egl-dev \ |
68 | libegl-gallium libgbm-gallium \ | ||
66 | " | 69 | " |
67 | 70 | ||
68 | do_install_append () { | 71 | do_install_append () { |
@@ -108,6 +111,9 @@ python populate_packages_prepend() { | |||
108 | d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) | 111 | d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) |
109 | d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) | 112 | d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) |
110 | d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) | 113 | d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) |
114 | |||
115 | pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") | ||
116 | do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') | ||
111 | } | 117 | } |
112 | 118 | ||
113 | PACKAGES_DYNAMIC += "^mesa-driver-.*" | 119 | PACKAGES_DYNAMIC += "^mesa-driver-.*" |
@@ -123,6 +129,8 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" | |||
123 | FILES_libglapi = "${libdir}/libglapi.so.*" | 129 | FILES_libglapi = "${libdir}/libglapi.so.*" |
124 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" | 130 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" |
125 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" | 131 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" |
132 | FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" | ||
133 | FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" | ||
126 | 134 | ||
127 | FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" | 135 | FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" |
128 | FILES_libdricore-dev = "${libdir}/libdricore*.*" | 136 | FILES_libdricore-dev = "${libdir}/libdricore*.*" |
@@ -136,4 +144,4 @@ FILES_libgles3-mesa-dev = "${includedir}/GLES3" | |||
136 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" | 144 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" |
137 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" | 145 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" |
138 | 146 | ||
139 | FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" | 147 | FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/* ${libdir}/gbm/.debug/* ${libdir}/gallium-pipe/.debug" |