fix: moved rust code to a separate project, updated Docker image to u…

…se that instead
games-on-whales · Nov 29, 2023 · 83aea8d · 83aea8d
1 parent 53116ef
commit 83aea8d
Show file tree

Hide file tree

Showing 46 changed files with 30 additions and 3,009 deletions.
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/cmake/CMakeCargo.cmake b/cmake/CMakeCargo.cmake
diff --git a/cmake/CMakeDetermineRustCompiler.cmake b/cmake/CMakeDetermineRustCompiler.cmake
diff --git a/cmake/CMakeRustCompiler.cmake.in b/cmake/CMakeRustCompiler.cmake.in
diff --git a/cmake/CMakeRustInformation.cmake b/cmake/CMakeRustInformation.cmake
diff --git a/cmake/CMakeTestRustCompiler.cmake b/cmake/CMakeTestRustCompiler.cmake
diff --git a/cmake/CargoLink.cmake b/cmake/CargoLink.cmake
diff --git a/docker/wolf.Dockerfile b/docker/wolf.Dockerfile
@@ -26,9 +26,20 @@ RUN apt-get update -y && \
     libpci-dev \
     && rm -rf /var/lib/apt/lists/*
 
-## Install Rust in order to build our custom compositor (the build will be done inside Cmake)
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
+## Install Rust in order to build our custom compositor
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="$HOME/.cargo/bin:${PATH}"
+
+WORKDIR /tmp/
+RUN <<_GST_WAYLAND_DISPLAY
+    #!/bin/bash
+    set -e
+
+    git clone https://github.com/games-on-whales/gst-wayland-display
+    cd gst-wayland-display
+    cargo install cargo-c
+    cargo cinstall --prefix=/usr/local
+_GST_WAYLAND_DISPLAY
 
 COPY . /wolf/
 WORKDIR /wolf
@@ -75,6 +86,9 @@ RUN apt-get update -y && \
     && rm -rf /var/lib/apt/lists/*
 
 ENV GST_PLUGIN_PATH=/usr/local/lib/x86_64-linux-gnu/gstreamer-1.0/
+# Copying out our custom compositor from the build stage
+COPY --from=wolf-builder /usr/local/lib/gstreamer-1.0/* $GST_PLUGIN_PATH
+COPY --from=wolf-builder /usr/local/lib/liblibgstwaylanddisplay* /usr/local/lib/
 
 WORKDIR /wolf
 

diff --git a/docs/modules/user/pages/quickstart.adoc b/docs/modules/user/pages/quickstart.adoc
@@ -112,7 +112,7 @@ docker run \
     -v /dev/input:/dev/input:rw \
     -v /run/udev:/run/udev:rw \
     -v /etc/wolf/ensure-groups:/opt/gow/ensure-groups:rw \
-   wolf/wolf:test
+   ghcr.io/games-on-whales/wolf:stable
 ....
 
 Docker compose:

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -13,12 +13,11 @@ target_link_libraries(wolf_core PUBLIC wolf::docker)
 file(GLOB CORE_HEADERS CONFIGURE_DEPENDS src/core/*.hpp)
 set(CORE_SRC "")
 
+find_package(PkgConfig)
 option(LINK_RUST_WAYLAND "Link to our custom Rust wayland compositor" ON)
 if (LINK_RUST_WAYLAND AND UNIX AND NOT APPLE)
-    # Adapted from: https://github.com/Devolutions/CMakeRust/
-    enable_language(Rust)
-    include(CMakeCargo)
-    add_subdirectory(rust/gst-wayland-display)
+    pkg_check_modules(libgstwaylanddisplay REQUIRED IMPORTED_TARGET libgstwaylanddisplay)
+    target_link_libraries(wolf_core PUBLIC PkgConfig::libgstwaylanddisplay)
 endif ()
 
 FetchContent_Declare(
@@ -35,8 +34,7 @@ FetchContent_MakeAvailable(immer)
 target_link_libraries_system(wolf_core PUBLIC immer)
 unset(FPHSA_NAME_MISMATCHED)
 
-find_package(PkgConfig)
-pkg_check_modules(GSTREAMER REQUIRED IMPORTED_TARGET gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0)
+pkg_check_modules(GSTREAMER REQUIRED IMPORTED_TARGET gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 gstreamer-video-1.0)
 pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
 
 if (NOT (GSTREAMER_FOUND))
@@ -55,7 +53,6 @@ if (UNIX AND NOT APPLE)
     target_link_libraries(wolf_core PUBLIC wolf::uinput)
 
     if (LINK_RUST_WAYLAND)
-        target_link_libraries_system(wolf_core PUBLIC gstwaylanddisplay)
         list(APPEND CORE_SRC src/platforms/linux/virtual-display/wayland-display.cpp)
     else ()
         message(WARNING "Missing virtual display implementation for this platform")