mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 20:20:06 +02:00
mesa: Add 24.1.4 recipe with latest fixes already upstream
This commit is contained in:
Alexander von Gluck
190
sys-libs/mesa/mesa-24.1.4.recipe
Normal file
190
sys-libs/mesa/mesa-24.1.4.recipe
Normal file
@@ -0,0 +1,190 @@
|
||||
SUMMARY="Multi-platform GL implementation"
|
||||
DESCRIPTION="Mesa is an open-source implementation of the OpenGL \
|
||||
specification, which documents a system for rendering interactive \
|
||||
3D graphics. Mesa fills the role of the Haiku OpenGL kit, \
|
||||
providing 3D rendering to Haiku applications."
|
||||
HOMEPAGE="https://www.mesa3d.org/"
|
||||
COPYRIGHT="1999-2023 Brian Paul"
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://mesa.freedesktop.org/archive/mesa-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="7cf7c6f665263ad0122889c1d4b076654c1eedea7a2f38c69c8c51579937ade1"
|
||||
PATCHES="mesa-$portVersion.patchset"
|
||||
|
||||
ADDITIONAL_FILES="50_mesa.json"
|
||||
|
||||
ARCHITECTURES="?all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
|
||||
libVersion=1.0.0
|
||||
libOSMesaVersion=8.0.0
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
libOSMesaVersionCompat="$libOSMesaVersion compat >= ${libOSMesaVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
mesa$secondaryArchSuffix = $portVersion
|
||||
lib:libOSMesa$secondaryArchSuffix = $libOSMesaVersionCompat
|
||||
lib:libglapi$secondaryArchSuffix = 0.0.0
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
lib:libLLVM_17$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
mesa${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libOSMesa$secondaryArchSuffix = $libOSMesaVersionCompat
|
||||
devel:libglapi$secondaryArchSuffix = 0.0.0
|
||||
"
|
||||
REQUIRES_devel="
|
||||
mesa$secondaryArchSuffix == $portVersion base
|
||||
devel:libGL$secondaryArchSuffix
|
||||
"
|
||||
|
||||
SUMMARY_eglvnd="The Mesa glvnd rendering drivers for Haiku"
|
||||
DESCRIPTION_eglvnd="This glvnd rendering driver package provides \
|
||||
software pipe rendering (with LLVM-bosted performance)."
|
||||
|
||||
PROVIDES_eglvnd="
|
||||
mesa${secondaryArchSuffix}_eglvnd = $portVersion
|
||||
"
|
||||
REQUIRES_eglvnd="
|
||||
mesa$secondaryArchSuffix == $portVersion base
|
||||
lib:libLLVM_17$secondaryArchSuffix
|
||||
"
|
||||
|
||||
SUMMARY_lavapipe="Vulkan software rasteriser driver"
|
||||
DESCRIPTION_lavapipe="Lavapipe is Mesa's software-based Vulkan 1.2 \
|
||||
implementation akin to LLVMpipe for OpenGL."
|
||||
|
||||
PROVIDES_lavapipe="
|
||||
mesa${secondaryArchSuffix}_lavapipe = $portVersion
|
||||
"
|
||||
REQUIRES_lavapipe="
|
||||
lib:libLLVM_17$secondaryArchSuffix
|
||||
"
|
||||
# We require libglvnd_devel for now for clairity since there is no
|
||||
# libglvnd.so and mesa 22.x provides our devel:libGL
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
libglvnd${secondaryArchSuffix}_devel
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:libLLVM_17$secondaryArchSuffix
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libvulkan$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
python3.10$secondaryArchSuffix
|
||||
mako_python310
|
||||
cmd:ninja
|
||||
cmd:bison
|
||||
cmd:find
|
||||
cmd:flex
|
||||
cmd:meson
|
||||
cmd:git
|
||||
cmd:llvm_config >= 17
|
||||
cmd:egrep
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:which
|
||||
"
|
||||
|
||||
defineDebugInfoPackage mesa$secondaryArchSuffix \
|
||||
"${addOnsDir/mesa$secondaryArchSuffix/mesa${secondaryArchSuffix}_eglvnd}/opengl/egl_vendor.d/libEGL_mesa.so.0" \
|
||||
"${addOnsDir/mesa$secondaryArchSuffix/mesa${secondaryArchSuffix}_lavapipe}/vulkan/icd.d/libvulkan_lvp.so" \
|
||||
"$libDir"/libOSMesa.so.$libOSMesaVersion \
|
||||
|
||||
BUILD()
|
||||
{
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture"
|
||||
fi
|
||||
|
||||
mkdir -p build
|
||||
|
||||
# In the future, all we need to do is enable other gallium
|
||||
# drivers so libEGL_mesa contains other drivers in addition
|
||||
# to llvm swpipe.
|
||||
meson build \
|
||||
-Dosmesa=true -Degl=enabled -Dglvnd=enabled \
|
||||
-Dgallium-drivers=swrast \
|
||||
-Dvulkan-drivers=swrast \
|
||||
-Dvulkan-icd-dir=$addOnsDir/vulkan/icd.d \
|
||||
--buildtype=debugoptimized \
|
||||
--prefix=$prefix \
|
||||
--libdir=$libDir \
|
||||
--includedir=$includeDir/os/opengl
|
||||
ninja -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
ninja -C build install
|
||||
|
||||
# Do a little cleanup
|
||||
rm -rf $prefix/share
|
||||
|
||||
# Mesa's EGL render driver
|
||||
mkdir -p $addOnsDir/opengl/egl_vendor.d
|
||||
mv $libDir/libEGL_mesa.so* "$addOnsDir/opengl/egl_vendor.d/"
|
||||
|
||||
# Vulkan lavapipe driver
|
||||
mv $libDir/libvulkan_lvp.so \
|
||||
"$addOnsDir/vulkan/icd.d"
|
||||
|
||||
# remove stock glvnd json
|
||||
rm -rf $dataDir/glvnd
|
||||
# remove dri stuff
|
||||
rm -rf $dataDir/drirc.d
|
||||
|
||||
rm -rf $libDir/haiku
|
||||
|
||||
# Configure Mesa EGL Vendor Renderer
|
||||
cp "$portDir/additional-files/50_mesa.json" "$addOnsDir/opengl/egl_vendor.d/"
|
||||
# Configure vulkan lavapipe render (Fix path)
|
||||
sed -i "s/\/packages\/mesa-.*\/.self\/lib\/libvulkan_lvp.so/.\/libvulkan_lvp.so/" $addOnsDir/vulkan/icd.d/lvp_icd.x86_64.json
|
||||
|
||||
# Set some nice version info
|
||||
appVersion=${portVersion//\./ }
|
||||
setversion "$addOnsDir/opengl/egl_vendor.d/libEGL_mesa.so.0.0.0" -app $appVersion -long \
|
||||
"Mesa EGL rendering drivers"
|
||||
setversion "$addOnsDir/vulkan/icd.d/libvulkan_lvp.so" -app $appVersion -long \
|
||||
"Vulkan software rasteriser driver"
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libOSMesa
|
||||
fixPkgconfig
|
||||
|
||||
sed -i 's/develop\/headers$/develop\/headers\/os\/opengl/' $installDestDir$developLibDir/pkgconfig/osmesa.pc
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
|
||||
# swpipe renderer package
|
||||
packageEntries eglvnd \
|
||||
"$addOnsDir/opengl/egl_vendor.d/libEGL_mesa.so.0.0.0" \
|
||||
"$addOnsDir/opengl/egl_vendor.d/libEGL_mesa.so.0" \
|
||||
"$addOnsDir/opengl/egl_vendor.d/libEGL_mesa.so" \
|
||||
"$addOnsDir/opengl/egl_vendor.d/50_mesa.json"
|
||||
|
||||
# lavapipe renderer package
|
||||
packageEntries lavapipe \
|
||||
"$addOnsDir/vulkan/icd.d/libvulkan_lvp.so" \
|
||||
"$addOnsDir/vulkan/icd.d/lvp_icd.x86_64.json"
|
||||
|
||||
# Remove empty directories from mesa package
|
||||
rmdir "$addOnsDir/vulkan/icd.d"
|
||||
rmdir "$addOnsDir/vulkan"
|
||||
rmdir "$addOnsDir/opengl/egl_vendor.d"
|
||||
rmdir "$addOnsDir/opengl"
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
84
sys-libs/mesa/patches/mesa-24.1.4.patchset
Normal file
84
sys-libs/mesa/patches/mesa-24.1.4.patchset
Normal file
@@ -0,0 +1,84 @@
|
||||
From 828c3cf002ba4901ef65cd0665149d14c30df1d8 Mon Sep 17 00:00:00 2001
|
||||
From: X512 <danger_mail@list.ru>
|
||||
Date: Fri, 26 Jul 2024 04:45:27 +0900
|
||||
Subject: [PATCH 175/200] egl/haiku: fix synchronization problems, add missing
|
||||
header
|
||||
|
||||
`st_context_invalidate_state` call is required when changing buffer attachments.
|
||||
|
||||
Including header with BBitmap class definition is required to properly
|
||||
call C++ destructor.
|
||||
|
||||
Cc: mesa-stable
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30372>
|
||||
---
|
||||
src/egl/drivers/haiku/egl_haiku.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
index 62d2fb5c3cd..6ca5241c815 100644
|
||||
--- a/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
@@ -49,6 +49,8 @@
|
||||
#include "hgl/hgl_sw_winsys.h"
|
||||
#include "hgl_context.h"
|
||||
|
||||
+#include <Bitmap.h>
|
||||
+
|
||||
extern "C" {
|
||||
#include "target-helpers/inline_sw_helper.h"
|
||||
}
|
||||
@@ -239,6 +241,8 @@ haiku_swap_buffers(_EGLDisplay *disp, _EGLSurface *surf)
|
||||
|
||||
update_size(buffer);
|
||||
|
||||
+ st_context_invalidate_state(st, ST_INVALIDATE_FB_STATE);
|
||||
+
|
||||
return EGL_TRUE;
|
||||
}
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
From 2e70757dc0b5adb854c2911081e670d753d6a524 Mon Sep 17 00:00:00 2001
|
||||
From: X512 <danger_mail@list.ru>
|
||||
Date: Thu, 25 Jul 2024 22:26:25 +0900
|
||||
Subject: [PATCH 066/200] egl/haiku: fix double free of BBitmap
|
||||
|
||||
Cc: mesa-stable
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30364>
|
||||
---
|
||||
src/egl/drivers/haiku/egl_haiku.cpp | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
index 15417767406..62d2fb5c3cd 100644
|
||||
--- a/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
@@ -115,6 +115,9 @@ haiku_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+ // Unset and delete previously set bitmap if any.
|
||||
+ delete ((BitmapHook *)native_window)->SetBitmap(NULL);
|
||||
+
|
||||
return &wgl_surf->base;
|
||||
}
|
||||
|
||||
@@ -168,6 +171,13 @@ haiku_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf)
|
||||
struct haiku_egl_surface *hgl_surf = haiku_egl_surface(surf);
|
||||
struct pipe_screen *screen = hgl_dpy->disp->fscreen->screen;
|
||||
screen->fence_reference(screen, &hgl_surf->throttle_fence, NULL);
|
||||
+
|
||||
+ // Unset bitmap to release ownership. Bitmap will be deleted later
|
||||
+ // when destroying framebuffer.
|
||||
+ BitmapHook *bitmapHook = (BitmapHook*)hgl_surf->fb->winsysContext;
|
||||
+ if (bitmapHook != NULL)
|
||||
+ bitmapHook->SetBitmap(NULL);
|
||||
+
|
||||
hgl_destroy_st_framebuffer(hgl_surf->fb);
|
||||
free(surf);
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
|
||||
Reference in New Issue
Block a user