diff options
Diffstat (limited to 'meta/packages/mesa/mesa-dri_git.bb')
-rw-r--r-- | meta/packages/mesa/mesa-dri_git.bb | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb index 65a4a03656..a316d580e4 100644 --- a/meta/packages/mesa/mesa-dri_git.bb +++ b/meta/packages/mesa/mesa-dri_git.bb @@ -1,12 +1,18 @@ include mesa-common.inc +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=mesa_7_5_branch \ + file://cross2.patch;patch=1 \ + file://matypes.h" +# file://mesa-DRI2Swapbuffer.patch;patch=1 " +S = "${WORKDIR}/git" + PROTO_DEPS = "xf86driproto glproto dri2proto" LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PV = "7.4+git${SRCPV}" -PR = "r4" +PV = "7.5+git${SRCPV}" +PR = "r14" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -14,21 +20,24 @@ DEFAULT_PREFERENCE = "-1" # Netbooks have DRI support so use mesa-dri by default DEFAULT_PREFERENCE_netbook = "1" -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=master" -S = "${WORKDIR}/git" - PACKAGES =+ "${PN}-xprogs" PACKAGES_DYNAMIC = "mesa-dri-driver-*" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" -EXTRA_OECONF += "--with-driver=dri --with-state-trackers=glx" +LEAD_SONAME = "libGL.so.1" + +EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" + +do_configure_prepend () { + cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86 + touch ${S}/src/mesa/x86/matypes.h +} do_install_append () { install -d ${D}/usr/bin install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ - rm ${D}/usr/lib/libEGL* || /bin/true } python populate_packages_prepend() { |