diff --git a/recipes/libs/gstreamer/redox.patch b/recipes/libs/gstreamer/redox.patch index 4dc880968..b5a440c39 100644 --- a/recipes/libs/gstreamer/redox.patch +++ b/recipes/libs/gstreamer/redox.patch @@ -1,6 +1,6 @@ -diff -ruw gstreamer-1.24.12/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c source/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c ---- gstreamer-1.24.12/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c 2025-01-29 13:12:29.000000000 -0700 -+++ source/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c 2026-02-10 19:13:12.530288659 -0700 +diff -ruwN source/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c source-new/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c +--- source/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c 2025-01-29 20:12:29.000000000 +0000 ++++ source-new/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnection.c 2026-09-13 01:22:57.407426034 +0000 @@ -49,6 +49,10 @@ #include #endif @@ -12,9 +12,9 @@ diff -ruw gstreamer-1.24.12/subprojects/gst-plugins-bad/ext/dtls/gstdtlsconnecti GST_DEBUG_CATEGORY_STATIC (gst_dtls_connection_debug); #define GST_CAT_DEFAULT gst_dtls_connection_debug -diff -ruw gstreamer-1.24.12/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build source/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build ---- gstreamer-1.24.12/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build 2025-01-29 13:12:29.000000000 -0700 -+++ source/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build 2026-02-10 19:09:53.259120404 -0700 +diff -ruwN source/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build source-new/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build +--- source/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build 2025-01-29 20:12:29.000000000 +0000 ++++ source-new/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build 2026-09-13 01:22:57.408426091 +0000 @@ -136,10 +136,10 @@ install: false) endif @@ -31,4 +31,16 @@ diff -ruw gstreamer-1.24.12/subprojects/gst-plugins-base/gst-libs/gst/tag/meson. +# install : false) gst_tag_dir = meson.current_source_dir() -Only in source/subprojects/gst-plugins-base/gst-libs/gst/tag: meson.build.orig +diff -ruwN source/subprojects/gstreamer/gst/gstregistry.c source-new/subprojects/gstreamer/gst/gstregistry.c +--- source/subprojects/gstreamer/gst/gstregistry.c 2025-01-29 20:12:29.000000000 +0000 ++++ source-new/subprojects/gstreamer/gst/gstregistry.c 2026-09-29 02:59:06.518249721 +0000 +@@ -174,7 +174,8 @@ + static GstRegistry *_gst_registry_default = NULL; + + /* defaults */ +-#define DEFAULT_FORK TRUE ++/* redox: forking result in hang */ ++#define DEFAULT_FORK FALSE + + /* control the behaviour of registry rebuild */ + static gboolean _gst_enable_registry_fork = DEFAULT_FORK; diff --git a/recipes/wip/web/webkitgtk3/recipe.toml b/recipes/wip/web/webkitgtk3/recipe.toml index 15fea1470..b676f890c 100644 --- a/recipes/wip/web/webkitgtk3/recipe.toml +++ b/recipes/wip/web/webkitgtk3/recipe.toml @@ -41,10 +41,6 @@ COOKBOOK_CMAKE_FLAGS+=( -DENABLE_BUBBLEWRAP_SANDBOX=OFF -DENABLE_INTROSPECTION=OFF -DENABLE_JOURNALD_LOG=OFF -# jit issues - -DENABLE_JIT=OFF - -DENABLE_DFG_JIT=OFF - -DENABLE_FTL_JIT=OFF # hardware/library issues -DENABLE_SPEECH_SYNTHESIS=OFF -DENABLE_SPELLCHECK=OFF # libenchant @@ -61,8 +57,9 @@ cookbook_cmake patchelf --replace-needed "${COOKBOOK_SYSROOT}/usr/lib/libsqlite3.so" "libsqlite3.so" "${COOKBOOK_STAGE}/usr/lib/libwebkit2gtk-4.1.so" patchelf --replace-needed "${COOKBOOK_SYSROOT}/usr/lib/libsqlite3.so" "libsqlite3.so" "${COOKBOOK_STAGE}/usr/libexec/webkit2gtk-4.1/MiniBrowser" -mkdir -p "${COOKBOOK_STAGE}/usr/bin" +mkdir -p "${COOKBOOK_STAGE}/usr/bin" "${COOKBOOK_STAGE}/usr/share/applications" ln -sr "${COOKBOOK_STAGE}/usr/libexec/webkit2gtk-4.1/MiniBrowser" "${COOKBOOK_STAGE}/usr/bin/MiniBrowser" +cp "${COOKBOOK_RECIPE}/webkit.desktop" "${COOKBOOK_STAGE}/usr/share/applications/webkit.desktop" """ [package] diff --git a/recipes/wip/web/webkitgtk3/redox.patch b/recipes/wip/web/webkitgtk3/redox.patch index 3ed8e997c..8589384ee 100644 --- a/recipes/wip/web/webkitgtk3/redox.patch +++ b/recipes/wip/web/webkitgtk3/redox.patch @@ -670,3 +670,17 @@ diff -ruwN source/Source/WTF/wtf/posix/ThreadingPOSIX.cpp source-new/Source/WTF/ Locker locker { m_mutex }; int policy; +diff -ruwN source/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp source-new/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp +--- source/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp 2025-03-07 11:11:01.594008200 +0000 ++++ source-new/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp 2026-09-27 19:45:00.480807469 +0000 +@@ -82,7 +82,9 @@ + static OptionSet mode; + static std::once_flag onceFlag; + std::call_once(onceFlag, [] { +- const char* disableDMABuf = getenv("WEBKIT_DISABLE_DMABUF_RENDERER"); ++ // redox: the mesa implementation for dma-buf renderer is incomplete ++ // https://blogs.igalia.com/carlosgc/2023/04/03/webkitgtk-accelerated-compositing-rendering/ ++ const char* disableDMABuf = "1";// getenv("WEBKIT_DISABLE_DMABUF_RENDERER"); + if (disableDMABuf && strcmp(disableDMABuf, "0")) + return; + diff --git a/recipes/wip/web/webkitgtk3/webkit.desktop b/recipes/wip/web/webkitgtk3/webkit.desktop new file mode 100644 index 000000000..b3c4fd074 --- /dev/null +++ b/recipes/wip/web/webkitgtk3/webkit.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=WebKit +Comment=WebKit GTK Browser +Exec=MiniBrowser +Icon=/usr/share/ui/icons/apps/internet-web-browser.png +Terminal=false +Type=Application +StartupNotify=true +Categories=Network +NoDisplay=true