mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
mesa: merge mesa-common.inc to mesa.inc
(From OE-Core rev: 72afb46920202588948e256738ee80d585519974) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
committed by
Richard Purdie
Richard Purdie
parent
eba5d155f2
commit
6efefdf21c
@@ -1,106 +0,0 @@
|
|||||||
SUMMARY = "A free implementation of the OpenGL API"
|
|
||||||
DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
|
|
||||||
a system for rendering interactive 3D graphics. \
|
|
||||||
A variety of device drivers allows Mesa to be used in many different environments \
|
|
||||||
ranging from software emulation to complete hardware acceleration for modern GPUs. \
|
|
||||||
Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
|
|
||||||
environment."
|
|
||||||
|
|
||||||
HOMEPAGE = "http://mesa3d.org"
|
|
||||||
BUGTRACKER = "https://bugs.freedesktop.org"
|
|
||||||
SECTION = "x11"
|
|
||||||
LICENSE = "MIT"
|
|
||||||
|
|
||||||
INC_PR = "r9"
|
|
||||||
PE = "2"
|
|
||||||
|
|
||||||
DEPENDS = "expat makedepend-native flex-native bison-native"
|
|
||||||
|
|
||||||
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
|
|
||||||
|
|
||||||
inherit autotools pkgconfig pythonnative
|
|
||||||
|
|
||||||
EXTRA_OECONF = "--enable-shared-glapi"
|
|
||||||
|
|
||||||
PACKAGECONFIG ??= "egl gles \
|
|
||||||
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
|
|
||||||
${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
|
|
||||||
"
|
|
||||||
|
|
||||||
X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
|
|
||||||
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
|
|
||||||
PACKAGECONFIG[wayland] = ",,wayland"
|
|
||||||
|
|
||||||
|
|
||||||
# Multiple virtual/gl providers being built breaks staging
|
|
||||||
EXCLUDE_FROM_WORLD = "1"
|
|
||||||
|
|
||||||
# Remove the mesa dependency on mesa-dev, as mesa is empty
|
|
||||||
RDEPENDS_${PN}-dev = ""
|
|
||||||
|
|
||||||
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 \
|
|
||||||
libwayland-egl libwayland-egl-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
|
|
||||||
# they don't get Debian-renamed (which would remove the -mesa suffix), and
|
|
||||||
# RPROVIDEs/RCONFLICTs on the generic libgl name.
|
|
||||||
python __anonymous() {
|
|
||||||
for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
|
|
||||||
("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
|
|
||||||
("libgles3",)):
|
|
||||||
fullp = p[0] + "-mesa"
|
|
||||||
pkgs = " ".join(p)
|
|
||||||
d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
|
|
||||||
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[0] + "-dev"
|
|
||||||
d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
|
|
||||||
d.appendVar("RREPLACES_" + fullp, pkgs)
|
|
||||||
d.appendVar("RPROVIDES_" + fullp, pkgs)
|
|
||||||
d.appendVar("RCONFLICTS_" + fullp, pkgs)
|
|
||||||
}
|
|
||||||
|
|
||||||
FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
|
|
||||||
FILES_libegl-mesa = "${libdir}/libEGL.so.*"
|
|
||||||
FILES_libgbm = "${libdir}/libgbm.so.*"
|
|
||||||
FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
|
|
||||||
FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
|
|
||||||
FILES_libgl-mesa = "${libdir}/libGL.so.*"
|
|
||||||
FILES_libglapi = "${libdir}/libglapi.so.*"
|
|
||||||
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
|
|
||||||
FILES_libwayland-egl = "${libdir}/libwayland-egl.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 ${libdir}/pkgconfig/osmesa.pc"
|
|
||||||
FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
|
|
||||||
|
|
||||||
FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
|
|
||||||
@@ -1,5 +1,35 @@
|
|||||||
DEPENDS += "libdrm expat udev"
|
SUMMARY = "A free implementation of the OpenGL API"
|
||||||
X11_DEPS += "dri2proto"
|
DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
|
||||||
|
a system for rendering interactive 3D graphics. \
|
||||||
|
A variety of device drivers allows Mesa to be used in many different environments \
|
||||||
|
ranging from software emulation to complete hardware acceleration for modern GPUs. \
|
||||||
|
Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
|
||||||
|
environment."
|
||||||
|
|
||||||
|
HOMEPAGE = "http://mesa3d.org"
|
||||||
|
BUGTRACKER = "https://bugs.freedesktop.org"
|
||||||
|
SECTION = "x11"
|
||||||
|
LICENSE = "MIT"
|
||||||
|
|
||||||
|
INC_PR = "r9"
|
||||||
|
PE = "2"
|
||||||
|
|
||||||
|
DEPENDS = "expat makedepend-native flex-native bison-native libdrm expat udev"
|
||||||
|
|
||||||
|
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig pythonnative
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--enable-shared-glapi"
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= "egl gles \
|
||||||
|
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
|
||||||
|
${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
|
||||||
|
"
|
||||||
|
|
||||||
|
X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes dri2proto"
|
||||||
|
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
|
||||||
|
PACKAGECONFIG[wayland] = ",,wayland"
|
||||||
|
|
||||||
DRIDRIVERS = "swrast"
|
DRIDRIVERS = "swrast"
|
||||||
DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
|
DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
|
||||||
@@ -16,9 +46,58 @@ EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
|
|||||||
EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'wayland', ',wayland', '', d)}"
|
EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'wayland', ',wayland', '', d)}"
|
||||||
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
|
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
|
||||||
|
|
||||||
|
# Multiple virtual/gl providers being built breaks staging
|
||||||
|
EXCLUDE_FROM_WORLD = "1"
|
||||||
|
|
||||||
|
# Remove the mesa dependency on mesa-dev, as mesa is empty
|
||||||
|
RDEPENDS_${PN}-dev = ""
|
||||||
|
|
||||||
|
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 \
|
||||||
|
libwayland-egl libwayland-egl-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
|
||||||
|
# they don't get Debian-renamed (which would remove the -mesa suffix), and
|
||||||
|
# RPROVIDEs/RCONFLICTs on the generic libgl name.
|
||||||
|
python __anonymous() {
|
||||||
|
for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
|
||||||
|
("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
|
||||||
|
("libgles3",)):
|
||||||
|
fullp = p[0] + "-mesa"
|
||||||
|
pkgs = " ".join(p)
|
||||||
|
d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
|
||||||
|
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[0] + "-dev"
|
||||||
|
d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
|
||||||
|
d.appendVar("RREPLACES_" + fullp, pkgs)
|
||||||
|
d.appendVar("RPROVIDES_" + fullp, pkgs)
|
||||||
|
d.appendVar("RCONFLICTS_" + fullp, pkgs)
|
||||||
|
}
|
||||||
|
|
||||||
python populate_packages_prepend() {
|
python populate_packages_prepend() {
|
||||||
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
|
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
|
||||||
|
|
||||||
pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
|
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='')
|
pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
|
||||||
for pkg in pkgs:
|
for pkg in pkgs:
|
||||||
@@ -31,3 +110,26 @@ PACKAGES_DYNAMIC += "^mesa-driver-.*"
|
|||||||
|
|
||||||
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
|
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
|
||||||
|
|
||||||
|
FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
|
||||||
|
FILES_libegl-mesa = "${libdir}/libEGL.so.*"
|
||||||
|
FILES_libgbm = "${libdir}/libgbm.so.*"
|
||||||
|
FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
|
||||||
|
FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
|
||||||
|
FILES_libgl-mesa = "${libdir}/libGL.so.*"
|
||||||
|
FILES_libglapi = "${libdir}/libglapi.so.*"
|
||||||
|
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
|
||||||
|
FILES_libwayland-egl = "${libdir}/libwayland-egl.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 ${libdir}/pkgconfig/osmesa.pc"
|
||||||
|
FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
|
||||||
|
|
||||||
|
FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
|
||||||
|
|||||||
@@ -10,5 +10,4 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555
|
|||||||
|
|
||||||
S = "${WORKDIR}/Mesa-${PV}"
|
S = "${WORKDIR}/Mesa-${PV}"
|
||||||
|
|
||||||
require mesa-common.inc
|
|
||||||
require mesa.inc
|
require mesa.inc
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
require mesa-common.inc
|
|
||||||
require mesa-git.inc
|
require mesa-git.inc
|
||||||
require mesa.inc
|
require mesa.inc
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user