webkit-gtk-2.46: fix build, but not works

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: webkit-gtk-2.46: fix build, but not works
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 16 Mar 2025 17:33:19 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sun Mar 16 18:32:22 2025 +0100
Changeset:	24d9aebf4bd02bf7f8b18c402a330e8477f7f73d

Modified Files:
	webkit-gtk-2.46/Makefile
	webkit-gtk-2.46/PLIST
	webkit-gtk-2.46/TODO
	webkit-gtk-2.46/distinfo
Added Files:
	webkit-gtk-2.46/patches/patch-Source_WebCore_platform_MediaSample.h

Log Message:
webkit-gtk-2.46: fix build, but not works

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=24d9aebf4bd02bf7f8b18c402a330e8477f7f73d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk-2.46/Makefile                           | 17 ++++++++--
 webkit-gtk-2.46/PLIST                              |  4 +--
 webkit-gtk-2.46/TODO                               | 38 +++-------------------
 webkit-gtk-2.46/distinfo                           |  1 +
 .../patch-Source_WebCore_platform_MediaSample.h    | 15 +++++++++
 5 files changed, 37 insertions(+), 38 deletions(-)

diffs:
diff --git a/webkit-gtk-2.46/Makefile b/webkit-gtk-2.46/Makefile
index c9370e8b7e..84f386eff3 100644
--- a/webkit-gtk-2.46/Makefile
+++ b/webkit-gtk-2.46/Makefile
@@ -24,12 +24,21 @@ USE_CXX_FEATURES+=	c++17
 USE_TOOLS+=		automake bash bison flex gdbus-codegen gmake perl pkg-config msgfmt
 
 # this doesn't seem to be using the pkg-config file, which would add this
-CXXFLAGS+=	-I${PREFIX}/lib/gstreamer-1.0/include
+CXXFLAGS+=	-I${PREFIX}/include/gstreamer-1.0
+
+# Avoid million warnings
+CFLAGS+=		-Wno-unused-parameter -Wno-undef
+CXXFLAGS+=		-Wno-unused-parameter -Wno-undef
+
+# From Arch Linux:
+# JITted code crashes when CET is used
+#CFLAGS+=		-fcf-protection=none
+#CXXFLAGS+=		-fcf-protection=none
 
 # Enabling -gdwarf-2 hits GNU ar limits on file size.
 CTF_SUPPORTED=	no
 
-GCC_REQD+=		8
+GCC_REQD+=		11
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,7 +54,7 @@ CMAKE_CONFIGURE_ARGS+=		-DENABLE_JOURNALD_LOG=OFF
 #CMAKE_CONFIGURE_ARGS+=		-DENABLE_DOCUMENTATION=OFF
 CMAKE_CONFIGURE_ARGS+=		-DUSE_SYSTEM_SYSPROF_CAPTURE=NO
 CMAKE_CONFIGURE_ARGS+=		-DUSE_SYSPROF_CAPTURE=OFF
-CMAKE_CONFIGURE_ARGS+=		-DUSE_GSTREAMER_GL=OFF
+CMAKE_CONFIGURE_ARGS+=		-DUSE_GSTREAMER_GL=ON
 CMAKE_CONFIGURE_ARGS+=		-DUSE_GSTREAMER_TRANSCODER=OFF
 #CMAKE_CONFIGURE_ARGS+=		-DUSE_LIBHYPHEN=OFF
 #CMAKE_CONFIGURE_ARGS+=		-DUSE_OPENJPEG=OFF
@@ -163,6 +172,8 @@ CHECK_PORTABILITY_SKIP+=	Tools/TestWebKitAPI/Scripts/generate-unified-sources.sh
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/libjxl/buildlink3.mk"
+# SkJpegCodec.cpp:210:58: error: 'JCS_RGB565' was not declared in this scope; did you mean 'JCS_RGB'?
+JPEG_ACCEPTED=		libjpeg-turbo
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/webkit-gtk-2.46/PLIST b/webkit-gtk-2.46/PLIST
index 7795ec5671..38c5e65204 100644
--- a/webkit-gtk-2.46/PLIST
+++ b/webkit-gtk-2.46/PLIST
@@ -223,10 +223,10 @@ lib/girepository-1.0/WebKit2-4.1.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.1.typelib
 lib/libjavascriptcoregtk-4.1.so
 lib/libjavascriptcoregtk-4.1.so.0
-lib/libjavascriptcoregtk-4.1.so.0.6.14
+lib/libjavascriptcoregtk-4.1.so.0.6.15
 lib/libwebkit2gtk-4.1.so
 lib/libwebkit2gtk-4.1.so.0
-lib/libwebkit2gtk-4.1.so.0.16.7
+lib/libwebkit2gtk-4.1.so.0.16.8
 lib/pkgconfig/javascriptcoregtk-4.1.pc
 lib/pkgconfig/webkit2gtk-4.1.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.1.pc
diff --git a/webkit-gtk-2.46/TODO b/webkit-gtk-2.46/TODO
index 3c503c261d..6e53452973 100644
--- a/webkit-gtk-2.46/TODO
+++ b/webkit-gtk-2.46/TODO
@@ -1,33 +1,5 @@
-In file included from /scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/cmake-pkgsrc-build/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-52.cpp:1:
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp: In function 'std::optional<WTF::GRefPtr<_GstContext> > WebCore::requestGLContext(const char*)':
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1835:40: error: 'class WebCore::PlatformDisplay' has no member named 'gstGLDisplay'; did you mean 'eglDisplay'?
- 1835 |     auto* gstGLDisplay = sharedDisplay.gstGLDisplay();
-      |                                        ^~~~~~~~~~~~
-      |                                        eglDisplay
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1836:40: error: 'class WebCore::PlatformDisplay' has no member named 'gstGLContext'; did you mean 'skiaGLContext'?
- 1836 |     auto* gstGLContext = sharedDisplay.gstGLContext();
-      |                                        ^~~~~~~~~~~~
-      |                                        skiaGLContext
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1841:33: error: 'GST_GL_DISPLAY_CONTEXT_TYPE' was not declared in this scope
- 1841 |     if (!g_strcmp0(contextType, GST_GL_DISPLAY_CONTEXT_TYPE)) {
-      |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1841:33: note: the macro 'GST_GL_DISPLAY_CONTEXT_TYPE' had not yet been defined
-In file included from /usr/pkg/include/gstreamer-1.0/gst/gl/gl.h:31,
-                 from /scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerVideoFrameConverter.cpp:28,
-                 from /scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/cmake-pkgsrc-build/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-52.cpp:4:
-/usr/pkg/include/gstreamer-1.0/gst/gl/gstgldisplay.h:169: note: it was later defined here
-  169 | #define GST_GL_DISPLAY_CONTEXT_TYPE "gst.gl.GLDisplay"
-      |
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1843:9: error: 'gst_context_set_gl_display' was not declared in this scope
- 1843 |         gst_context_set_gl_display(displayContext.get(), gstGLDisplay);
-      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1850:49: error: 'GST_TYPE_GL_CONTEXT' was not declared in this scope
- 1850 |         gst_structure_set(structure, "context", GST_TYPE_GL_CONTEXT, gstGLContext, nullptr);
-      |                                                 ^~~~~~~~~~~~~~~~~~~
-/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1850:49: note: the macro 'GST_TYPE_GL_CONTEXT' had not yet been defined
-In file included from /usr/pkg/include/gstreamer-1.0/gst/gl/gl.h:28:
-/usr/pkg/include/gstreamer-1.0/gst/gl/gstglcontext.h:32: note: it was later defined here
-   32 | #define GST_TYPE_GL_CONTEXT         (gst_gl_context_get_type())
-      |
-[4484/7882] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-53.cpp.o
-ninja: build stopped: subcommand failed.
+Build with 'JPEG_DEFAULT=libjpeg-turbo' in /etc/mk.conf
+
+Test with $PREFIX/libexec/webkit2gtk-4.1/MiniBrowser:
+
+start, but pages not load: WebProcess CRASHED
diff --git a/webkit-gtk-2.46/distinfo b/webkit-gtk-2.46/distinfo
index bb380ec927..5677a083a7 100644
--- a/webkit-gtk-2.46/distinfo
+++ b/webkit-gtk-2.46/distinfo
@@ -13,6 +13,7 @@ SHA1 (patch-Source_WTF_wtf_InlineASM.h) = d2d6eff085c546b7bcedc4feff69c2f9b636f0
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = d11d941d8ca446b9cd8a452b1eda43497a44c3c9
 SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = a46ae871e2c0919da94bcb14a2b94d0e5a911922
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = 1549a9bbbc11129e42995719d592ab747413eef6
+SHA1 (patch-Source_WebCore_platform_MediaSample.h) = 766b56a0e38e46487c33bfef1f9cc7895b22f696
 SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = f3aa267788a218d9b5cb4d58715abbbc3444d2b6
 SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = fd50d400a5410eb76810f838e4147295acc402ad
 SHA1 (patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib.cpp) = deebf7ac3d75f55f2000f496702623661da4561a
diff --git a/webkit-gtk-2.46/patches/patch-Source_WebCore_platform_MediaSample.h b/webkit-gtk-2.46/patches/patch-Source_WebCore_platform_MediaSample.h
new file mode 100644
index 0000000000..0922c86c56
--- /dev/null
+++ b/webkit-gtk-2.46/patches/patch-Source_WebCore_platform_MediaSample.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+# Try to fix: WebProcess CRASHED
+# https://github.com/freebsd/freebsd-ports/commit/1eeaaa8e063450d0eb8f08df33a6ba338c348825
+
+--- Source/WebCore/platform/MediaSample.h.orig	2025-03-13 16:46:02.595638107 +0000
++++ Source/WebCore/platform/MediaSample.h
+@@ -63,7 +63,6 @@ struct PlatformSample {
+         const MockSampleBox* mockSampleBox;
+         CMSampleBufferRef cmSampleBuffer;
+         GstSample* gstSample;
+-        std::pair<MTPluginByteSourceRef, std::reference_wrapper<const TrackInfo>> byteRangeSample;
+     } sample;
+ };
+
Prev by Date: tcl90: not make-jobs-safe
Next by Date: chromium: fix packaging, remove unused dependencies, disable futex on NetBSD
Previous by Thread: tcl90: not make-jobs-safe
Next by Thread: chromium: fix packaging, remove unused dependencies, disable futex on NetBSD
Indexes:
Home | Main Index | Thread Index | Old Index