diff --git a/sys-libs/mesa/mesa-17.0.0.recipe b/sys-libs/mesa/mesa-17.0.0.recipe new file mode 100644 index 000000000..bbc58623a --- /dev/null +++ b/sys-libs/mesa/mesa-17.0.0.recipe @@ -0,0 +1,137 @@ +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL \ +specification. The OpenGL specification documents a system for rendering \ +interactive 3D graphics. Mesa fills the role of the Haiku OpenGL kit \ +providing 3D rendering to Haiku applications." +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2017 Brian Paul" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/${portVersion}/mesa-${portVersion}.tar.xz" +CHECKSUM_SHA256="39db3d59700159add7f977307d12a7dfe016363e760ad82280ac4168ea668481" +PATCHES="mesa-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + mesa$secondaryArchSuffix = $portVersion + lib:libGL$secondaryArchSuffix + lib:libEGL$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + devel:libGL$secondaryArchSuffix = $portVersion + devel:libEGL$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + mesa$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + llvm${secondaryArchSuffix} + python_mako + cmd:bison + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:scons + cmd:sed + " + +BUILD() +{ + if [ -n "$secondaryArchSuffix" ]; then + export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" + fi + scons $jobArgs build=release + #scons $jobArgs build=debug +} + +INSTALL() +{ + mesaBuildDir=build/haiku-$effectiveTargetArchitecture + + mkdir -p $libDir + mkdir -p $developLibDir + + # libGL.so makes up the core of our OpenGL kit + cp $(find $mesaBuildDir -name 'libGL.so') $libDir + symlinkRelative -s $libDir/libGL.so $developLibDir + + # OpenGL ES + cp $(find $mesaBuildDir -name 'libEGL.so.1') $libDir + symlinkRelative -s $libDir/libEGL.so.1 $developLibDir/libEGL.so + + # Our rendering add-ons + mkdir -p $addOnsDir/opengl + cp $(find $mesaBuildDir -name 'libswpipe.so') \ + "$addOnsDir/opengl/Software Pipe" + + # Set some nice version info + appVersion=${portVersion//\./ } + setversion "$libDir/libGL.so" -app $appVersion -long "Haiku OpenGL kit" + setversion "$libDir/libEGL.so.1" -app $appVersion -long "Mesa EGL" + setversion "$addOnsDir/opengl/Software Pipe" -app $appVersion -long "Gallium LLVM software pipe renderer" + + # OpenGL Kit + mkdir -p $includeDir/os/opengl + cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ + cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ + cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ + + # Standard GL headers + mkdir -p $includeDir/GL + cp ./include/GL/gl.h $includeDir/GL/ + cp ./include/GL/gl_mangle.h $includeDir/GL/ + cp ./include/GL/glext.h $includeDir/GL/ + + # Create GL symlink in opengl kit + symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL + + # Standard EGL headers + mkdir -p $includeDir/EGL + cp ./include/EGL/* $includeDir/EGL + + # Create GL symlink in opengl kit + symlinkRelative -s $includeDir/EGL $includeDir/os/opengl/EGL + + # devel package + packageEntries devel \ + $developDir + + # swpipe renderer package + packageEntries swpipe \ + "$addOnsDir/opengl/Software Pipe" +} + + +# ===== Gallium OpenGL Add-ons =============================================== +# ----- swpipe package ------------------------------------------------------- + +SUMMARY_swpipe="The Mesa LLVM enhanced Gallium software pipe renderer" +DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM \ +enhanced software rendering. Software pipe rendering performs all \ +3D rendering on the systems CPU and doesn't require any specialized \ +hardware. The usage of LLVM over traditional rasterization gives this \ +renderer a boost in performance. + +Gallium software pipe rendering is in an extremely early state as of \ +this version of Mesa, and may not function as expected." + +PROVIDES_swpipe=" + mesa${secondaryArchSuffix}_swpipe = $portVersion + " +REQUIRED_swpipe=" + mesa$secondaryArchSuffix == $portVersion base + " diff --git a/sys-libs/mesa/patches/mesa-17.0.0.patchset b/sys-libs/mesa/patches/mesa-17.0.0.patchset new file mode 100644 index 000000000..61ff6cafa --- /dev/null +++ b/sys-libs/mesa/patches/mesa-17.0.0.patchset @@ -0,0 +1,48 @@ +From 60ca041bf3060a3c342f0b11498f9e0f615339ee Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 19 Nov 2016 10:30:12 +0000 +Subject: Haiku patch + + +diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h +index 7da7f53..236be36 100644 +--- a/src/gallium/auxiliary/util/u_debug.h ++++ b/src/gallium/auxiliary/util/u_debug.h +@@ -38,14 +38,13 @@ + #ifndef U_DEBUG_H_ + #define U_DEBUG_H_ + ++#include "os/os_misc.h" + + #if defined(PIPE_OS_HAIKU) + /* Haiku provides debug_printf in libroot with OS.h */ + #include + #endif + +-#include "os/os_misc.h" +- + #include "pipe/p_format.h" + #include "pipe/p_defines.h" + +diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c +index 89dd547..be73b29 100644 +--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c ++++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c +@@ -105,8 +105,12 @@ hgl_winsys_convert_cs(enum pipe_format format) + + static struct sw_displaytarget* + hgl_winsys_displaytarget_create(struct sw_winsys* winsys, +- unsigned textureUsage, enum pipe_format format, unsigned width, +- unsigned height, unsigned alignment, unsigned* stride) ++ unsigned tex_usage, ++ enum pipe_format format, ++ unsigned width, unsigned height, ++ unsigned alignment, ++ const void *front_private, ++ unsigned *stride) + { + struct haiku_displaytarget* haikuDisplayTarget + = CALLOC_STRUCT(haiku_displaytarget); +-- +2.2.2 +