From 66d92cb3eea6e1e57df408a19f9034eba5bec5fd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 6 Dec 2012 12:23:33 +0000 Subject: mesa-dri: upgrade -git version to current master 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. (From OE-Core rev: 8060a24c679ba17aea48bdeb4b8cfd460885f65f) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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 (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index e661eee72b..c11d402dce 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 4611f8032b..0000000000 --- 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 e9e4a88a7f..69a433e7c3 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 b907931b7b..d558d0b3b6 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 0b031f9c35..0000000000 --- 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 -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf