Merge branch 'main' into lukas/data-stream

.github/workflows/ffi-builds.yml

@@ -17,7 +17,7 @@ on:
   push:
     branches: ["main"]
     tags:
-      - "ffi-v*"
+      - "rust-sdks/livekit-ffi@*"
   workflow_dispatch:
 
 env:
@@ -196,28 +196,28 @@ jobs:
           Get-ChildItem -Path ${{ matrix.dylib }}, livekit_ffi.h, LICENSE.md | Compress-Archive -DestinationPath ${{ github.workspace }}\${{ matrix.name }}.zip
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ffi-builds
+          name: ffi-builds-${{ matrix.target }}
           path: ${{ matrix.name }}.zip
 
-
   release:
     name: Release to GH (Draft)
     runs-on: ubuntu-latest
     needs: build
     permissions:
       contents: write
-    if: startsWith(github.ref, 'refs/tags/ffi-v')
+    if: startsWith(github.ref, 'refs/tags/rust-sdks/livekit-ffi')
     env:
       GH_TOKEN: ${{ github.token }}
     steps:
       - uses: actions/checkout@v3
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: ffi-builds
+          pattern: ffi-builds-*
+          merge-multiple: true
           path: ${{ github.workspace }}/ffi-builds
 
       - name: Create draft release

.github/workflows/publish.yml

@@ -33,6 +33,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ssh-key: ${{ secrets.NANPA_KEY }}
       - uses: nbsp/ilo@v1
         with:
           packages: ${{ github.event.inputs.packages }}

.github/workflows/webrtc-builds.yml

@@ -45,16 +45,16 @@ jobs:
             cmd: ./build_macos.sh
             arch: arm64
 
-          - name: linux 
+          - name: linux
             os: buildjet-8vcpu-ubuntu-2004
             cmd: ./build_linux.sh
             arch: x64
 
           - name: linux
             os: buildjet-8vcpu-ubuntu-2004
             cmd: ./build_linux.sh
-            arch: arm64 
-          
+            arch: arm64
+
           - name: android
             os: buildjet-8vcpu-ubuntu-2004
             cmd: ./build_android.sh
@@ -81,10 +81,10 @@ jobs:
             os: macos-13
             cmd: ./build_ios.sh
             arch: arm64
-            buildargs: --environment simulator 
+            buildargs: --environment simulator
         profile:
           - release
-#          - debug
+    #          - debug
 
     name: Build webrtc (${{ matrix.target.name }}-${{ matrix.target.arch }}-${{ matrix.profile }}) ${{ matrix.target.buildargs }}
     runs-on: ${{ matrix.target.os }}
@@ -104,7 +104,7 @@ jobs:
           echo "OutName: ${{ steps.setup.outputs.OUT }}"
           echo "OutZip: ${{ steps.setup.outputs.ZIP }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -135,7 +135,7 @@ jobs:
         run: echo -e "\ntarget_os = [\"${{ matrix.target.name }}\"]" >> .gclient
         shell: bash
         working-directory: webrtc-sys/libwebrtc
-        
+
       - name: Build WebRTC
         run: ${{ matrix.target.cmd }} --arch ${{ matrix.target.arch }} --profile ${{ matrix.profile }} ${{ matrix.target.buildargs }}
         working-directory: webrtc-sys/libwebrtc
@@ -151,12 +151,11 @@ jobs:
         run: Compress-Archive -Path .\webrtc-sys\libwebrtc\${{ steps.setup.outputs.OUT }} -DestinationPath ${{ steps.setup.outputs.ZIP }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: webrtc-builds
+          name: webrtc-builds-${{ steps.setup.outputs.OUT }}
           path: ${{ steps.setup.outputs.ZIP }}
 
-
   release:
     name: Release to GH (Draft)
     runs-on: ubuntu-latest
@@ -167,12 +166,13 @@ jobs:
     env:
       GH_TOKEN: ${{ github.token }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: webrtc-builds
+          pattern: webrtc-builds-*
+          merge-multiple: true
           path: ${{ github.workspace }}/webrtc-builds
 
       - name: Create draft release

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "livekit/protocol"]
 	path = livekit-protocol/protocol
 	url = https://github.com/livekit/protocol
+[submodule "yuv-sys/libyuv"]
+	path = yuv-sys/libyuv
+	url = https://chromium.googlesource.com/libyuv/libyuv

.nanparc

@@ -1 +1 @@
-packages livekit livekit-ffi livekit-protocol livekit-runtime livekit-api libwebrtc webrtc-sys webrtc-sys/build soxr-sys
+packages livekit livekit-ffi livekit-protocol livekit-runtime livekit-api libwebrtc webrtc-sys webrtc-sys/build soxr-sys yuv-sys imgproc

Cargo.toml

@@ -8,17 +8,21 @@ members = [
     "livekit-runtime",
     "libwebrtc",
     "soxr-sys",
+    "yuv-sys",
+    "imgproc",
     "webrtc-sys",
     "webrtc-sys/build",
 ]
 
 [workspace.dependencies]
-libwebrtc = { version = "0.3.7", path = "libwebrtc" }
+imgproc = { version = "0.3.12", path = "imgproc" }
+yuv-sys = { version = "0.3.7", path = "yuv-sys" }
+libwebrtc = { version = "0.3.8", path = "libwebrtc" }
 livekit-api = { version = "0.4.1", path = "livekit-api" }
 livekit-ffi = { version = "0.12.3", path = "livekit-ffi" }
 livekit-protocol = { version = "0.3.6", path = "livekit-protocol" }
 livekit-runtime = { version = "0.3.1", path = "livekit-runtime" }
-livekit = { version = "0.7.0", path = "livekit" }
+livekit = { version = "0.7.1", path = "livekit" }
 soxr-sys = { version = "0.1.0", path = "soxr-sys" }
-webrtc-sys-build = { version = "0.3.5", path = "webrtc-sys/build" }
-webrtc-sys = { version = "0.3.5", path = "webrtc-sys" }
+webrtc-sys-build = { version = "0.3.6", path = "webrtc-sys/build" }
+webrtc-sys = { version = "0.3.6", path = "webrtc-sys" }

download_ffi.py

@@ -74,7 +74,7 @@ def ffi_version():
 
 def download_ffi(platform, arch, version, output):
     filename = "ffi-%s-%s.zip" % (platform, arch)
-    url = "https://github.com/livekit/client-sdk-rust/releases/download/ffi-v%s/%s"
+    url = "https://github.com/livekit/client-sdk-rust/releases/download/rust-sdks/livekit-ffi@%s/%s"
     url = url % (version, filename)
 
     tmp = os.path.join(tempfile.gettempdir(), filename)

imgproc/.nanparc

@@ -0,0 +1,2 @@
+version 0.3.12
+language rust

imgproc/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## [0.3.12] - 2024-12-14
+
+### Added
+
+- move imgproc to main rust-sdks monorepo