summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2014-06-09 15:18:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-10 17:11:56 +0100
commit0db73b47ea24d4dbd80058eb9e9466a941de5bb4 (patch)
treed2ed3df33ebc740bfc27981687c1fba83ae265f8 /meta
parent0219124601998be9c0e856154002ea3c5bb1024c (diff)
downloadpoky-0db73b47ea24d4dbd80058eb9e9466a941de5bb4.tar.gz
mesa: upgrade to 10.1.3
libdricore was removed and replaced with a megadriver with hardlinks from the old driver names. Add PACKAGECONFIG for DRI3 but disable by default as there are currently regressions compared to DRI2. License is unchanged. (From OE-Core rev: 36c6909d4410e5ecb44800aafadd8593978e1b24) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc28
-rw-r--r--meta/recipes-graphics/mesa/mesa_10.1.3.bb (renamed from meta/recipes-graphics/mesa/mesa_9.2.5.bb)4
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb4
4 files changed, 22 insertions, 14 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb
index 2acc21dce5..2acc21dce5 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6503c2d7ac..453510ad12 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,9 +10,8 @@ HOMEPAGE = "http://mesa3d.org"
10BUGTRACKER = "https://bugs.freedesktop.org" 10BUGTRACKER = "https://bugs.freedesktop.org"
11SECTION = "x11" 11SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
14 14
15INC_PR = "r9"
16PE = "2" 15PE = "2"
17 16
18DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" 17DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev"
@@ -39,6 +38,7 @@ DRIDRIVERS = "swrast"
39DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" 38DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
40DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" 39DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
41PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" 40PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
41PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
42 42
43EXTRA_OECONF += "--enable-gbm" 43EXTRA_OECONF += "--enable-gbm"
44 44
@@ -78,7 +78,6 @@ RDEPENDS_${PN}-dev = ""
78PACKAGES =+ "libegl-mesa libegl-mesa-dev \ 78PACKAGES =+ "libegl-mesa libegl-mesa-dev \
79 libosmesa libosmesa-dev \ 79 libosmesa libosmesa-dev \
80 libgl-mesa libgl-mesa-dev \ 80 libgl-mesa libgl-mesa-dev \
81 libdricore libdricore-dev \
82 libglapi libglapi-dev \ 81 libglapi libglapi-dev \
83 libgbm libgbm-dev \ 82 libgbm libgbm-dev \
84 libgles1-mesa libgles1-mesa-dev \ 83 libgles1-mesa libgles1-mesa-dev \
@@ -88,6 +87,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
88 libegl-gallium libgbm-gallium \ 87 libegl-gallium libgbm-gallium \
89 libopenvg libopenvg-dev \ 88 libopenvg libopenvg-dev \
90 libxvmcsoftpipe libxvmcsoftpipe-dev \ 89 libxvmcsoftpipe libxvmcsoftpipe-dev \
90 mesa-megadriver \
91 " 91 "
92 92
93do_install_append () { 93do_install_append () {
@@ -130,15 +130,24 @@ python __anonymous() {
130} 130}
131 131
132python mesa_populate_packages() { 132python mesa_populate_packages() {
133 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
134
135 pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] 133 pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
136 pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
137 for pkg in pkgs: 134 for pkg in pkgs:
138 d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) 135 d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
139 d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) 136 d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
140 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) 137 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
141 138
139 import re
140 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
141 dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root)
142 lib_name = d.expand("${MLPREFIX}mesa-megadriver")
143 for p in dri_pkgs:
144 m = re.match('^(.*)_dri\.so$', p)
145 if m:
146 pkg_name = " mesa-driver-%s" % legitimize_package_name(m.group(1))
147 d.appendVar("RPROVIDES_%s" % lib_name, pkg_name)
148 d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
149 d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
150
142 pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") 151 pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe")
143 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') 152 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
144} 153}
@@ -148,8 +157,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
148PACKAGES_DYNAMIC += "^mesa-driver-.*" 157PACKAGES_DYNAMIC += "^mesa-driver-.*"
149 158
150FILES_${PN}-dbg += "${libdir}/dri/.debug/*" 159FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
151 160FILES_${PN} += "${sysconfdir}/drirc"
152FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*" 161FILES_mesa-megadriver = "${libdir}/dri/*"
153FILES_libegl-mesa = "${libdir}/libEGL.so.*" 162FILES_libegl-mesa = "${libdir}/libEGL.so.*"
154FILES_libgbm = "${libdir}/libgbm.so.*" 163FILES_libgbm = "${libdir}/libgbm.so.*"
155FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" 164FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
@@ -164,7 +173,6 @@ FILES_libopenvg = "${libdir}/libOpenVG.so.*"
164FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" 173FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*"
165 174
166FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" 175FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
167FILES_libdricore-dev = "${libdir}/libdricore*.*"
168FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" 176FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
169FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" 177FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
170FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" 178FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
diff --git a/meta/recipes-graphics/mesa/mesa_9.2.5.bb b/meta/recipes-graphics/mesa/mesa_10.1.3.bb
index 02ecd463e6..abc450a9c5 100644
--- a/meta/recipes-graphics/mesa/mesa_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa_10.1.3.bb
@@ -5,8 +5,8 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
5 file://0006-fix-out-of-tree-egl.patch \ 5 file://0006-fix-out-of-tree-egl.patch \
6 " 6 "
7 7
8SRC_URI[md5sum] = "9fb4de29ca1d9cfd03cbdefa123ba336" 8SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad"
9SRC_URI[sha256sum] = "b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0" 9SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3"
10 10
11S = "${WORKDIR}/Mesa-${PV}" 11S = "${WORKDIR}/Mesa-${PV}"
12 12
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 1e6fdb5cf0..59b0d1cdeb 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -5,8 +5,8 @@ DEFAULT_PREFERENCE = "-1"
5LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf" 5LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
6 6
7PR = "${INC_PR}.0" 7PR = "${INC_PR}.0"
8SRCREV = "4636e87191fddd492ed8c61ba61faf4b2d89b2e4" 8SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a"
9PV = "9.2.5+git${SRCPV}" 9PV = "10.1.3+git${SRCPV}"
10 10
11SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \ 11SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \
12 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ 12 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \