Merge branch 'webkit-video' into 'master'

Add ffmpeg and AAC on gstreamer

See merge request redox-os/redox!2378
This commit is contained in:
Jeremy Soller 2026-10-03 07:07:30 -06:00
commit 190b4bf292
4 changed files with 22 additions and 4 deletions

View File

@ -14,10 +14,14 @@ dependencies = [
"sdl2",
"zlib",
]
dev-dependencies = [
"libstdcxx"
]
compiler = "gcc-no-lto"
script = """
DYNAMIC_INIT
export LDFLAGS="$LDFLAGS -lSDL2 -lorbital -lOSMesa -lstdc++"
export LDFLAGS="$LDFLAGS -lSDL2 -lorbital -lOSMesa"
ARCH="${TARGET%%-*}"
COOKBOOK_CONFIGURE_FLAGS=(
--enable-cross-compile
@ -31,6 +35,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
--disable-network
--enable-sdl2
--enable-zlib
--enable-pic
--enable-encoder=png
--enable-decoder=png
)

View File

@ -8,7 +8,7 @@ template = "custom"
dependencies = [
"bzip2",
"curl",
#TODO: "ffmpeg6",
"ffmpeg6",
"gdk-pixbuf",
"libass",
"libffi",
@ -18,6 +18,7 @@ dependencies = [
"libsoup",
"libwebp",
"mesa",
"libfdk-aac",
#TODO: "openal",
"pango",
]
@ -31,7 +32,7 @@ CFLAGS="${CFLAGS} -DM_LN2=0.69314718055994530942"
cookbook_meson \
-Ddevtools=disabled \
-Dexamples=disabled \
-Dlibav=disabled \
-Dlibav=enabled \
-Dlibnice=disabled \
-Dorc=disabled \
-Dtests=disabled \

View File

@ -1,4 +1,4 @@
#TODO not compiled or tested
#TODO promote
[source]
git = "https://github.com/mstorsjo/fdk-aac"
rev = "v2.0.3"

View File

@ -684,3 +684,15 @@ diff -ruwN source/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
if (disableDMABuf && strcmp(disableDMABuf, "0"))
return;
diff -ruwN source/Source/WTF/wtf/FileSystem.cpp source-new/Source/WTF/wtf/FileSystem.cpp
--- source/Source/WTF/wtf/FileSystem.cpp 2025-03-21 11:07:10.828055100 +0000
+++ source-new/Source/WTF/wtf/FileSystem.cpp 2026-10-03 11:58:07.275782479 +0000
@@ -360,7 +360,7 @@
mprotect(map, bytesSize, PROT_READ);
// Flush (asynchronously) to file, turning this into clean memory.
- msync(map, bytesSize, MS_ASYNC);
+ // msync(map, bytesSize, MS_ASYNC); // redox: msync unimplemented
#endif
}