* [PATCH 0/3] mesa upgrade
@ 2014-05-13 14:59 Valentin Popa
2014-05-13 14:59 ` [PATCH 1/3] dri3proto: add it to oe-core Valentin Popa
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Valentin Popa @ 2014-05-13 14:59 UTC (permalink / raw)
To: openembedded-core
mesa upgrade to 10.1.3
The following changes since commit 40551859671a1c9da26cfdcda34da952c66ac8c2:
qemu/local.conf.sample: Add sdl PACKAGECONFIG (2014-05-13 08:02:04 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib vpopa/mesa
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/mesa
Valentin Popa (3):
dri3proto: add it to oe-core
libxshmfence: add it to oe-core
mesa: upgrade to 10.1.3
.../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 35 +++++++++++++---------
.../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb | 17 +++++++++++
meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb | 14 +++++++++
6 files changed, 56 insertions(+), 18 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} (82%)
create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
create mode 100644 meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
--
1.9.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] dri3proto: add it to oe-core
2014-05-13 14:59 [PATCH 0/3] mesa upgrade Valentin Popa
@ 2014-05-13 14:59 ` Valentin Popa
2014-05-13 14:59 ` [PATCH 2/3] libxshmfence: " Valentin Popa
` (2 subsequent siblings)
3 siblings, 0 replies; 13+ messages in thread
From: Valentin Popa @ 2014-05-13 14:59 UTC (permalink / raw)
To: openembedded-core
mesa 10+ depends on this. So add it to oe-core.
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
diff --git a/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb b/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
new file mode 100644
index 0000000..bed97b3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
@@ -0,0 +1,14 @@
+require xorg-proto-common.inc
+
+SUMMARY = "Direct Rendering Infrastructure 3 Extension"
+
+DESCRIPTION = "The DRI3 extension provides mechanisms to translate between direct \
+rendered buffers and X pixmaps. When combined with the Present extension, \
+a complete direct rendering solution for OpenGL is provided."
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://dri3proto.h;endline=21;md5=ac90d1d416be3cb13e1d3c88cd5166bf"
+
+
+SRC_URI[md5sum] = "a3d2cbe60a9ca1bf3aea6c93c817fee3"
+SRC_URI[sha256sum] = "01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074"
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/3] libxshmfence: add it to oe-core
2014-05-13 14:59 [PATCH 0/3] mesa upgrade Valentin Popa
2014-05-13 14:59 ` [PATCH 1/3] dri3proto: add it to oe-core Valentin Popa
@ 2014-05-13 14:59 ` Valentin Popa
2014-05-13 14:59 ` [PATCH 3/3] mesa: upgrade to 10.1.3 Valentin Popa
2014-05-13 15:28 ` [PATCH 0/3] mesa upgrade Burton, Ross
3 siblings, 0 replies; 13+ messages in thread
From: Valentin Popa @ 2014-05-13 14:59 UTC (permalink / raw)
To: openembedded-core
mesa 10+ depends on this. So add it oe-core.
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
new file mode 100644
index 0000000..7dff0d4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Shared memory 'SyncFence' synchronization primitive"
+
+DESCRIPTION = "This library offers a CPU-based synchronization primitive compatible \
+with the X SyncFence objects that can be shared between processes \
+using file descriptor passing."
+
+require xorg-lib-common.inc
+
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac"
+
+DEPENDS += "virtual/libx11"
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI[md5sum] = "2dd10448c1166e71a176206a8dfabe6d"
+SRC_URI[sha256sum] = "dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe"
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] mesa: upgrade to 10.1.3
2014-05-13 14:59 [PATCH 0/3] mesa upgrade Valentin Popa
2014-05-13 14:59 ` [PATCH 1/3] dri3proto: add it to oe-core Valentin Popa
2014-05-13 14:59 ` [PATCH 2/3] libxshmfence: " Valentin Popa
@ 2014-05-13 14:59 ` Valentin Popa
2014-05-16 17:19 ` Saul Wold
2014-05-19 15:02 ` Saul Wold
2014-05-13 15:28 ` [PATCH 0/3] mesa upgrade Burton, Ross
3 siblings, 2 replies; 13+ messages in thread
From: Valentin Popa @ 2014-05-13 14:59 UTC (permalink / raw)
To: openembedded-core
(*) libdricore was removed.
(*) added libmesa-megadriver that includes
all the hardlinks to the mesa megadriver.
(*) license is the same.
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
.../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 35 +++++++++++++---------
.../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
4 files changed, 25 insertions(+), 18 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} (82%)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
rename to 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 a33b7b5..855a9e4 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,11 +10,11 @@ HOMEPAGE = "http://mesa3d.org"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
-INC_PR = "r9"
PE = "2"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
+
DEPENDS = "expat makedepend-native flex-native bison-native udev"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
@@ -30,7 +30,7 @@ PACKAGECONFIG ??= "egl gles dri \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
"
-X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes presentproto libxshmfence"
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
PACKAGECONFIG[wayland] = ",,wayland"
@@ -38,7 +38,7 @@ PACKAGECONFIG[wayland] = ",,wayland"
DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
-PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
+PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto dri3proto libdrm"
EXTRA_OECONF += "--enable-gbm"
@@ -78,7 +78,7 @@ RDEPENDS_${PN}-dev = ""
PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libosmesa libosmesa-dev \
libgl-mesa libgl-mesa-dev \
- libdricore libdricore-dev \
+ libmesa-megadriver \
libglapi libglapi-dev \
libgbm libgbm-dev \
libgles1-mesa libgles1-mesa-dev \
@@ -96,7 +96,7 @@ do_install_append () {
rm -f ${D}${libdir}/egl/*.la
rm -f ${D}${libdir}/gallium-pipe/*.la
rm -f ${D}${libdir}/gbm/*.la
-
+
# it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
rm -f ${D}${sysconfdir}/drirc
}
@@ -119,7 +119,7 @@ python __anonymous() {
d.appendVar("RREPLACES_" + fullp, pkgs)
d.appendVar("RPROVIDES_" + fullp, pkgs)
d.appendVar("RCONFLICTS_" + fullp, pkgs)
-
+
# For -dev, the first element is both the Debian and original name
fullp += "-dev"
pkgs = p[1] + "-dev"
@@ -130,15 +130,23 @@ python __anonymous() {
}
python mesa_populate_packages() {
- dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
-
pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
- pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
for pkg in pkgs:
d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
-
+
+ import re
+ dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
+ dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root)
+ for p in sorted(dri_pkgs):
+ m = re.match('^(.*)_dri\.so$', p)
+ if m:
+ pkg_name = " mesa-driver-%s" % legitimize_package_name(m.group(1))
+ d.appendVar("RPROVIDES_libmesa-megadriver", pkg_name)
+ d.appendVar("RCONFLICTS_libmesa-megadriver", pkg_name)
+ d.appendVar("RREPLACES_libmesa-megadriver", pkg_name)
+
pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe")
do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
}
@@ -148,8 +156,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
PACKAGES_DYNAMIC += "^mesa-driver-.*"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-
-FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
+FILES_${PN} += "${sysconfdir}/drirc"
+FILES_libmesa-megadriver = "${libdir}/dri/*"
FILES_libegl-mesa = "${libdir}/libEGL.so.*"
FILES_libgbm = "${libdir}/libgbm.so.*"
FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
@@ -164,7 +172,6 @@ FILES_libopenvg = "${libdir}/libOpenVG.so.*"
FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*"
FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
-FILES_libdricore-dev = "${libdir}/libdricore*.*"
FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
FILES_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
similarity index 82%
rename from meta/recipes-graphics/mesa/mesa_9.2.5.bb
rename to meta/recipes-graphics/mesa/mesa_10.1.3.bb
index 02ecd46..abc450a 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 \
file://0006-fix-out-of-tree-egl.patch \
"
-SRC_URI[md5sum] = "9fb4de29ca1d9cfd03cbdefa123ba336"
-SRC_URI[sha256sum] = "b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0"
+SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad"
+SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3"
S = "${WORKDIR}/Mesa-${PV}"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 1e6fdb5..59b0d1c 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -5,8 +5,8 @@ DEFAULT_PREFERENCE = "-1"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
PR = "${INC_PR}.0"
-SRCREV = "4636e87191fddd492ed8c61ba61faf4b2d89b2e4"
-PV = "9.2.5+git${SRCPV}"
+SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a"
+PV = "10.1.3+git${SRCPV}"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \
file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] mesa upgrade
2014-05-13 14:59 [PATCH 0/3] mesa upgrade Valentin Popa
` (2 preceding siblings ...)
2014-05-13 14:59 ` [PATCH 3/3] mesa: upgrade to 10.1.3 Valentin Popa
@ 2014-05-13 15:28 ` Burton, Ross
2014-05-14 20:34 ` [oe] " Otavio Salvador
2014-06-04 12:52 ` Martin Jansa
3 siblings, 2 replies; 13+ messages in thread
From: Burton, Ross @ 2014-05-13 15:28 UTC (permalink / raw)
To: OE-core, OE-devel
Hi all,
As this is a major release of Mesa I'm expecting breakage somewhere...
Can BSP maintainers please test these patches if their machines build
Mesa? I'm expecting machines that use mesa-gl to break if they don't
just use the pure software drivers (so that's at least EMGD and if I
recall correctly some ARM drivers).
Ross
On 13 May 2014 15:59, Valentin Popa <valentin.popa@intel.com> wrote:
> mesa upgrade to 10.1.3
>
> The following changes since commit 40551859671a1c9da26cfdcda34da952c66ac8c2:
>
> qemu/local.conf.sample: Add sdl PACKAGECONFIG (2014-05-13 08:02:04 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib vpopa/mesa
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/mesa
>
> Valentin Popa (3):
> dri3proto: add it to oe-core
> libxshmfence: add it to oe-core
> mesa: upgrade to 10.1.3
>
> .../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 35 +++++++++++++---------
> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
> meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb | 17 +++++++++++
> meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb | 14 +++++++++
> 6 files changed, 56 insertions(+), 18 deletions(-)
> rename meta/recipes-graphics/mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} (100%)
> rename meta/recipes-graphics/mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} (82%)
> create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
> create mode 100644 meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
>
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe] [PATCH 0/3] mesa upgrade
2014-05-13 15:28 ` [PATCH 0/3] mesa upgrade Burton, Ross
@ 2014-05-14 20:34 ` Otavio Salvador
2014-06-04 12:52 ` Martin Jansa
1 sibling, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2014-05-14 20:34 UTC (permalink / raw)
To: OpenEmbedded Devel List; +Cc: OE-core
On Tue, May 13, 2014 at 12:28 PM, Burton, Ross <ross.burton@intel.com> wrote:
> As this is a major release of Mesa I'm expecting breakage somewhere...
> Can BSP maintainers please test these patches if their machines build
> Mesa? I'm expecting machines that use mesa-gl to break if they don't
> just use the pure software drivers (so that's at least EMGD and if I
> recall correctly some ARM drivers).
Yes; we'll give it a try in meta-fsl-arm.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] mesa: upgrade to 10.1.3
2014-05-13 14:59 ` [PATCH 3/3] mesa: upgrade to 10.1.3 Valentin Popa
@ 2014-05-16 17:19 ` Saul Wold
2014-05-19 15:06 ` Valentin Popa
2014-05-19 15:02 ` Saul Wold
1 sibling, 1 reply; 13+ messages in thread
From: Saul Wold @ 2014-05-16 17:19 UTC (permalink / raw)
To: Valentin Popa, Burton, Ross; +Cc: openembedded-core
On 05/13/2014 07:59 AM, Valentin Popa wrote:
> (*) libdricore was removed.
> (*) added libmesa-megadriver that includes
> all the hardlinks to the mesa megadriver.
> (*) license is the same.
>
> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
> ---
> .../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 35 +++++++++++++---------
> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
> 4 files changed, 25 insertions(+), 18 deletions(-)
> rename meta/recipes-graphics/mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} (100%)
> rename meta/recipes-graphics/mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} (82%)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
> rename to 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 a33b7b5..855a9e4 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -10,11 +10,11 @@ HOMEPAGE = "http://mesa3d.org"
> BUGTRACKER = "https://bugs.freedesktop.org"
> SECTION = "x11"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
>
> -INC_PR = "r9"
> PE = "2"
>
> +LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
> +
> DEPENDS = "expat makedepend-native flex-native bison-native udev"
>
> PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
> @@ -30,7 +30,7 @@ PACKAGECONFIG ??= "egl gles dri \
> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
> "
>
> -X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
> +X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes presentproto libxshmfence"
> PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
> PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
> PACKAGECONFIG[wayland] = ",,wayland"
> @@ -38,7 +38,7 @@ PACKAGECONFIG[wayland] = ",,wayland"
> DRIDRIVERS = "swrast"
> DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
> DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
> -PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
> +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto dri3proto libdrm"
>
In the configure, there is both enable-dri and enable-dri3, the default
is to enable dri3 for linux, but do we want to enable dri3 by default
and add the 2 new dependencies?
Just asking?
Sau!
> EXTRA_OECONF += "--enable-gbm"
>
> @@ -78,7 +78,7 @@ RDEPENDS_${PN}-dev = ""
> PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> libosmesa libosmesa-dev \
> libgl-mesa libgl-mesa-dev \
> - libdricore libdricore-dev \
> + libmesa-megadriver \
> libglapi libglapi-dev \
> libgbm libgbm-dev \
> libgles1-mesa libgles1-mesa-dev \
> @@ -96,7 +96,7 @@ do_install_append () {
> rm -f ${D}${libdir}/egl/*.la
> rm -f ${D}${libdir}/gallium-pipe/*.la
> rm -f ${D}${libdir}/gbm/*.la
> -
> +
> # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
> rm -f ${D}${sysconfdir}/drirc
> }
> @@ -119,7 +119,7 @@ python __anonymous() {
> d.appendVar("RREPLACES_" + fullp, pkgs)
> d.appendVar("RPROVIDES_" + fullp, pkgs)
> d.appendVar("RCONFLICTS_" + fullp, pkgs)
> -
> +
> # For -dev, the first element is both the Debian and original name
> fullp += "-dev"
> pkgs = p[1] + "-dev"
> @@ -130,15 +130,23 @@ python __anonymous() {
> }
>
> python mesa_populate_packages() {
> - dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
> -
> pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
> - pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
> for pkg in pkgs:
> d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
> d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
> d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
> -
> +
> + import re
> + dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
> + dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root)
> + for p in sorted(dri_pkgs):
> + m = re.match('^(.*)_dri\.so$', p)
> + if m:
> + pkg_name = " mesa-driver-%s" % legitimize_package_name(m.group(1))
> + d.appendVar("RPROVIDES_libmesa-megadriver", pkg_name)
> + d.appendVar("RCONFLICTS_libmesa-megadriver", pkg_name)
> + d.appendVar("RREPLACES_libmesa-megadriver", pkg_name)
> +
> pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe")
> do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
> }
> @@ -148,8 +156,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
> PACKAGES_DYNAMIC += "^mesa-driver-.*"
>
> FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
> -
> -FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
> +FILES_${PN} += "${sysconfdir}/drirc"
> +FILES_libmesa-megadriver = "${libdir}/dri/*"
> FILES_libegl-mesa = "${libdir}/libEGL.so.*"
> FILES_libgbm = "${libdir}/libgbm.so.*"
> FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
> @@ -164,7 +172,6 @@ FILES_libopenvg = "${libdir}/libOpenVG.so.*"
> FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*"
>
> FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
> -FILES_libdricore-dev = "${libdir}/libdricore*.*"
> FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
> FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
> FILES_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
> similarity index 82%
> rename from meta/recipes-graphics/mesa/mesa_9.2.5.bb
> rename to meta/recipes-graphics/mesa/mesa_10.1.3.bb
> index 02ecd46..abc450a 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 \
> file://0006-fix-out-of-tree-egl.patch \
> "
>
> -SRC_URI[md5sum] = "9fb4de29ca1d9cfd03cbdefa123ba336"
> -SRC_URI[sha256sum] = "b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0"
> +SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad"
> +SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3"
>
> S = "${WORKDIR}/Mesa-${PV}"
>
> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
> index 1e6fdb5..59b0d1c 100644
> --- a/meta/recipes-graphics/mesa/mesa_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> @@ -5,8 +5,8 @@ DEFAULT_PREFERENCE = "-1"
> LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
>
> PR = "${INC_PR}.0"
> -SRCREV = "4636e87191fddd492ed8c61ba61faf4b2d89b2e4"
> -PV = "9.2.5+git${SRCPV}"
> +SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a"
> +PV = "10.1.3+git${SRCPV}"
>
> SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \
> file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] mesa: upgrade to 10.1.3
2014-05-13 14:59 ` [PATCH 3/3] mesa: upgrade to 10.1.3 Valentin Popa
2014-05-16 17:19 ` Saul Wold
@ 2014-05-19 15:02 ` Saul Wold
1 sibling, 0 replies; 13+ messages in thread
From: Saul Wold @ 2014-05-19 15:02 UTC (permalink / raw)
To: Valentin Popa, openembedded-core
On 05/13/2014 07:59 AM, Valentin Popa wrote:
> (*) libdricore was removed.
> (*) added libmesa-megadriver that includes
> all the hardlinks to the mesa megadriver.
> (*) license is the same.
>
I have the following failure from a multilib build, not sure if it's
related to this change or not, I think it might be.
> ERROR: Unable to install packages. Command '/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-multilib/build/build/tmp/sysroots/x86_64-linux/usr/bin/smart --data-dir=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-multilib/build/build/tmp/work/qemux86-poky-linux/lib64-core-image-sato-sdk/1.0-r0/rootfs/var/lib/smart install -y kernel-dev@qemux86 packagegroup-core-tools-profile@lib64_qemux86 packagegroup-core-standalone-sdk-target@all packagegroup-core-tools-debug@lib64_qemux86 rpm@lib64_x86_64 packagegroup-core-x11-base@all packagegroup-core-boot@lib64_qemux86 packagegroup-core-x11-sato@lib64_qemux86 packagegroup-base-extended@lib64_qemux86 locale-base-en-us@lib64_x86_64 smartpm@lib64_x86_64 packagegroup-core-x11-sato-games@lib64_qemux86 locale-base-en-gb@lib64_x86_64 packagegroup-core-sdk@all psplash@lib64_x86_64 packagegroup-core-tools-testapps@lib64_qemux86 packagegroup-core-qt-demoapps@all packagegroup-core-eclipse-debug@all packagegroup-core-ssh-openssh@all' returned 1
:
> Loading cache...
> Updating cache... ######################################## [100%]
>
> Computing transaction...error: Can't install packagegroup-core-x11-xserver-1.0-r40@lib64_qemux86: no package provides mesa-driver-swrast
>
>
> ERROR: Function failed: do_rootfs
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-multilib/build/build/tmp/work/qemux86-poky-linux/lib64-core-image-sato-sdk/1.0-r0/temp/log.do_rootfs.25256
> NOTE: recipe lib64-core-image-sato-sdk-1.0-r0: task do_rootfs: Failed
> ERROR: Task 20 (virtual:multilib:lib64:/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-multilib/build/meta/recipes-sato/images/core-image-sato-sdk.bb, do_rootfs) failed with exit code '1'
You might need to prefix the package with the correct MLPREFIX somewhere
along the lines.
Sau!
> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
> ---
> .../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 35 +++++++++++++---------
> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
> 4 files changed, 25 insertions(+), 18 deletions(-)
> rename meta/recipes-graphics/mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} (100%)
> rename meta/recipes-graphics/mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} (82%)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
> rename to 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 a33b7b5..855a9e4 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -10,11 +10,11 @@ HOMEPAGE = "http://mesa3d.org"
> BUGTRACKER = "https://bugs.freedesktop.org"
> SECTION = "x11"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
>
> -INC_PR = "r9"
> PE = "2"
>
> +LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
> +
> DEPENDS = "expat makedepend-native flex-native bison-native udev"
>
> PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
> @@ -30,7 +30,7 @@ PACKAGECONFIG ??= "egl gles dri \
> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
> "
>
> -X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
> +X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes presentproto libxshmfence"
> PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
> PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
> PACKAGECONFIG[wayland] = ",,wayland"
> @@ -38,7 +38,7 @@ PACKAGECONFIG[wayland] = ",,wayland"
> DRIDRIVERS = "swrast"
> DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
> DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
> -PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
> +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto dri3proto libdrm"
>
> EXTRA_OECONF += "--enable-gbm"
>
> @@ -78,7 +78,7 @@ RDEPENDS_${PN}-dev = ""
> PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> libosmesa libosmesa-dev \
> libgl-mesa libgl-mesa-dev \
> - libdricore libdricore-dev \
> + libmesa-megadriver \
> libglapi libglapi-dev \
> libgbm libgbm-dev \
> libgles1-mesa libgles1-mesa-dev \
> @@ -96,7 +96,7 @@ do_install_append () {
> rm -f ${D}${libdir}/egl/*.la
> rm -f ${D}${libdir}/gallium-pipe/*.la
> rm -f ${D}${libdir}/gbm/*.la
> -
> +
> # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
> rm -f ${D}${sysconfdir}/drirc
> }
> @@ -119,7 +119,7 @@ python __anonymous() {
> d.appendVar("RREPLACES_" + fullp, pkgs)
> d.appendVar("RPROVIDES_" + fullp, pkgs)
> d.appendVar("RCONFLICTS_" + fullp, pkgs)
> -
> +
> # For -dev, the first element is both the Debian and original name
> fullp += "-dev"
> pkgs = p[1] + "-dev"
> @@ -130,15 +130,23 @@ python __anonymous() {
> }
>
> python mesa_populate_packages() {
> - dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
> -
> pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
> - pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
> for pkg in pkgs:
> d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
> d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
> d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
> -
> +
> + import re
> + dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
> + dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root)
> + for p in sorted(dri_pkgs):
> + m = re.match('^(.*)_dri\.so$', p)
> + if m:
> + pkg_name = " mesa-driver-%s" % legitimize_package_name(m.group(1))
> + d.appendVar("RPROVIDES_libmesa-megadriver", pkg_name)
> + d.appendVar("RCONFLICTS_libmesa-megadriver", pkg_name)
> + d.appendVar("RREPLACES_libmesa-megadriver", pkg_name)
> +
> pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe")
> do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
> }
> @@ -148,8 +156,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
> PACKAGES_DYNAMIC += "^mesa-driver-.*"
>
> FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
> -
> -FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
> +FILES_${PN} += "${sysconfdir}/drirc"
> +FILES_libmesa-megadriver = "${libdir}/dri/*"
> FILES_libegl-mesa = "${libdir}/libEGL.so.*"
> FILES_libgbm = "${libdir}/libgbm.so.*"
> FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
> @@ -164,7 +172,6 @@ FILES_libopenvg = "${libdir}/libOpenVG.so.*"
> FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*"
>
> FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
> -FILES_libdricore-dev = "${libdir}/libdricore*.*"
> FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
> FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
> FILES_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
> similarity index 82%
> rename from meta/recipes-graphics/mesa/mesa_9.2.5.bb
> rename to meta/recipes-graphics/mesa/mesa_10.1.3.bb
> index 02ecd46..abc450a 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 \
> file://0006-fix-out-of-tree-egl.patch \
> "
>
> -SRC_URI[md5sum] = "9fb4de29ca1d9cfd03cbdefa123ba336"
> -SRC_URI[sha256sum] = "b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0"
> +SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad"
> +SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3"
>
> S = "${WORKDIR}/Mesa-${PV}"
>
> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
> index 1e6fdb5..59b0d1c 100644
> --- a/meta/recipes-graphics/mesa/mesa_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> @@ -5,8 +5,8 @@ DEFAULT_PREFERENCE = "-1"
> LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
>
> PR = "${INC_PR}.0"
> -SRCREV = "4636e87191fddd492ed8c61ba61faf4b2d89b2e4"
> -PV = "9.2.5+git${SRCPV}"
> +SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a"
> +PV = "10.1.3+git${SRCPV}"
>
> SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \
> file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] mesa: upgrade to 10.1.3
2014-05-16 17:19 ` Saul Wold
@ 2014-05-19 15:06 ` Valentin Popa
0 siblings, 0 replies; 13+ messages in thread
From: Valentin Popa @ 2014-05-19 15:06 UTC (permalink / raw)
To: Saul Wold, Burton, Ross; +Cc: openembedded-core
On 05/16/2014 08:19 PM, Saul Wold wrote:
> On 05/13/2014 07:59 AM, Valentin Popa wrote:
>> (*) libdricore was removed.
>> (*) added libmesa-megadriver that includes
>> all the hardlinks to the mesa megadriver.
>> (*) license is the same.
>>
>> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
>> ---
>> .../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
>> meta/recipes-graphics/mesa/mesa.inc | 35
>> +++++++++++++---------
>> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
>> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
>> 4 files changed, 25 insertions(+), 18 deletions(-)
>> rename meta/recipes-graphics/mesa/{mesa-gl_9.2.5.bb =>
>> mesa-gl_10.1.3.bb} (100%)
>> rename meta/recipes-graphics/mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb}
>> (82%)
>>
>> diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
>> b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb
>> similarity index 100%
>> rename from meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
>> rename to 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 a33b7b5..855a9e4 100644
>> --- a/meta/recipes-graphics/mesa/mesa.inc
>> +++ b/meta/recipes-graphics/mesa/mesa.inc
>> @@ -10,11 +10,11 @@ HOMEPAGE = "http://mesa3d.org"
>> BUGTRACKER = "https://bugs.freedesktop.org"
>> SECTION = "x11"
>> LICENSE = "MIT"
>> -LIC_FILES_CHKSUM =
>> "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
>>
>> -INC_PR = "r9"
>> PE = "2"
>>
>> +LIC_FILES_CHKSUM =
>> "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
>> +
>> DEPENDS = "expat makedepend-native flex-native bison-native udev"
>>
>> PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2
>> virtual/egl virtual/mesa"
>> @@ -30,7 +30,7 @@ PACKAGECONFIG ??= "egl gles dri \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
>> 'wayland', '', d)}\
>> "
>>
>> -X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm
>> libxdamage libxfixes"
>> +X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm
>> libxdamage libxfixes presentproto libxshmfence"
>> PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
>> PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
>> PACKAGECONFIG[wayland] = ",,wayland"
>> @@ -38,7 +38,7 @@ PACKAGECONFIG[wayland] = ",,wayland"
>> DRIDRIVERS = "swrast"
>> DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
>> DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
>> -PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS},
>> --disable-dri, dri2proto libdrm"
>> +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS},
>> --disable-dri, dri2proto dri3proto libdrm"
>>
> In the configure, there is both enable-dri and enable-dri3, the
> default is to enable dri3 for linux, but do we want to enable dri3 by
> default and add the 2 new dependencies?
>
> Just asking?
>
> Sau!
You are right. It's better to have a dri3 key in PACKAGECONFIG. I'll
submit a new version together with the fix for the build failure on
multilib.
Thanks!
>
>
>> EXTRA_OECONF += "--enable-gbm"
>>
>> @@ -78,7 +78,7 @@ RDEPENDS_${PN}-dev = ""
>> PACKAGES =+ "libegl-mesa libegl-mesa-dev \
>> libosmesa libosmesa-dev \
>> libgl-mesa libgl-mesa-dev \
>> - libdricore libdricore-dev \
>> + libmesa-megadriver \
>> libglapi libglapi-dev \
>> libgbm libgbm-dev \
>> libgles1-mesa libgles1-mesa-dev \
>> @@ -96,7 +96,7 @@ do_install_append () {
>> rm -f ${D}${libdir}/egl/*.la
>> rm -f ${D}${libdir}/gallium-pipe/*.la
>> rm -f ${D}${libdir}/gbm/*.la
>> -
>> +
>> # it was packaged in libdricore9.1.3-1 and preventing upgrades
>> when debian.bbclass was used
>> rm -f ${D}${sysconfdir}/drirc
>> }
>> @@ -119,7 +119,7 @@ python __anonymous() {
>> d.appendVar("RREPLACES_" + fullp, pkgs)
>> d.appendVar("RPROVIDES_" + fullp, pkgs)
>> d.appendVar("RCONFLICTS_" + fullp, pkgs)
>> -
>> +
>> # For -dev, the first element is both the Debian and
>> original name
>> fullp += "-dev"
>> pkgs = p[1] + "-dev"
>> @@ -130,15 +130,23 @@ python __anonymous() {
>> }
>>
>> python mesa_populate_packages() {
>> - dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
>> -
>> pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
>> - pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$',
>> 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
>> for pkg in pkgs:
>> d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-",
>> "mesa-dri-"))
>> d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-",
>> "mesa-dri-"))
>> d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-",
>> "mesa-dri-"))
>> -
>> +
>> + import re
>> + dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
>> + dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root)
>> + for p in sorted(dri_pkgs):
>> + m = re.match('^(.*)_dri\.so$', p)
>> + if m:
>> + pkg_name = " mesa-driver-%s" %
>> legitimize_package_name(m.group(1))
>> + d.appendVar("RPROVIDES_libmesa-megadriver", pkg_name)
>> + d.appendVar("RCONFLICTS_libmesa-megadriver", pkg_name)
>> + d.appendVar("RREPLACES_libmesa-megadriver", pkg_name)
>> +
>> pipe_drivers_root = os.path.join(d.getVar('libdir', True),
>> "gallium-pipe")
>> do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$',
>> 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
>> }
>> @@ -148,8 +156,8 @@ PACKAGESPLITFUNCS_prepend =
>> "mesa_populate_packages "
>> PACKAGES_DYNAMIC += "^mesa-driver-.*"
>>
>> FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
>> -
>> -FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
>> +FILES_${PN} += "${sysconfdir}/drirc"
>> +FILES_libmesa-megadriver = "${libdir}/dri/*"
>> FILES_libegl-mesa = "${libdir}/libEGL.so.*"
>> FILES_libgbm = "${libdir}/libgbm.so.*"
>> FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
>> @@ -164,7 +172,6 @@ FILES_libopenvg = "${libdir}/libOpenVG.so.*"
>> FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*"
>>
>> FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
>> -FILES_libdricore-dev = "${libdir}/libdricore*.*"
>> FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL
>> ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
>> FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc
>> ${includedir}/gbm.h"
>> FILES_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
>> similarity index 82%
>> rename from meta/recipes-graphics/mesa/mesa_9.2.5.bb
>> rename to meta/recipes-graphics/mesa/mesa_10.1.3.bb
>> index 02ecd46..abc450a 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 \
>> file://0006-fix-out-of-tree-egl.patch \
>> "
>>
>> -SRC_URI[md5sum] = "9fb4de29ca1d9cfd03cbdefa123ba336"
>> -SRC_URI[sha256sum] =
>> "b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0"
>> +SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad"
>> +SRC_URI[sha256sum] =
>> "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3"
>>
>> S = "${WORKDIR}/Mesa-${PV}"
>>
>> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb
>> b/meta/recipes-graphics/mesa/mesa_git.bb
>> index 1e6fdb5..59b0d1c 100644
>> --- a/meta/recipes-graphics/mesa/mesa_git.bb
>> +++ b/meta/recipes-graphics/mesa/mesa_git.bb
>> @@ -5,8 +5,8 @@ DEFAULT_PREFERENCE = "-1"
>> LIC_FILES_CHKSUM =
>> "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
>>
>> PR = "${INC_PR}.0"
>> -SRCREV = "4636e87191fddd492ed8c61ba61faf4b2d89b2e4"
>> -PV = "9.2.5+git${SRCPV}"
>> +SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a"
>> +PV = "10.1.3+git${SRCPV}"
>>
>> SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \
>> file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
>>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe] [PATCH 0/3] mesa upgrade
2014-05-13 15:28 ` [PATCH 0/3] mesa upgrade Burton, Ross
2014-05-14 20:34 ` [oe] " Otavio Salvador
@ 2014-06-04 12:52 ` Martin Jansa
2014-06-04 14:24 ` Burton, Ross
2014-06-06 16:15 ` Burton, Ross
1 sibling, 2 replies; 13+ messages in thread
From: Martin Jansa @ 2014-06-04 12:52 UTC (permalink / raw)
To: openembedded-devel; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2824 bytes --]
On Tue, May 13, 2014 at 04:28:42PM +0100, Burton, Ross wrote:
> Hi all,
Sorry for hi-jacking the thread, but since today even the older 9.2.5 is
failing to find native python-libxml2
config.log:
configure:8059: checking for python2
configure:8075: found
/OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python2
configure:8086: result: python2
configure:8103: checking python2 module: libxml2
configure:8112: result: no
configure:8118: error: failed to find required module libxml2
Any idea why it started to fail now?
> As this is a major release of Mesa I'm expecting breakage somewhere...
> Can BSP maintainers please test these patches if their machines build
> Mesa? I'm expecting machines that use mesa-gl to break if they don't
> just use the pure software drivers (so that's at least EMGD and if I
> recall correctly some ARM drivers).
>
> Ross
>
> On 13 May 2014 15:59, Valentin Popa <valentin.popa@intel.com> wrote:
> > mesa upgrade to 10.1.3
> >
> > The following changes since commit 40551859671a1c9da26cfdcda34da952c66ac8c2:
> >
> > qemu/local.conf.sample: Add sdl PACKAGECONFIG (2014-05-13 08:02:04 +0100)
> >
> > are available in the git repository at:
> >
> > git://git.yoctoproject.org/poky-contrib vpopa/mesa
> > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/mesa
> >
> > Valentin Popa (3):
> > dri3proto: add it to oe-core
> > libxshmfence: add it to oe-core
> > mesa: upgrade to 10.1.3
> >
> > .../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
> > meta/recipes-graphics/mesa/mesa.inc | 35 +++++++++++++---------
> > .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
> > meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
> > meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb | 17 +++++++++++
> > meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb | 14 +++++++++
> > 6 files changed, 56 insertions(+), 18 deletions(-)
> > rename meta/recipes-graphics/mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} (100%)
> > rename meta/recipes-graphics/mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} (82%)
> > create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
> > create mode 100644 meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
> >
> > --
> > 1.9.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe] [PATCH 0/3] mesa upgrade
2014-06-04 12:52 ` Martin Jansa
@ 2014-06-04 14:24 ` Burton, Ross
2014-06-04 17:12 ` Martin Jansa
2014-06-06 16:15 ` Burton, Ross
1 sibling, 1 reply; 13+ messages in thread
From: Burton, Ross @ 2014-06-04 14:24 UTC (permalink / raw)
To: OE-devel; +Cc: OE-core
On 4 June 2014 13:52, Martin Jansa <martin.jansa@gmail.com> wrote:
> Sorry for hi-jacking the thread, but since today even the older 9.2.5 is
> failing to find native python-libxml2
>
> config.log:
> configure:8059: checking for python2
> configure:8075: found
> /OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python2
> configure:8086: result: python2
> configure:8103: checking python2 module: libxml2
> configure:8112: result: no
> configure:8118: error: failed to find required module libxml2
>
> Any idea why it started to fail now?
Great. Can you share the config.log?
Ross
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe] [PATCH 0/3] mesa upgrade
2014-06-04 14:24 ` Burton, Ross
@ 2014-06-04 17:12 ` Martin Jansa
0 siblings, 0 replies; 13+ messages in thread
From: Martin Jansa @ 2014-06-04 17:12 UTC (permalink / raw)
To: openembedded-devel; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
On Wed, Jun 04, 2014 at 03:24:34PM +0100, Burton, Ross wrote:
> On 4 June 2014 13:52, Martin Jansa <martin.jansa@gmail.com> wrote:
> > Sorry for hi-jacking the thread, but since today even the older 9.2.5 is
> > failing to find native python-libxml2
> >
> > config.log:
> > configure:8059: checking for python2
> > configure:8075: found
> > /OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python2
> > configure:8086: result: python2
> > configure:8103: checking python2 module: libxml2
> > configure:8112: result: no
> > configure:8118: error: failed to find required module libxml2
> >
> > Any idea why it started to fail now?
>
> Great. Can you share the config.log?
This is from config.log, do you want whole file?
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe] [PATCH 0/3] mesa upgrade
2014-06-04 12:52 ` Martin Jansa
2014-06-04 14:24 ` Burton, Ross
@ 2014-06-06 16:15 ` Burton, Ross
1 sibling, 0 replies; 13+ messages in thread
From: Burton, Ross @ 2014-06-06 16:15 UTC (permalink / raw)
To: OE-devel; +Cc: OE-core
On 4 June 2014 13:52, Martin Jansa <martin.jansa@gmail.com> wrote:
> Sorry for hi-jacking the thread, but since today even the older 9.2.5 is
> failing to find native python-libxml2
>
> config.log:
> configure:8059: checking for python2
> configure:8075: found
> /OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python2
> configure:8086: result: python2
> configure:8103: checking python2 module: libxml2
> configure:8112: result: no
> configure:8118: error: failed to find required module libxml2
>
> Any idea why it started to fail now?
Something else must have lost a python-libxml2 dependency recently
because Mesa needs it but doesn't have a declared dependency.
Ross
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2014-06-06 16:15 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-13 14:59 [PATCH 0/3] mesa upgrade Valentin Popa
2014-05-13 14:59 ` [PATCH 1/3] dri3proto: add it to oe-core Valentin Popa
2014-05-13 14:59 ` [PATCH 2/3] libxshmfence: " Valentin Popa
2014-05-13 14:59 ` [PATCH 3/3] mesa: upgrade to 10.1.3 Valentin Popa
2014-05-16 17:19 ` Saul Wold
2014-05-19 15:06 ` Valentin Popa
2014-05-19 15:02 ` Saul Wold
2014-05-13 15:28 ` [PATCH 0/3] mesa upgrade Burton, Ross
2014-05-14 20:34 ` [oe] " Otavio Salvador
2014-06-04 12:52 ` Martin Jansa
2014-06-04 14:24 ` Burton, Ross
2014-06-04 17:12 ` Martin Jansa
2014-06-06 16:15 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox