Skip to content

Gtk4 wasm #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Zubnix wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Gtk4 wasm #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d0c3705
update deps
Zubnix Sep 30, 2024
ac82d69
gtk wasm build wip
Zubnix Oct 3, 2024
bd9f9d8
gtk wasm build wip
Zubnix Oct 5, 2024
efdc8e1
gtk wasm build wip
Zubnix Oct 6, 2024
b0459ba
gtk wasm build wip
Zubnix Oct 10, 2024
b374a0a
gtk wasm build wip
Zubnix Oct 11, 2024
cd25035
gtk wasm build wip
Zubnix Oct 12, 2024
63ee2f6
sdk cleanup
Oct 14, 2024
a0528ea
gtk wasm build wip
Zubnix Oct 14, 2024
7e69972
gtk wasm build wip
Zubnix Oct 15, 2024
f5c72f7
gtk wasm build wip
Zubnix Oct 24, 2024
ff79ab6
gtk wasm build wip
Zubnix Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions examples/sdk/gtk4/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ fi
DIR=$(dirname "$(readlink -f "$CURRENT_SCRIPT")")


EXTRA_LDFLAGS="-g -sTOTAL_MEMORY=256MB --preload-file $DIR/fonts/inter@/usr/share/fonts/opentype/inter"

meson setup --wipe build/ --cross-file "$_SDK_DIR/toolkit/meson-gf-cross.ini" --cross-file "$_SDK_DIR/toolkit/meson-gf-toolchain.ini" -Dprefix="$_SDK_DIR/sysroot" \
EXTRA_LDFLAGS="-g -sINITIAL_MEMORY=512MB '-fsanitize=undefined' \
--preload-file $DIR/fonts/inter@/usr/share/fonts/opentype/inter \
--preload-file $DIR/build/examples/application9/gschemas.compiled@/usr/share/glib-2.0/schemas/ \
--preload-file $_SDK_DIR/sysroot/share/X11/xkb@/home/web_user/.config/xkb \
--preload-file $_SDK_DIR/sysroot/share/fontconfig@/usr/share/fontconfig \
--preload-file $_SDK_DIR/sysroot/etc/fonts@/etc/fonts \
--pre-js $DIR/set_env.js"

meson setup --wipe build/ --cross-file "$_SDK_DIR/toolkit/meson-gf-cross.ini" --cross-file "$_SDK_DIR/toolkit/meson-gf-toolchain.ini" \
-Dbuild-examples=true -Ddemos=false -Dc_link_args="$EXTRA_LDFLAGS"
ninja -C build/ -j10



4 changes: 2 additions & 2 deletions examples/sdk/gtk4/examples/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ foreach ex : examples
endforeach

#subdir('bp')
subdir('application1')
#subdir('application1')
#subdir('application2')
#subdir('application3')
#subdir('application4')
#subdir('application5')
#subdir('application6')
#subdir('application7')
#subdir('application8')
#subdir('application9')
subdir('application9')
7 changes: 7 additions & 0 deletions examples/sdk/gtk4/set_env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

var setEnv = function() {
ENV.FONTCONFIG_PATH="/etc/fonts"
ENV.GSK_RENDERER="cairo"
}

Module.preRun = Module.preRun ? [...Module.preRun, setEnv] : [setEnv]
14 changes: 7 additions & 7 deletions libs/client-protocol/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
},
"devDependencies": {
"@gfld/client-generator": "workspace:^",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"eslint": "^8.57.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.5.2"
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"typescript": "^5.6.2"
}
}
14 changes: 7 additions & 7 deletions libs/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
"build": "yarn run tsc"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"eslint": "^8.57.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.5.2"
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"typescript": "^5.6.2"
}
}
4 changes: 2 additions & 2 deletions libs/compositor-ffmpeg-h264/build_wasm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

EMSDK_VERSION="3.1.46"
EMSDK_VERSION="3.1.68"
git -C emsdk pull || git clone https://github.com/emscripten-core/emsdk.git emsdk
pushd 'emsdk'
./emsdk install ${EMSDK_VERSION}
Expand Down Expand Up @@ -41,7 +41,7 @@ build() {
emcc native/decoder.c -I./ffmpeg-build/include -O3 -flto -msimd128 -Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments -c -o ffmpeg-build/decoder.bc
EXPORTED_FUNCTIONS='["_malloc","_free","_create_codec_context","_destroy_codec_context","_decode","_close_frame"]'
EXPORTED_RUNTIME_METHODS='["getValue"]'
emcc ffmpeg-build/decoder.bc ffmpeg-build/lib/libavcodec.a ffmpeg-build/lib/libavutil.a -O3 -flto -msimd128 -Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments -L"$(pwd)"/dist/lib -s INITIAL_MEMORY=32MB -s MAXIMUM_MEMORY=128MB -s EVAL_CTORS=2 -fno-rtti -fno-exceptions --memory-init-file 0 -s ENVIRONMENT='worker' -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s INVOKE_RUN=0 -s DOUBLE_MODE=0 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s EXPORT_ES6=1 -s SINGLE_FILE=1 -o ./src/libav-h264.js -s EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS" -s EXPORTED_RUNTIME_METHODS="$EXPORTED_RUNTIME_METHODS"
emcc ffmpeg-build/decoder.bc ffmpeg-build/lib/libavcodec.a ffmpeg-build/lib/libavutil.a -O3 -flto -msimd128 -Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments -L"$(pwd)"/dist/lib -s INITIAL_MEMORY=32MB -s MAXIMUM_MEMORY=128MB -s EVAL_CTORS=2 -fno-rtti -fno-exceptions -s ENVIRONMENT='worker' -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s INVOKE_RUN=0 -s DOUBLE_MODE=0 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s EXPORT_ES6=1 -s SINGLE_FILE=1 -o ./src/libav-h264.js -s EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS" -s EXPORTED_RUNTIME_METHODS="$EXPORTED_RUNTIME_METHODS"

echo "Finished Build"
}
Expand Down
14 changes: 7 additions & 7 deletions libs/compositor-ffmpeg-h264/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"build": "yarn run build-wasm && yarn run build-ts"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"acorn": "^8.12.0",
"eslint": "^8.57.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"acorn": "^8.12.1",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.3.2",
"typescript": "^5.5.2"
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"typescript": "^5.6.2"
},
"author": "Erik De Rijcke",
"homepage": "https://github.com/udevbe/tinyh264",
Expand Down
10 changes: 5 additions & 5 deletions libs/compositor-ffmpeg-h264/src/libav-h264.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion libs/compositor-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"xml2js": "^0.6.2"
},
"devDependencies": {
"standard": "17.1.0"
"standard": "17.1.2"
}
}
14 changes: 7 additions & 7 deletions libs/compositor-protocol/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
},
"devDependencies": {
"@gfld/compositor-generator": "workspace:^",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"eslint": "^8.57.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"mkdirp": "^3.0.1",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.5.2"
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"typescript": "^5.6.2"
}
}
2 changes: 1 addition & 1 deletion libs/compositor-proxy-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"xml2js": "^0.6.2"
},
"devDependencies": {
"standard": "^17.1.0"
"standard": "^17.1.2"
}
}
2 changes: 1 addition & 1 deletion libs/compositor-wasm/build_wasm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
PACKAGE_DIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
export PACKAGE_DIR

EMSDK_VERSION="3.1.46"
EMSDK_VERSION="3.1.68"
git -C emsdk pull || git clone https://github.com/emscripten-core/emsdk.git emsdk
pushd 'emsdk'
./emsdk install ${EMSDK_VERSION}
Expand Down
14 changes: 7 additions & 7 deletions libs/compositor-wasm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"build": "./build_wasm.sh && yarn run tsc"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"acorn": "^8.12.0",
"eslint": "^8.57.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"acorn": "^8.12.1",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.3.2",
"typescript": "^5.5.2"
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"typescript": "^5.6.2"
}
}
20 changes: 10 additions & 10 deletions libs/xtsb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@
},
"devDependencies": {
"@tsconfig/node18": "^18.2.4",
"@types/jest": "^29.5.12",
"@types/node": "^20.14.8",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"eslint": "^8.57.0",
"@types/jest": "^29.5.13",
"@types/node": "^22.7.1",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"jest": "^29.7.0",
"jest-config": "^29.7.0",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"ts-jest": "^29.1.5",
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.5.2"
"typescript": "^5.6.2"
}
}
32 changes: 16 additions & 16 deletions packages/compositor-proxy-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@
},
"dependencies": {
"@gfld/compositor-proxy": "workspace:^",
"ajv": "^8.16.0",
"ajv-formats": "^2.1.1",
"ws": "^8.17.1"
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
"ws": "^8.18.0"
},
"devDependencies": {
"@tsconfig/node18": "^18.2.4",
"@types/js-yaml": "^4.0.9",
"@types/jsonwebtoken": "^9.0.6",
"@types/node": "^20.14.8",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@vercel/ncc": "^0.38.1",
"eslint": "^8.57.0",
"@types/jsonwebtoken": "^9.0.7",
"@types/node": "^20.16.8",
"@types/ws": "^8.5.12",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"@vercel/ncc": "^0.38.2",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"json-schema-to-typescript": "^13.1.2",
"eslint-plugin-prettier": "^5.2.1",
"json-schema-to-typescript": "^15.0.2",
"mkdirp": "^3.0.1",
"pkg": "^5.8.1",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"tsx": "^4.15.7",
"typescript": "^5.5.2"
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"tsx": "^4.19.1",
"typescript": "^5.6.2"
},
"pkg": {
"scripts": [
Expand Down
22 changes: 11 additions & 11 deletions packages/compositor-proxy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,26 @@
},
"dependencies": {
"@gfld/xtsb": "workspace:^",
"ws": "^8.17.1"
"ws": "^8.18.0"
},
"devDependencies": {
"@gfld/compositor-proxy-generator": "workspace:^",
"@tsconfig/node18": "^18.2.4",
"@types/js-yaml": "^4.0.9",
"@types/node": "^20.14.8",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@types/node": "^20.16.8",
"@types/ws": "^8.5.12",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"cpy-cli": "^5.0.0",
"eslint": "^8.57.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"jest": "^29.7.0",
"json-schema-to-typescript": "^13.1.2",
"json-schema-to-typescript": "^15.0.2",
"mkdirp": "^3.0.1",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.5.2"
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"typescript": "^5.6.2"
},
"author": "Erik De Rijcke",
"homepage": "https://www.greenfield.app",
Expand Down
36 changes: 18 additions & 18 deletions packages/compositor-shell/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,30 @@
},
"dependencies": {
"@gfld/compositor": "workspace:^",
"preact": "^10.22.0"
"preact": "^10.24.1"
},
"devDependencies": {
"@babel/core": "^7.24.7",
"@babel/plugin-transform-react-jsx": "^7.24.7",
"@babel/core": "^7.25.2",
"@babel/plugin-transform-react-jsx": "^7.25.2",
"@babel/plugin-transform-react-jsx-development": "^7.24.7",
"@preact/preset-vite": "2.8.3",
"@preact/signals": "^1.2.3",
"@tailwindcss/typography": "^0.5.13",
"@types/node": "^20.14.8",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@preact/preset-vite": "2.9.1",
"@preact/signals": "^1.3.0",
"@tailwindcss/typography": "^0.5.15",
"@types/node": "^20.16.8",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"babel-plugin-transform-hook-names": "^1.0.2",
"eslint": "^8.57.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"postcss": "^8.4.38",
"prettier": "^3.3.2",
"prettier-plugin-tailwindcss": "^0.5.14",
"tailwindcss": "^3.4.4",
"typescript": "^5.5.2",
"vite": "^5.3.1"
"eslint-plugin-prettier": "^5.2.1",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"tailwindcss": "^3.4.13",
"typescript": "^5.6.2",
"vite": "^5.4.8"
},
"author": "Erik De Rijcke",
"homepage": "https://www.greenfield.app",
Expand Down
14 changes: 7 additions & 7 deletions packages/compositor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
},
"devDependencies": {
"@types/dom-webcodecs": "^0.1.11",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"cpy-cli": "^5.0.0",
"eslint": "^8.57.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.5.2"
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"typescript": "^5.6.2"
},
"author": "Erik De Rijcke",
"homepage": "https://www.greenfield.app",
Expand Down
Loading