diff options
-rw-r--r-- | meta/packages/mesa/mesa-dri-glsl-native_7.8.2.bb | 24 | ||||
-rw-r--r-- | meta/packages/mesa/mesa-dri_7.8.2.bb | 13 |
2 files changed, 33 insertions, 4 deletions
diff --git a/meta/packages/mesa/mesa-dri-glsl-native_7.8.2.bb b/meta/packages/mesa/mesa-dri-glsl-native_7.8.2.bb new file mode 100644 index 000000000..f6121c19a --- /dev/null +++ b/meta/packages/mesa/mesa-dri-glsl-native_7.8.2.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "gl shader language specific build from mesa-dri" +HOMEPAGE = "http://mesa3d.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11" +LICENSE = "MIT" +PR = "r0" + +DEPENDS = "makedepend-native" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" + +S = "${WORKDIR}/Mesa-7.8.2/src/glsl/" + +inherit native + +# use default config for native build +do_configure_prepend() { + ln -s ${S}/../../configs/default ${S}/../../configs/current +} + +do_install() { + install -d ${D}/${bindir} + install -m 755 ${S}/apps/compile ${D}/${bindir}/glsl-compile +} diff --git a/meta/packages/mesa/mesa-dri_7.8.2.bb b/meta/packages/mesa/mesa-dri_7.8.2.bb index 6c8c824fa..ffd885f29 100644 --- a/meta/packages/mesa/mesa-dri_7.8.2.bb +++ b/meta/packages/mesa/mesa-dri_7.8.2.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1 PROTO_DEPS = "xf86driproto glproto dri2proto" LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" -PR = "r0" +PR = "r1" SRC_URI += "file://crossfix.patch" @@ -21,9 +21,14 @@ LEAD_SONAME = "libGL.so.1" EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" +# We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" +do_configure_prepend() { + sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile +} + do_install_append () { - install -d ${D}/usr/bin - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ + install -d ${D}/usr/bin + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ } python populate_packages_prepend() { |