* [PATCH 1/3] mesa: common packaging cleanup
2012-12-06 12:23 [PATCH 0/3] Mesa updates Ross Burton
@ 2012-12-06 12:23 ` Ross Burton
2012-12-06 12:23 ` [PATCH 2/3] mesa: upgrade to 8.0.5 Ross Burton
2012-12-06 12:23 ` [PATCH 3/3] mesa-dri: upgrade -git version to current master Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2012-12-06 12:23 UTC (permalink / raw)
To: openembedded-core
mesa-dri ships the configuration file in mesa 9, so ship that and don't claim
it's empty. Clean up libegl and libgbm packaging.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index d5f83e4..e661eee 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r5"
+INC_PR = "r6"
PE = "2"
DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -37,9 +37,6 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
-# Remove the mesa-dri dependency on mesa-dri-dev, as mesa-dri is empty
-RDEPENDS_${PN}-dev = ""
-
PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libosmesa libosmesa-dev \
libgl-mesa libgl-mesa-dev \
@@ -76,7 +73,8 @@ python __anonymous() {
d.appendVar("RCONFLICTS_" + fullp, pkgs)
}
-FILES_libegl-mesa = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_${PN} = "${sysconfdir}/drirc"
+FILES_libegl-mesa = "${libdir}/libEGL.so.*"
FILES_libgbm = "${libdir}/libgbm.so.*"
FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
@@ -84,8 +82,9 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*"
FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
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_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
FILES_libglapi-dev = "${libdir}/libglapi.*"
FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] mesa: upgrade to 8.0.5
2012-12-06 12:23 [PATCH 0/3] Mesa updates Ross Burton
2012-12-06 12:23 ` [PATCH 1/3] mesa: common packaging cleanup Ross Burton
@ 2012-12-06 12:23 ` Ross Burton
2012-12-06 12:23 ` [PATCH 3/3] mesa-dri: upgrade -git version to current master Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2012-12-06 12:23 UTC (permalink / raw)
To: openembedded-core
Licence checksum change, use an upstream source file instead of a generated
file: we were previously checksumming the Bison license.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/{mesa-8.0.4.inc => mesa-8.0.5.inc} | 6 +++---
...sa-dri-glsl-native_8.0.4.bb => mesa-dri-glsl-native_8.0.5.bb} | 6 +++---
.../mesa/{mesa-dri_8.0.4.bb => mesa-dri_8.0.5.bb} | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-8.0.4.inc => mesa-8.0.5.inc} (80%)
rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_8.0.4.bb => mesa-dri-glsl-native_8.0.5.bb} (66%)
rename meta/recipes-graphics/mesa/{mesa-dri_8.0.4.bb => mesa-dri_8.0.5.bb} (78%)
diff --git a/meta/recipes-graphics/mesa/mesa-8.0.4.inc b/meta/recipes-graphics/mesa/mesa-8.0.5.inc
similarity index 80%
rename from meta/recipes-graphics/mesa/mesa-8.0.4.inc
rename to meta/recipes-graphics/mesa/mesa-8.0.5.inc
index c6307dc..b39b011 100644
--- a/meta/recipes-graphics/mesa/mesa-8.0.4.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.5.inc
@@ -1,6 +1,6 @@
DEPENDS += "mesa-dri-glsl-native"
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://0001-Compile-with-uclibc.patch \
file://0002-cross-compile.patch \
file://0003-fix-for-x32.patch \
@@ -9,8 +9,8 @@ SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-ha
S = "${WORKDIR}/Mesa-${PV}"
-SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
-SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
+SRC_URI[md5sum] = "01305591073a76b65267f69f27d635a3"
+SRC_URI[sha256sum] = "511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e"
do_configure_prepend() {
# We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb
similarity index 66%
rename from meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
rename to meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb
index d551598..842d492 100644
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb
@@ -1,10 +1,10 @@
require mesa-dri-glsl-native.inc
-LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
+LIC_FILES_CHKSUM = "file://glsl_parser.yy;beginline=2;endline=23;md5=a12a9c0208ee64a07ce314dfed4c81eb"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
-SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
-SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
+SRC_URI[md5sum] = "01305591073a76b65267f69f27d635a3"
+SRC_URI[sha256sum] = "511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e"
S = "${WORKDIR}/Mesa-${PV}/src/glsl/"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb
similarity index 78%
rename from meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
rename to meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb
index a5a592d..26b56e4 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb
@@ -1,4 +1,4 @@
require mesa-common.inc
require mesa-${PV}.inc
require mesa-dri.inc
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.0"
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] mesa-dri: upgrade -git version to current master
2012-12-06 12:23 [PATCH 0/3] Mesa updates Ross Burton
2012-12-06 12:23 ` [PATCH 1/3] mesa: common packaging cleanup Ross Burton
2012-12-06 12:23 ` [PATCH 2/3] mesa: upgrade to 8.0.5 Ross Burton
@ 2012-12-06 12:23 ` Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2012-12-06 12:23 UTC (permalink / raw)
To: openembedded-core
license.html was reformated so the checksum changed.
The GLSL compiler can be built using CC_FOR_BUILD, so we don't need
mesa-dri-glsl-native.
Update common packaging to include libdricore and the skeleton libgles3, and
remove the driver .la files.
mesa-git/uclibc.patch isn't applied, remove.
x32 support is integrated into mklib, drop 0003-fix-for-x32.patch.
uclibc is checked for upstream, drop 0001-Compile-with-uclibc.patch.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 13 ++++-
.../mesa/mesa-dri-glsl-native_git.bb | 23 --------
meta/recipes-graphics/mesa/mesa-dri_git.bb | 2 +-
meta/recipes-graphics/mesa/mesa-git.inc | 17 ++----
meta/recipes-graphics/mesa/mesa-git/uclibc.patch | 57 --------------------
5 files changed, 17 insertions(+), 95 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-git/uclibc.patch
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index e661eee..c11d402 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r6"
+INC_PR = "r7"
PE = "2"
DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -40,15 +40,20 @@ EXCLUDE_FROM_WORLD = "1"
PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libosmesa libosmesa-dev \
libgl-mesa libgl-mesa-dev \
+ libdricore libdricore-dev \
libglapi libglapi-dev \
libgbm libgbm-dev \
libgles1-mesa libgles1-mesa-dev \
libgles2-mesa libgles2-mesa-dev \
+ libgles3-mesa libgles3-mesa-dev \
"
do_install_append () {
# GLU is now in libglu (this shouldn't be required in Mesa 9.x)
rm -f ${D}${includedir}/GL/glu*
+
+ # Drivers never need libtool .la files
+ rm -f ${D}${libdir}/dri/*.la
}
# For the packages that make up the OpenGL interfaces, inject variables so that
@@ -56,7 +61,8 @@ do_install_append () {
# RPROVIDEs/RCONFLICTs on the generic libgl name.
python __anonymous() {
for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
- ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2")):
+ ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
+ ("libgles3",)):
fullp = p[0] + "-mesa"
pkgs = " ".join(p)
d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
@@ -74,6 +80,7 @@ python __anonymous() {
}
FILES_${PN} = "${sysconfdir}/drirc"
+FILES_libdricore = "${libdir}/libdricore*.so.*"
FILES_libegl-mesa = "${libdir}/libEGL.so.*"
FILES_libgbm = "${libdir}/libgbm.so.*"
FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
@@ -83,12 +90,14 @@ FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.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"
FILES_libglapi-dev = "${libdir}/libglapi.*"
FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
+FILES_libgles3-mesa-dev = "${includedir}/GLES3"
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
deleted file mode 100644
index 4611f80..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require mesa-dri-glsl-native.inc
-
-LIC_FILES_CHKSUM = "file://../../docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-
-SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7"
-PV = "8.0.4+git${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
-S = "${WORKDIR}/git/src/glsl"
-
-inherit native
-
-# use default config for native build
-do_configure_prepend() {
- ln -sf ${S}/../../configs/default ${S}/../../configs/current
-}
-
-do_install() {
- install -d ${D}/${bindir}/glsl
- install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler
- install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
-}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index e9e4a88..69a433e 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -5,4 +5,4 @@ require mesa-dri.inc
# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
DEFAULT_PREFERENCE = "-2"
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index b907931..d558d0b 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -1,21 +1,14 @@
-DEPENDS += "mesa-dri-glsl-native"
+# Current pre-9.1 commit
+SRCREV = "1665af3066f3d58c42e9d5b13098f13615a7672c"
+PV = "9.1~git${SRCPV}"
-SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7"
-PV = "8.0.4+git${SRCPV}"
-
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
- file://0001-Compile-with-uclibc.patch \
file://0002-cross-compile.patch \
- file://0003-fix-for-x32.patch \
"
+
SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
S = "${WORKDIR}/git"
-
-do_configure_prepend() {
- # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
- sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
-}
diff --git a/meta/recipes-graphics/mesa/mesa-git/uclibc.patch b/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
deleted file mode 100644
index 0b031f9..0000000
--- a/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream-Status: Pending
-
-From 904bd5127bd88f45abf4a376676e0a487cfb018a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 13 Oct 2011 12:46:53 +0200
-Subject: [PATCH] configure: add check HAVE_NEWLOCALE to fix build with uclibc
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 3 +++
- src/glsl/strtod.c | 2 +-
- src/mesa/main/imports.c | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 49e81ad..468cfd7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -507,6 +507,9 @@ AC_SUBST([DLOPEN_LIBS])
- dnl See if posix_memalign is available
- AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
-
-+dnl See if newlocale is available
-+AC_CHECK_FUNCS_ONCE(newlocale)
-+
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
- [AS_HELP_STRING([--enable-selinux],
-diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
-index ff34591..88aa5ef 100644
---- a/src/glsl/strtod.c
-+++ b/src/glsl/strtod.c
-@@ -44,7 +44,7 @@
- double
- glsl_strtod(const char *s, char **end)
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
-index 345a1c5..493e0fb 100644
---- a/src/mesa/main/imports.c
-+++ b/src/mesa/main/imports.c
-@@ -767,7 +767,7 @@ float
- _mesa_strtof( const char *s, char **end )
- {
- #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
-- !defined(ANDROID)
-+ !defined(ANDROID) && defined (HAVE_NEWLOCALE)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
---
-1.7.7
-
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread