* [PATCH 0/4] [PATCH_V2]mesa: upgrade to 10.1.3
@ 2014-05-21 16:49 Valentin Popa
2014-05-21 16:49 ` [PATCH 1/4] dri3proto: add it to oe-core Valentin Popa
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Valentin Popa @ 2014-05-21 16:49 UTC (permalink / raw)
To: openembedded-core
New in V2:
(*) eglinfo: patched to compile with mesa10+
(*) mesa: upgrade to 10.1.3 - multilib rootfs issue fixed
The following changes since commit 122079e9b0b513c46ca76993403db4cfa51e858f:
bitbake: data_smart: Fix an unusual variable reference bug (2014-05-21 16:47:01 +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 (4):
dri3proto: add it to oe-core
libxshmfence: add it to oe-core
mesa: upgrade to 10.1.3
eglinfo: patched to compile with mesa10+
meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb | 2 ++
meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | 2 ++
meta/recipes-graphics/eglinfo/eglinfo.inc | 4 ++-
.../0001-eglinfo-x11-change-constant-name.patch | 33 ++++++++++++++++++++
.../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 36 ++++++++++++++--------
.../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 +++++++++
10 files changed, 99 insertions(+), 17 deletions(-)
create mode 100644 meta/recipes-graphics/eglinfo/eglinfo/0001-eglinfo-x11-change-constant-name.patch
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] 14+ messages in thread
* [PATCH 1/4] dri3proto: add it to oe-core
2014-05-21 16:49 [PATCH 0/4] [PATCH_V2]mesa: upgrade to 10.1.3 Valentin Popa
@ 2014-05-21 16:49 ` Valentin Popa
2014-05-21 16:50 ` [PATCH 2/4] libxshmfence: " Valentin Popa
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Valentin Popa @ 2014-05-21 16:49 UTC (permalink / raw)
To: openembedded-core
mesa 10+ depends on this (if the user builds mesa
with dri3 support enabled). 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] 14+ messages in thread
* [PATCH 2/4] libxshmfence: add it to oe-core
2014-05-21 16:49 [PATCH 0/4] [PATCH_V2]mesa: upgrade to 10.1.3 Valentin Popa
2014-05-21 16:49 ` [PATCH 1/4] dri3proto: add it to oe-core Valentin Popa
@ 2014-05-21 16:50 ` Valentin Popa
2014-05-21 16:50 ` [PATCH 3/4] mesa: upgrade to 10.1.3 Valentin Popa
` (2 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Valentin Popa @ 2014-05-21 16:50 UTC (permalink / raw)
To: openembedded-core
mesa 10+ depends on this (if the user builds mesa
with dri3 support enabled). So add it to 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] 14+ messages in thread
* [PATCH 3/4] mesa: upgrade to 10.1.3
2014-05-21 16:49 [PATCH 0/4] [PATCH_V2]mesa: upgrade to 10.1.3 Valentin Popa
2014-05-21 16:49 ` [PATCH 1/4] dri3proto: add it to oe-core Valentin Popa
2014-05-21 16:50 ` [PATCH 2/4] libxshmfence: " Valentin Popa
@ 2014-05-21 16:50 ` Valentin Popa
2014-05-21 18:33 ` Martin Jansa
2014-05-21 16:50 ` [PATCH 4/4] eglinfo: patched to compile with mesa10+ Valentin Popa
2014-05-22 16:28 ` [PATCH 0/4] [V3]mesa: upgrade to 10.1.3 Valentin Popa
4 siblings, 1 reply; 14+ messages in thread
From: Valentin Popa @ 2014-05-21 16:50 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 | 36 ++++++++++++++--------
.../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
4 files changed, 28 insertions(+), 16 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..f7ee7c1 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"
@@ -39,6 +39,7 @@ 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[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
EXTRA_OECONF += "--enable-gbm"
@@ -78,7 +79,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 +97,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 +120,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 +131,27 @@ 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)
+ lib_name = "libmesa-megadriver"
+ mlprefix = d.getVar('MLPREFIX', True)
+ if mlprefix:
+ lib_name = "%s%s" % (mlprefix, lib_name)
+ 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_%s" % lib_name, pkg_name)
+ d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
+ d.appendVar("RREPLACES_%s" % lib_name, 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 +161,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 +177,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] 14+ messages in thread
* [PATCH 4/4] eglinfo: patched to compile with mesa10+
2014-05-21 16:49 [PATCH 0/4] [PATCH_V2]mesa: upgrade to 10.1.3 Valentin Popa
` (2 preceding siblings ...)
2014-05-21 16:50 ` [PATCH 3/4] mesa: upgrade to 10.1.3 Valentin Popa
@ 2014-05-21 16:50 ` Valentin Popa
2014-05-21 20:22 ` Burton, Ross
2014-05-22 16:28 ` [PATCH 0/4] [V3]mesa: upgrade to 10.1.3 Valentin Popa
4 siblings, 1 reply; 14+ messages in thread
From: Valentin Popa @ 2014-05-21 16:50 UTC (permalink / raw)
To: openembedded-core
Solves the compile issue against mesa10+:
../../src/glapi_stats.cpp: In function 'const char* eglinfo::get_shader_binary_format_string(GLint)':
| ../../src/glapi_stats.cpp:171:8: error: 'GCCSO_SHADER_BINARY_FJ' was not declared in this scope
| case GCCSO_SHADER_BINARY_FJ: return "FJ_shader_binary_GCCSO";
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb | 2 ++
meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | 2 ++
meta/recipes-graphics/eglinfo/eglinfo.inc | 4 ++-
.../0001-eglinfo-x11-change-constant-name.patch | 33 ++++++++++++++++++++++
4 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-graphics/eglinfo/eglinfo/0001-eglinfo-x11-change-constant-name.patch
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
index 455d31e..456afe0 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
+++ b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
@@ -1,6 +1,8 @@
EGLINFO_PLATFORM ?= "fb"
EGLINFO_BINARY_NAME ?= "eglinfo-fb"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/eglinfo:"
+
include eglinfo.inc
SUMMARY += "(Framebuffer version)"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
index 18fc893..676277a 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
+++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
@@ -1,6 +1,8 @@
EGLINFO_PLATFORM ?= "x11"
EGLINFO_BINARY_NAME ?= "eglinfo-x11"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/eglinfo:"
+
include eglinfo.inc
DEPENDS += "virtual/libx11"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc
index 785e7f1..b342f4e 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ b/meta/recipes-graphics/eglinfo/eglinfo.inc
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c"
DEPENDS = "virtual/egl"
-SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master"
+SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \
+ file://0001-eglinfo-x11-change-constant-name.patch"
+
SRCREV = "4a49ff59545d9b6a8222badab64115f89d3a6774"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo/0001-eglinfo-x11-change-constant-name.patch b/meta/recipes-graphics/eglinfo/eglinfo/0001-eglinfo-x11-change-constant-name.patch
new file mode 100644
index 0000000..c125a96
--- /dev/null
+++ b/meta/recipes-graphics/eglinfo/eglinfo/0001-eglinfo-x11-change-constant-name.patch
@@ -0,0 +1,33 @@
+From 101a543d145568e1905b02a8ef7ab17b6c235d4a Mon Sep 17 00:00:00 2001
+From: Valentin Popa <valentin.popa@intel.com>
+Date: Wed, 21 May 2014 19:04:42 +0300
+Subject: [PATCH] eglinfo-x11: change constant name
+
+In mesa 10+, GCCSO_SHADER_BINARY_FJ was renamed to
+GL_GCCSO_SHADER_BINARY_FJ.
+Update the name so they match.
+
+Upstream-Status: Pending
+https://github.com/dv1/eglinfo/issues/1
+
+Signed-off-by: Valentin Popa <valentin.popa@intel.com>
+---
+ src/glapi_stats.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/glapi_stats.cpp b/src/glapi_stats.cpp
+index 29f6650..b22f826 100644
+--- a/src/glapi_stats.cpp
++++ b/src/glapi_stats.cpp
+@@ -168,7 +168,7 @@ char const * get_shader_binary_format_string(GLint const p_format)
+ case GL_SHADER_BINARY_VIV: return "SHADER_BINARY_VIV";
+ case GL_MALI_SHADER_BINARY_ARM: return "MALI_SHADER_BINARY";
+ case GL_SHADER_BINARY_DMP: return "SHADER_BINARY_DMP";
+- case GCCSO_SHADER_BINARY_FJ: return "FJ_shader_binary_GCCSO";
++ case GL_GCCSO_SHADER_BINARY_FJ: return "FJ_shader_binary_GCCSO";
+ case GL_SGX_BINARY_IMG: return "SGX_BINARY_IMG";
+ default: return 0;
+ }
+--
+1.9.1
+
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] mesa: upgrade to 10.1.3
2014-05-21 16:50 ` [PATCH 3/4] mesa: upgrade to 10.1.3 Valentin Popa
@ 2014-05-21 18:33 ` Martin Jansa
2014-05-22 12:26 ` Valentin Popa
0 siblings, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2014-05-21 18:33 UTC (permalink / raw)
To: Valentin Popa; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 7826 bytes --]
On Wed, May 21, 2014 at 07:50:01PM +0300, Valentin Popa wrote:
> (*) libdricore was removed.
> (*) added libmesa-megadriver that includes
> all the hardlinks to the mesa megadriver.
Why not call it mesa-drivers to be more consistent with kernel-modules
or gst-plugins-good, etc "meta" packages?
> (*) 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 | 36 ++++++++++++++--------
> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
> 4 files changed, 28 insertions(+), 16 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..f7ee7c1 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"
> @@ -39,6 +39,7 @@ 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[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
>
> EXTRA_OECONF += "--enable-gbm"
>
> @@ -78,7 +79,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 +97,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 +120,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 +131,27 @@ 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)
> + lib_name = "libmesa-megadriver"
> + mlprefix = d.getVar('MLPREFIX', True)
> + if mlprefix:
> + lib_name = "%s%s" % (mlprefix, lib_name)
> + 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_%s" % lib_name, pkg_name)
> + d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
> + d.appendVar("RREPLACES_%s" % lib_name, 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 +161,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 +177,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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] eglinfo: patched to compile with mesa10+
2014-05-21 16:50 ` [PATCH 4/4] eglinfo: patched to compile with mesa10+ Valentin Popa
@ 2014-05-21 20:22 ` Burton, Ross
2014-05-22 12:28 ` Valentin Popa
0 siblings, 1 reply; 14+ messages in thread
From: Burton, Ross @ 2014-05-21 20:22 UTC (permalink / raw)
To: Valentin Popa; +Cc: OE-core
On 21 May 2014 17:50, Valentin Popa <valentin.popa@intel.com> wrote:
> +Upstream-Status: Pending
Pending here means "pending decision on whether it's
upstreamable/inappropriate", in this case it would be Submitted (with
that URL as the context).
Ross
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] mesa: upgrade to 10.1.3
2014-05-21 18:33 ` Martin Jansa
@ 2014-05-22 12:26 ` Valentin Popa
2014-05-22 13:23 ` Martin Jansa
0 siblings, 1 reply; 14+ messages in thread
From: Valentin Popa @ 2014-05-22 12:26 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 05/21/2014 09:33 PM, Martin Jansa wrote:
> On Wed, May 21, 2014 at 07:50:01PM +0300, Valentin Popa wrote:
>> (*) libdricore was removed.
>> (*) added libmesa-megadriver that includes
>> all the hardlinks to the mesa megadriver.
> Why not call it mesa-drivers to be more consistent with kernel-modules
> or gst-plugins-good, etc "meta" packages?
I can call it mesa-megadriver (I still need to keep "megadriver",
because inside the package is only on driver (multiple hardlinks to it,
with the proper names)).
It's ok like this?
>
>> (*) 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 | 36 ++++++++++++++--------
>> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
>> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
>> 4 files changed, 28 insertions(+), 16 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..f7ee7c1 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"
>> @@ -39,6 +39,7 @@ 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[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
>>
>> EXTRA_OECONF += "--enable-gbm"
>>
>> @@ -78,7 +79,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 +97,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 +120,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 +131,27 @@ 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)
>> + lib_name = "libmesa-megadriver"
>> + mlprefix = d.getVar('MLPREFIX', True)
>> + if mlprefix:
>> + lib_name = "%s%s" % (mlprefix, lib_name)
>> + 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_%s" % lib_name, pkg_name)
>> + d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
>> + d.appendVar("RREPLACES_%s" % lib_name, 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 +161,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 +177,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
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] eglinfo: patched to compile with mesa10+
2014-05-21 20:22 ` Burton, Ross
@ 2014-05-22 12:28 ` Valentin Popa
0 siblings, 0 replies; 14+ messages in thread
From: Valentin Popa @ 2014-05-22 12:28 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 05/21/2014 11:22 PM, Burton, Ross wrote:
> On 21 May 2014 17:50, Valentin Popa <valentin.popa@intel.com> wrote:
>> +Upstream-Status: Pending
> Pending here means "pending decision on whether it's
> upstreamable/inappropriate", in this case it would be Submitted (with
> that URL as the context).
>
> Ross
I wasn't submitted upstream. There was a bug filed, fixed today. I'll
remove the patch entirely.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] mesa: upgrade to 10.1.3
2014-05-22 12:26 ` Valentin Popa
@ 2014-05-22 13:23 ` Martin Jansa
2014-05-22 13:29 ` Valentin Popa
0 siblings, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2014-05-22 13:23 UTC (permalink / raw)
To: Valentin Popa; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 8715 bytes --]
On Thu, May 22, 2014 at 03:26:12PM +0300, Valentin Popa wrote:
> On 05/21/2014 09:33 PM, Martin Jansa wrote:
> > On Wed, May 21, 2014 at 07:50:01PM +0300, Valentin Popa wrote:
> >> (*) libdricore was removed.
> >> (*) added libmesa-megadriver that includes
> >> all the hardlinks to the mesa megadriver.
> > Why not call it mesa-drivers to be more consistent with kernel-modules
> > or gst-plugins-good, etc "meta" packages?
>
> I can call it mesa-megadriver (I still need to keep "megadriver",
> because inside the package is only on driver (multiple hardlinks to it,
> with the proper names)).
Sorry, I fail to parse this sentence. Where do you have hardlinks?
> >> 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 | 36 ++++++++++++++--------
> >> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
> >> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
> >> 4 files changed, 28 insertions(+), 16 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..f7ee7c1 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"
> >> @@ -39,6 +39,7 @@ 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[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
> >>
> >> EXTRA_OECONF += "--enable-gbm"
> >>
> >> @@ -78,7 +79,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 +97,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 +120,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 +131,27 @@ 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)
> >> + lib_name = "libmesa-megadriver"
> >> + mlprefix = d.getVar('MLPREFIX', True)
> >> + if mlprefix:
> >> + lib_name = "%s%s" % (mlprefix, lib_name)
> >> + 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_%s" % lib_name, pkg_name)
> >> + d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
> >> + d.appendVar("RREPLACES_%s" % lib_name, 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 +161,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 +177,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
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] mesa: upgrade to 10.1.3
2014-05-22 13:23 ` Martin Jansa
@ 2014-05-22 13:29 ` Valentin Popa
0 siblings, 0 replies; 14+ messages in thread
From: Valentin Popa @ 2014-05-22 13:29 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 05/22/2014 04:23 PM, Martin Jansa wrote:
> On Thu, May 22, 2014 at 03:26:12PM +0300, Valentin Popa wrote:
>> On 05/21/2014 09:33 PM, Martin Jansa wrote:
>>> On Wed, May 21, 2014 at 07:50:01PM +0300, Valentin Popa wrote:
>>>> (*) libdricore was removed.
>>>> (*) added libmesa-megadriver that includes
>>>> all the hardlinks to the mesa megadriver.
>>> Why not call it mesa-drivers to be more consistent with kernel-modules
>>> or gst-plugins-good, etc "meta" packages?
>> I can call it mesa-megadriver (I still need to keep "megadriver",
>> because inside the package is only on driver (multiple hardlinks to it,
>> with the proper names)).
> Sorry, I fail to parse this sentence. Where do you have hardlinks?
At build time, mesa creates a big dri driver that contains all
the dri drivers (a megadriver). Then makes hardlinks to it with the name
of each dri driver (i915, i965, etc). Then
deletes that initial big driver (at install time). The package will
contain those hardlinks.
>
>>>> 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 | 36 ++++++++++++++--------
>>>> .../mesa/{mesa_9.2.5.bb => mesa_10.1.3.bb} | 4 +--
>>>> meta/recipes-graphics/mesa/mesa_git.bb | 4 +--
>>>> 4 files changed, 28 insertions(+), 16 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..f7ee7c1 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"
>>>> @@ -39,6 +39,7 @@ 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[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
>>>>
>>>> EXTRA_OECONF += "--enable-gbm"
>>>>
>>>> @@ -78,7 +79,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 +97,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 +120,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 +131,27 @@ 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)
>>>> + lib_name = "libmesa-megadriver"
>>>> + mlprefix = d.getVar('MLPREFIX', True)
>>>> + if mlprefix:
>>>> + lib_name = "%s%s" % (mlprefix, lib_name)
>>>> + 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_%s" % lib_name, pkg_name)
>>>> + d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
>>>> + d.appendVar("RREPLACES_%s" % lib_name, 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 +161,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 +177,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
>>>>
>>>> --
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core@lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/4] [V3]mesa: upgrade to 10.1.3
2014-05-21 16:49 [PATCH 0/4] [PATCH_V2]mesa: upgrade to 10.1.3 Valentin Popa
` (3 preceding siblings ...)
2014-05-21 16:50 ` [PATCH 4/4] eglinfo: patched to compile with mesa10+ Valentin Popa
@ 2014-05-22 16:28 ` Valentin Popa
2014-05-22 16:58 ` Burton, Ross
4 siblings, 1 reply; 14+ messages in thread
From: Valentin Popa @ 2014-05-22 16:28 UTC (permalink / raw)
To: openembedded-core
New from V2:
(*) removed the old patch for eglinfo and updated the recipe to a newer
version.
(*) renamed libmesa-megadriver to mesa-megadriver
The changes are available at :
git://git.yoctoproject.org/poky-contrib vpopa/mesa
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/mesa
On 05/21/2014 07:49 PM, Valentin Popa wrote:
> New in V2:
> (*) eglinfo: patched to compile with mesa10+
> (*) mesa: upgrade to 10.1.3 - multilib rootfs issue fixed
>
> The following changes since commit 122079e9b0b513c46ca76993403db4cfa51e858f:
>
> bitbake: data_smart: Fix an unusual variable reference bug (2014-05-21 16:47:01 +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 (4):
> dri3proto: add it to oe-core
> libxshmfence: add it to oe-core
> mesa: upgrade to 10.1.3
> eglinfo: patched to compile with mesa10+
>
> meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb | 2 ++
> meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | 2 ++
> meta/recipes-graphics/eglinfo/eglinfo.inc | 4 ++-
> .../0001-eglinfo-x11-change-constant-name.patch | 33 ++++++++++++++++++++
> .../mesa/{mesa-gl_9.2.5.bb => mesa-gl_10.1.3.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 36 ++++++++++++++--------
> .../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 +++++++++
> 10 files changed, 99 insertions(+), 17 deletions(-)
> create mode 100644 meta/recipes-graphics/eglinfo/eglinfo/0001-eglinfo-x11-change-constant-name.patch
> 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
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/4] [V3]mesa: upgrade to 10.1.3
2014-05-22 16:28 ` [PATCH 0/4] [V3]mesa: upgrade to 10.1.3 Valentin Popa
@ 2014-05-22 16:58 ` Burton, Ross
2014-05-27 16:16 ` Sean Hudson
0 siblings, 1 reply; 14+ messages in thread
From: Burton, Ross @ 2014-05-22 16:58 UTC (permalink / raw)
To: Valentin Popa; +Cc: OE-core
For these three patches:
On 22 May 2014 17:28, Valentin Popa <valentin.popa@intel.com> wrote:
>> dri3proto: add it to oe-core
>> libxshmfence: add it to oe-core
>> eglinfo: patched to compile with mesa10+
Signed-off-by: Ross Burton <ross.burton@intel.com>
Mesa needs more testing, but these pieces are good to merge.
Ross
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/4] [V3]mesa: upgrade to 10.1.3
2014-05-22 16:58 ` Burton, Ross
@ 2014-05-27 16:16 ` Sean Hudson
0 siblings, 0 replies; 14+ messages in thread
From: Sean Hudson @ 2014-05-27 16:16 UTC (permalink / raw)
To: Burton, Ross, Valentin Popa; +Cc: OE-core
On 05/22/2014 11:58 AM, Burton, Ross wrote:
> For these three patches:
>
> On 22 May 2014 17:28, Valentin Popa <valentin.popa@intel.com> wrote:
>>> dri3proto: add it to oe-core
>>> libxshmfence: add it to oe-core
>>> eglinfo: patched to compile with mesa10+
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
>
> Mesa needs more testing, but these pieces are good to merge.
>
> Ross
>
I don't have a specific need to preserve MESA 9.x (that I know of
right now), but it seems like we might consider keeping it around a bit
longer in parallel with MESA 10.x and then formally deprecate it in the
next release.
Regards,
Sean
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-05-27 16:16 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-21 16:49 [PATCH 0/4] [PATCH_V2]mesa: upgrade to 10.1.3 Valentin Popa
2014-05-21 16:49 ` [PATCH 1/4] dri3proto: add it to oe-core Valentin Popa
2014-05-21 16:50 ` [PATCH 2/4] libxshmfence: " Valentin Popa
2014-05-21 16:50 ` [PATCH 3/4] mesa: upgrade to 10.1.3 Valentin Popa
2014-05-21 18:33 ` Martin Jansa
2014-05-22 12:26 ` Valentin Popa
2014-05-22 13:23 ` Martin Jansa
2014-05-22 13:29 ` Valentin Popa
2014-05-21 16:50 ` [PATCH 4/4] eglinfo: patched to compile with mesa10+ Valentin Popa
2014-05-21 20:22 ` Burton, Ross
2014-05-22 12:28 ` Valentin Popa
2014-05-22 16:28 ` [PATCH 0/4] [V3]mesa: upgrade to 10.1.3 Valentin Popa
2014-05-22 16:58 ` Burton, Ross
2014-05-27 16:16 ` Sean Hudson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.