Browse Source

ci+docs: add fribidi dependency

Anonymous Maarten 4 days ago
parent
commit
0f9d032885
3 changed files with 3 additions and 6 deletions
  1. 1 0
      .github/workflows/create-test-plan.py
  2. 0 4
      cmake/sdlchecks.cmake
  3. 2 2
      docs/README-linux.md

+ 1 - 0
.github/workflows/create-test-plan.py

@@ -458,6 +458,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
                     "libibus-1.0-dev",
                     "libibus-1.0-dev",
                     "libudev-dev",
                     "libudev-dev",
                     "fcitx-libs-dev",
                     "fcitx-libs-dev",
+                    "libfribidi-dev",
                     # testffmpeg
                     # testffmpeg
                     "libavcodec-dev",
                     "libavcodec-dev",
                     "libavfilter-dev",
                     "libavfilter-dev",

+ 0 - 4
cmake/sdlchecks.cmake

@@ -521,10 +521,6 @@ macro(CheckFribidi)
     if(PC_FRIBIDI_FOUND)
     if(PC_FRIBIDI_FOUND)
       set(HAVE_FRIBIDI TRUE)
       set(HAVE_FRIBIDI TRUE)
       set(HAVE_FRIBIDI_H 1)
       set(HAVE_FRIBIDI_H 1)
-      sdl_sources(
-        "${SDL3_SOURCE_DIR}/src/core/unix/SDL_fribidi.c"
-        "${SDL3_SOURCE_DIR}/src/core/unix/SDL_fribidi.h"
-      )
       if(SDL_FRIBIDI_SHARED AND NOT HAVE_SDL_LOADSO)
       if(SDL_FRIBIDI_SHARED AND NOT HAVE_SDL_LOADSO)
         message(WARNING "You must have SDL_LoadObject() support for dynamic fribidi loading")
         message(WARNING "You must have SDL_LoadObject() support for dynamic fribidi loading")
       endif()
       endif()

+ 2 - 2
docs/README-linux.md

@@ -16,7 +16,7 @@ Ubuntu 18.04, all available features enabled:
 
 
     sudo apt-get install build-essential git make \
     sudo apt-get install build-essential git make \
     pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
     pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
-    libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
+    libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
     libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
     libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
     libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
     libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
     libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev
     libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev
@@ -26,7 +26,7 @@ Ubuntu 22.04+ can also add `libpipewire-0.3-dev libwayland-dev libdecor-0-dev li
 Fedora 35, all available features enabled:
 Fedora 35, all available features enabled:
 
 
     sudo dnf install gcc git-core make cmake \
     sudo dnf install gcc git-core make cmake \
-    alsa-lib-devel pulseaudio-libs-devel pipewire-devel \
+    alsa-lib-devel fribidi-devel pulseaudio-libs-devel pipewire-devel \
     libX11-devel libXext-devel libXrandr-devel libXcursor-devel libXfixes-devel \
     libX11-devel libXext-devel libXrandr-devel libXcursor-devel libXfixes-devel \
     libXi-devel libXScrnSaver-devel dbus-devel ibus-devel \
     libXi-devel libXScrnSaver-devel dbus-devel ibus-devel \
     systemd-devel mesa-libGL-devel libxkbcommon-devel mesa-libGLES-devel \
     systemd-devel mesa-libGL-devel libxkbcommon-devel mesa-libGLES-devel \