diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 2de03cfd1aa..ea1bb83a429 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -32,7 +32,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Docker Step - run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:4.0.4 bash" + run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:4.0.16 bash" # - name: Determine Release # id: vars # shell: bash @@ -87,7 +87,7 @@ jobs: release: true update: true msystem: ${{matrix.msystem}} - pacboy: openssl:p python:p gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p + pacboy: openssl:p python:p gcc:p assimp:p cairo:p curl:p freeglut:p freeimage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p install: >- unzip make diff --git a/scripts/linux/debian/install_dependencies.sh b/scripts/linux/debian/install_dependencies.sh index 75762ec3eed..d30fab156fa 100755 --- a/scripts/linux/debian/install_dependencies.sh +++ b/scripts/linux/debian/install_dependencies.sh @@ -37,14 +37,39 @@ fi echo "installing OF dependencies" -apt-get install freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk${GTK_VERSION}-dev libopencv-dev libegl1-mesa-dev libgles1 libgles2-mesa-dev libassimp-dev librtaudio-dev libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libpoco-dev libgconf-2-4 brotli liblapack-dev libblas-dev +apt-get update +apt-get install -y \ + freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ \ + libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev \ + libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev \ + libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev \ + libgtk${GTK_VERSION}-dev libopencv-dev \ + libegl1-mesa-dev libgles1 libgles2-mesa-dev \ + libassimp-dev librtaudio-dev libglfw3-dev \ + liburiparser-dev libcurl4-openssl-dev libpugixml-dev libpoco-dev \ + libgconf-2-4 brotli liblapack-dev libblas-dev \ + \ + # ---- X11 bits used by GLFW (often missing) ---- + libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev \ + xorgproto \ + \ + # ---- Wayland stack for GLFW ---- + libwayland-dev wayland-protocols libxkbcommon-dev libxkbcommon-x11-dev \ + libdecor-0-dev \ + \ + # ---- GL loader/plumbing (recommended) ---- + libglvnd-dev \ + \ + # ---- useful tools (optional) ---- + mesa-utils exit_code=$? if [ $exit_code != 0 ]; then - echo "error installing dependencies, there could be an error with your internet connection" - echo "if the error persists, please report an issue in github: http://github.com/openframeworks/openFrameworks/issues" - exit $exit_code + echo "error installing dependencies, there could be an error with your internet connection" + echo "if the error persists, please report an issue in github: http://github.com/openframeworks/openFrameworks/issues" + exit $exit_code fi + echo "installing gstreamer" apt-get install libgstreamer${GSTREAMER_VERSION}-dev libgstreamer-plugins-base${GSTREAMER_VERSION}-dev ${GSTREAMER_FFMPEG} gstreamer${GSTREAMER_VERSION}-pulseaudio gstreamer${GSTREAMER_VERSION}-x gstreamer${GSTREAMER_VERSION}-plugins-bad gstreamer${GSTREAMER_VERSION}-alsa gstreamer${GSTREAMER_VERSION}-plugins-base gstreamer${GSTREAMER_VERSION}-plugins-good exit_code=$? diff --git a/scripts/linux/fedora/install_dependencies.sh b/scripts/linux/fedora/install_dependencies.sh index 1f1eee4532b..62cade82103 100755 --- a/scripts/linux/fedora/install_dependencies.sh +++ b/scripts/linux/fedora/install_dependencies.sh @@ -14,7 +14,26 @@ ROOT=$(cd $(dirname $0); pwd -P) # on older Fedora installs you might need to also do: # dnf install jack-audio-connection-kit-dbus -dnf install freeglut-devel alsa-lib-devel libXmu-devel libXxf86vm-devel gcc-c++ libraw1394-devel gstreamer1-devel gstreamer1-plugins-base-devel libudev-devel libtheora-devel libvorbis-devel openal-soft-devel libsndfile-devel python-lxml glew-devel flac-devel freeimage-devel cairo-devel pulseaudio-libs-devel openssl-devel libusbx-devel gtk2-devel libXrandr-devel libXi-devel opencv-devel libX11-devel assimp-devel rtaudio-devel gtk3-devel glfw-devel uriparser-devel curl-devel pugixml-devel poco-devel brotli +dnf install -y \ + freeglut-devel alsa-lib-devel libXmu-devel libXxf86vm-devel gcc-c++ \ + libraw1394-devel gstreamer1-devel gstreamer1-plugins-base-devel \ + libudev-devel libtheora-devel libvorbis-devel openal-soft-devel \ + libsndfile-devel python3-lxml glew-devel flac-devel freeimage-devel \ + cairo-devel pulseaudio-libs-devel openssl-devel libusbx-devel \ + gtk2-devel libXrandr-devel libXi-devel opencv-devel libX11-devel \ + assimp-devel rtaudio-devel gtk3-devel glfw-devel uriparser-devel \ + curl-devel pugixml-devel poco-devel brotli \ + \ + # ---- Added for GLFW / X11 / Wayland completeness ---- + wayland-devel wayland-protocols-devel \ + libxkbcommon-devel libxkbcommon-x11-devel \ + libdecor-devel xorg-x11-proto-devel \ + mesa-libGL-devel mesa-libGLU-devel mesa-libEGL-devel mesa-libGLES-devel \ + libXcursor-devel libXinerama-devel libXext-devel \ + fftw-devel \ + \ + # ---- Optional runtime components (for testing) ---- + xorg-x11-server-Xwayland mesa-dri-drivers libdecor exit_code=$? if [ $exit_code != 0 ]; then diff --git a/scripts/linux/ubuntu/install_dependencies.sh b/scripts/linux/ubuntu/install_dependencies.sh index c0e4b87d157..5ba00708852 100755 --- a/scripts/linux/ubuntu/install_dependencies.sh +++ b/scripts/linux/ubuntu/install_dependencies.sh @@ -187,7 +187,22 @@ else fi -PACKAGES="make nlohmann-json3-dev libssl3 libcurl4 brotli libcurl4-openssl-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++${CXX_VER} libgl1-mesa-dev${XTAG} libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev ${LIB_GTK_DEV} libopencv-dev libassimp-dev librtaudio-dev libgstreamer${GSTREAMER_VERSION}-dev libgstreamer-plugins-base${GSTREAMER_VERSION}-dev ${GSTREAMER_FFMPEG} gstreamer${GSTREAMER_VERSION}-pulseaudio gstreamer${GSTREAMER_VERSION}-x gstreamer${GSTREAMER_VERSION}-plugins-bad gstreamer${GSTREAMER_VERSION}-alsa gstreamer${GSTREAMER_VERSION}-plugins-base gstreamer${GSTREAMER_VERSION}-plugins-good gdb ${GLFW_PKG} liburiparser-dev libpugixml-dev libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libxml2-dev" +PACKAGES="make nlohmann-json3-dev libssl3 libcurl4 brotli libcurl4-openssl-dev \ +libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev \ +libxxf86vm-dev g++${CXX_VER} libgl1-mesa-dev${XTAG} libglu1-mesa-dev \ +libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev \ +libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev \ +libusb-1.0-0-dev ${LIB_GTK_DEV} libopencv-dev libassimp-dev librtaudio-dev \ +libgstreamer${GSTREAMER_VERSION}-dev libgstreamer-plugins-base${GSTREAMER_VERSION}-dev \ +${GSTREAMER_FFMPEG} gstreamer${GSTREAMER_VERSION}-pulseaudio \ +gstreamer${GSTREAMER_VERSION}-x gstreamer${GSTREAMER_VERSION}-plugins-bad \ +gstreamer${GSTREAMER_VERSION}-alsa gstreamer${GSTREAMER_VERSION}-plugins-base \ +gstreamer${GSTREAMER_VERSION}-plugins-good gdb ${GLFW_PKG} liburiparser-dev \ +libpugixml-dev libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev \ +libxml2-dev \ +libwayland-dev wayland-protocols libxkbcommon-dev libxkbcommon-x11-dev \ +libdecor-0-dev x11proto-dev libglvnd-dev libegl1-mesa-dev libgles2-mesa-dev \ +mesa-utils" echo "installing OF dependencies" echo "OF needs to install the following packages using apt-get:" diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh index 3c8f3931ec1..e770e0dcb9f 100755 --- a/scripts/msys2/install_dependencies.sh +++ b/scripts/msys2/install_dependencies.sh @@ -43,7 +43,7 @@ done msyspackages="unzip make" # List of MINGW packages to be installed (without prefix) -mingwPackages="assimp cairo curl FreeImage \ +mingwPackages="assimp cairo curl freeimage \ glew glfw glm fmt zlib brotli libpng \ harfbuzz libsndfile libusb libxml2 mpg123 \ nlohmann-json openal opencv \