mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
mesa: drop, there should be mesa-7.11 in oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
mesa-common.inc
|
||||
* Settings shared by ALL recipes
|
||||
|
||||
mesa-${PV}.inc
|
||||
* Settings for particular version, mostly checksums and additional patches
|
||||
* Patches are stored mesa-${PV} dir and -dri and xlib has adjusted FILESPATHPKG
|
||||
|
||||
mesa-dri.inc
|
||||
* Setting shared by ALL dri recipes - defines what is mesa-dri
|
||||
|
||||
mesa-xlib.inc
|
||||
* Setting shared by ALL xlib recipes - defines what is mesa-xlib
|
||||
@@ -1,19 +0,0 @@
|
||||
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
|
||||
file://glamo.patch \
|
||||
file://uclibc.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "talloc"
|
||||
|
||||
SRC_URI[archive.md5sum] = "f5de82852f1243f42cc004039e10b771"
|
||||
SRC_URI[archive.sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
|
||||
|
||||
EXTRA_OECONF += " --disable-gallium"
|
||||
|
||||
#needs more testing and updated glamo.patch before making default
|
||||
DEFAULT_PREFERENCE = "-2"
|
||||
|
||||
do_configure_prepend() {
|
||||
#check for python not python2, because python-native does not stage python2 binary/link
|
||||
sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,26 +0,0 @@
|
||||
Index: Mesa-7.9.1/src/mesa/main/imports.c
|
||||
===================================================================
|
||||
--- Mesa-7.9.1.orig/src/mesa/main/imports.c 2010-12-15 13:50:00.000000000 -0800
|
||||
+++ Mesa-7.9.1/src/mesa/main/imports.c 2011-01-10 12:23:48.848656001 -0800
|
||||
@@ -757,7 +757,7 @@
|
||||
float
|
||||
_mesa_strtof( const char *s, char **end )
|
||||
{
|
||||
-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
|
||||
+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__)
|
||||
static locale_t loc = NULL;
|
||||
if (!loc) {
|
||||
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
|
||||
Index: Mesa-7.9.1/src/glsl/strtod.c
|
||||
===================================================================
|
||||
--- Mesa-7.9.1.orig/src/glsl/strtod.c 2011-01-10 20:08:01.568656001 -0800
|
||||
+++ Mesa-7.9.1/src/glsl/strtod.c 2011-01-10 20:08:39.898656001 -0800
|
||||
@@ -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(__UCLIBC__)
|
||||
static locale_t loc = NULL;
|
||||
if (!loc) {
|
||||
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
|
||||
@@ -1,49 +0,0 @@
|
||||
SECTION = "x11"
|
||||
|
||||
DESCRIPTION = "An open source implementation of the OpenGL spec"
|
||||
HOMEPAGE = "http://mesa3d.org"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
|
||||
|
||||
INC_PR = "r12"
|
||||
PE = "2"
|
||||
|
||||
PROTO_DEPS = "xf86driproto glproto"
|
||||
LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
|
||||
|
||||
DEPENDS = "makedepend-native ${PROTO_DEPS} ${LIB_DEPS}"
|
||||
|
||||
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
|
||||
"
|
||||
S = "${WORKDIR}/Mesa-${PV}"
|
||||
|
||||
PROVIDES = "virtual/libgl"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--enable-glu \
|
||||
--disable-glw \
|
||||
--disable-glut \
|
||||
"
|
||||
|
||||
include recipes-graphics/mesa/glx-use-tls.inc
|
||||
|
||||
PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
|
||||
FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
|
||||
FILES_libgl = "${libdir}/libGL.so.*"
|
||||
FILES_libglu = "${libdir}/libGLU.so.*"
|
||||
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
|
||||
|
||||
FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
|
||||
FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
|
||||
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
|
||||
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
|
||||
|
||||
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
|
||||
FILES_libegl-dbg += "${libdir}/egl/.debug/*"
|
||||
|
||||
NATIVE_INSTALL_WORKS = "1"
|
||||
do_install_append () {
|
||||
install -d ${D}/${includedir}/GL
|
||||
cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
DEPENDS += "dri2proto expat libdrm"
|
||||
|
||||
#not supported in oe-core base.bbclass
|
||||
#FILESPATHPKG =. "mesa-${PV}:mesa:"
|
||||
FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:"
|
||||
|
||||
# most of our targets do not have DRI so will use mesa-xlib
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
MACHINE_DRI_MODULES ?= ""
|
||||
#PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${BASE_PACKAGE_ARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium -with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
|
||||
|
||||
python populate_packages_prepend() {
|
||||
import os.path
|
||||
|
||||
dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
|
||||
|
||||
do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "mesa-dri-driver-*"
|
||||
|
||||
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
require mesa-common.inc
|
||||
require mesa-${PV}.inc
|
||||
require mesa-dri.inc
|
||||
PR = "${INC_PR}.1"
|
||||
@@ -1,5 +0,0 @@
|
||||
#not supported in oe-core base.bbclass
|
||||
#FILESPATHPKG =. "mesa-${PV}:mesa:"
|
||||
FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:"
|
||||
|
||||
EXTRA_OECONF += " --with-driver=xlib"
|
||||
@@ -1,4 +0,0 @@
|
||||
require mesa-common.inc
|
||||
require mesa-${PV}.inc
|
||||
require mesa-xlib.inc
|
||||
PR = "${INC_PR}.0"
|
||||
@@ -1,6 +0,0 @@
|
||||
# This is a dummy package so OE can use the poky mesa files
|
||||
require mesa-dri_${PV}.bb
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
EXTRA_OECONF += "--disable-egl"
|
||||
Reference in New Issue
Block a user