diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.0.recipe index 27a7a03ef..493995545 100644 --- a/sys-libs/mesa/mesa-10.0.0.recipe +++ b/sys-libs/mesa/mesa-10.0.0.recipe @@ -20,12 +20,13 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 10.0 - lib:libGL$secondaryArchSuffix = $portVersion compat <= 3.3 + lib:libGL$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " # We're locked to LLVM 3.2 as 3.3 is broken at the moment on Haiku. @@ -33,7 +34,6 @@ BUILD_REQUIRES=" # As LLVM is only linked into the swpipe renderer (and not libGL) # changing LLVM versions shouldn't introduce any abi issues. BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion libxml2_python llvm == 3.2 cmd:bison diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index f3e4f08e7..ae5a26b99 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -21,16 +21,17 @@ SECONDARY_ARCHITECTURES="?x86_gcc2" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 7.9 - lib:libGL$secondaryArchSuffix = $portVersion compat <= 2.1 + lib:libGL$secondaryArchSuffix " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion libxml2_python cmd:bison cmd:find