diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 58e9ce47f..8b28b36c6 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -36,16 +36,12 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - libxml2_python cmd:bison cmd:cmp - cmd:find cmd:flex cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix -# cmd:python cmd:make - cmd:sed " BUILD() @@ -53,7 +49,9 @@ BUILD() if [ -n "$secondaryArchSuffix" ]; then export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" fi - #make DEBUG=1 haiku $jobArgs + + # This avoids the need for python2.7 + lxml2_python, at the cost of breaking GLES + touch src/mesa/main/api_exec_es{1,2}.c make haiku $jobArgs } diff --git a/sys-libs/mesa/patches/mesa-7.9.2.patchset b/sys-libs/mesa/patches/mesa-7.9.2.patchset index 02fb74652..b3d305c4a 100644 --- a/sys-libs/mesa/patches/mesa-7.9.2.patchset +++ b/sys-libs/mesa/patches/mesa-7.9.2.patchset @@ -1,4 +1,4 @@ -From 5c48eaf605605a1282782d3d6723097c4f920a51 Mon Sep 17 00:00:00 2001 +From b3cfd34c382a4350625597bd5b75a1a18a05c382 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 7 Nov 2014 09:42:21 +0100 Subject: libGL: link against libbe @@ -20,10 +20,10 @@ index 9d7d301..8195813 100644 $(GL_LIB_DEPS) $(GLAPI_LIB) $(OBJECTS) $(GLU_LIB) -- -2.7.0 +2.52.0 -From dd18a215caad3ed86c7740c470bf1817f3d3590a Mon Sep 17 00:00:00 2001 +From 856529a763dee7678467b83083da6a73eabf344b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 31 Jan 2017 22:42:25 +0100 Subject: Make compatible with bison 3.x. @@ -5851,5 +5851,5 @@ index 041a49f..6a1ef0f 100644 %union { -- -2.7.0 +2.52.0