more wip

.yarn/patches/pkg-npm-5.8.1-db9700609f.patch

@@ -254,9 +254,9 @@ index 034bd153d92d9db9e7a37b9dc63ddf4277f1a9ee..76e766524fec4a2789bb775c738f61df
 +    if(!nativeDepsCopied) {
 +      nativeDepsCopied = true
 +      copyNativeDeps([
-+        `${moduleFolder}/libproxy-encoding.so`,
-+        `${moduleFolder}/libwayland-server.so.0`,
-+        `${moduleFolder}/libwestfield.so`,
++        `${moduleFolder}/shared/libproxy-encoding.so`,
++        `${moduleFolder}/shared/libwayland-server.so.0`,
++        `${moduleFolder}/shared/libwestfield.so`,
 +      ])
 +    }
 +

examples/docker-compose/gtk4-demo/Dockerfile → examples/docker-compose/Dockerfile

@@ -1,5 +1,8 @@
-FROM udevbe/compositor-proxy-cli:20231104
+FROM udevbe/compositor-proxy-cli:20231106
 
 RUN apt-get update && apt-get install -y \
+    mesa-utils \
+    gtk-3-examples \
     gtk-4-examples \
+    xterm \
     && rm -rf /var/lib/apt/lists/*

examples/docker-compose/applications.json

@@ -0,0 +1,26 @@
+{
+  "/glxgears": {
+    "name": "GLX Gears",
+    "executable": "glxgears",
+    "args": [],
+    "env": {}
+  },
+  "/gtk3demo": {
+    "name": "GTK3 Demo",
+    "executable": "gtk3-demo",
+    "args": [],
+    "env": {}
+  },
+  "/gtk4demo": {
+    "name": "GTK4 Demo",
+    "executable": "gtk4-demo",
+    "args": [],
+    "env": {}
+  },
+  "/xterm": {
+    "name": "XTerm",
+    "executable": "xterm",
+    "args": [],
+    "env": {}
+  }
+}

examples/docker-compose/docker-compose.yml

@@ -1,10 +1,10 @@
 #Uncomment nvidia related comments below if you want hw acceleration with an nvidia GPU to work inside the containers (requires nvidia container runtime).
 #Also make sure to configure "/dev/dri/renderD12x" and "/dev/dri/cardx" entries in this file to point to the correct GPU, especially if you have a multi GPU setup.
 services:
-  gtk3-demo:
+  apps:
 #    runtime: nvidia
     build:
-      context: gtk3-demo
+      context: .
       dockerfile: Dockerfile
     command:
       - --applications=/app/applications.json
@@ -15,7 +15,7 @@ services:
     privileged: false
     user: "1000:1000"
     volumes:
-      - $PWD/gtk3-demo/applications.json:/app/applications.json:ro
+      - $PWD/applications.json:/app/applications.json:ro
       - type: tmpfs
         target: /tmp/.X11-unix/
       - type: tmpfs
@@ -33,99 +33,3 @@ services:
     restart: always
     ports:
       - "8081:8081/tcp"
-  gtk4-demo:
-#    runtime: nvidia
-    build:
-      context: gtk4-demo
-      dockerfile: Dockerfile
-    command:
-      - --applications=/app/applications.json
-      - --bind-port=8081
-      - --base-url=ws://localhost:8082
-#      - --encoder=nvh264
-#      - --render-device=/dev/dri/renderD128
-    privileged: false
-    user: "1000:1000"
-    volumes:
-      - $PWD/gtk4-demo/applications.json:/app/applications.json:ro
-      - type: tmpfs
-        target: /tmp/.X11-unix/
-      - type: tmpfs
-        target: /xdg-runtime-dir
-#      - /dev/dri/renderD128:/dev/dri/renderD128:rw
-#      - /dev/dri/card0:/dev/dri/card0:rw
-#    devices: []
-#      - /dev/dri/renderD128:/dev/dri/renderD128
-#      - /dev/dri/card0:/dev/dri/card0
-    environment:
-      XAUTHORITY: /tmp/.X11-unix/Xauthority
-      XDG_RUNTIME_DIR: /xdg-runtime-dir
-#      NVIDIA_VISIBLE_DEVICES: all
-#      NVIDIA_DRIVER_CAPABILITIES: all
-    restart: always
-    ports:
-      - "8082:8081/tcp"
-  xterm:
-#    runtime: nvidia
-    build:
-      context: xterm
-      dockerfile: Dockerfile
-    command:
-      - --applications=/app/applications.json
-      - --bind-port=8081
-      - --base-url=ws://localhost:8083
-    #      - --encoder=nvh264
-    #      - --render-device=/dev/dri/renderD128
-    privileged: false
-    user: "1000:1000"
-    volumes:
-      - $PWD/xterm/applications.json:/app/applications.json:ro
-      - type: tmpfs
-        target: /tmp/.X11-unix/
-      - type: tmpfs
-        target: /xdg-runtime-dir
-#      - /dev/dri/renderD128:/dev/dri/renderD128:rw
-#      - /dev/dri/card0:/dev/dri/card0:rw
-#    devices: []
-#      - /dev/dri/renderD128:/dev/dri/renderD128
-#      - /dev/dri/card0:/dev/dri/card0
-    environment:
-      XAUTHORITY: /tmp/.X11-unix/Xauthority
-      XDG_RUNTIME_DIR: /xdg-runtime-dir
-#      NVIDIA_VISIBLE_DEVICES: all
-#      NVIDIA_DRIVER_CAPABILITIES: all
-    restart: always
-    ports:
-      - "8083:8081/tcp"
-  glxgears:
-#    runtime: nvidia
-    build:
-      context: glxgears
-      dockerfile: Dockerfile
-    command:
-      - --applications=/app/applications.json
-      - --bind-port=8081
-      - --base-url=ws://localhost:8084
-#      - --encoder=nvh264
-#      - --render-device=/dev/dri/renderD128
-    privileged: false
-    user: "1000:1000"
-    volumes:
-      - $PWD/glxgears/applications.json:/app/applications.json:ro
-      - type: tmpfs
-        target: /tmp/.X11-unix/
-      - type: tmpfs
-        target: /xdg-runtime-dir
-#      - /dev/dri/renderD128:/dev/dri/renderD128:rw
-#      - /dev/dri/card0:/dev/dri/card0:rw
-#    devices: []
-#      - /dev/dri/renderD128:/dev/dri/renderD128
-#      - /dev/dri/card0:/dev/dri/card0
-    environment:
-      XAUTHORITY: /tmp/.X11-unix/Xauthority
-      XDG_RUNTIME_DIR: /xdg-runtime-dir
-#      NVIDIA_VISIBLE_DEVICES: all
-#      NVIDIA_DRIVER_CAPABILITIES: all
-    restart: always
-    ports:
-      - "8084:8081/tcp"

packages/compositor-proxy-cli/package.json

@@ -50,9 +50,9 @@
     ],
     "assets": [
       "dist/**/*.json",
-      "node_modules/@gfld/compositor-proxy/dist/addons/libproxy-encoding.so",
-      "node_modules/@gfld/compositor-proxy/dist/addons/libwayland-server.so.0",
-      "node_modules/@gfld/compositor-proxy/dist/addons/libwestfield.so"
+      "node_modules/@gfld/compositor-proxy/dist/addons/shared/libproxy-encoding.so",
+      "node_modules/@gfld/compositor-proxy/dist/addons/shared/libwayland-server.so.0",
+      "node_modules/@gfld/compositor-proxy/dist/addons/shared/libwestfield.so"
     ],
     "targets": [
       "node18-linux"

packages/compositor-proxy/CMakeLists.txt

@@ -218,12 +218,16 @@ target_link_libraries(wayland-server-addon PRIVATE
 )
 
 install(TARGETS
-        proxy-encoding
-        wayland-server
-        westfield
         proxy-encoding-addon
         wayland-server-addon
         proxy-poll-addon
         DESTINATION
         ${CMAKE_CURRENT_SOURCE_DIR}/dist/addons
 )
+install(TARGETS
+        proxy-encoding
+        wayland-server
+        westfield
+        DESTINATION
+        ${CMAKE_CURRENT_SOURCE_DIR}/dist/addons/shared
+)

yarn.lock

@@ -6937,7 +6937,7 @@ __metadata:
 
 "pkg@patch:pkg@npm%3A5.8.1#./.yarn/patches/pkg-npm-5.8.1-db9700609f.patch::locator=root-workspace-0b6124%40workspace%3A.":
   version: 5.8.1
-  resolution: "pkg@patch:pkg@npm%3A5.8.1#./.yarn/patches/pkg-npm-5.8.1-db9700609f.patch::version=5.8.1&hash=942722&locator=root-workspace-0b6124%40workspace%3A."
+  resolution: "pkg@patch:pkg@npm%3A5.8.1#./.yarn/patches/pkg-npm-5.8.1-db9700609f.patch::version=5.8.1&hash=84f863&locator=root-workspace-0b6124%40workspace%3A."
   dependencies:
     "@babel/generator": 7.18.2
     "@babel/parser": 7.18.4
@@ -6960,7 +6960,7 @@ __metadata:
       optional: true
   bin:
     pkg: lib-es5/bin.js
-  checksum: ba781b091b0ddd90bc56dd3ecc68c8bd6ce67ee28a5dabdff3e5ee24cd6de686a19e3dd95720eb9d9ac24d74412961828c970306a541e7e6d01923eda8afd41f
+  checksum: 1ecd108a4b3ae205863f254eb30feb07557c638b67578d0a3405b144c98f471d6adf9146fe8550fe6695da3443c8518b9f911bad932d89a95cb9f11c182afac3
   languageName: node
   linkType: hard