From 043ac1fc2fef3769ae2ed44b6f00d02b6cd384c1 Mon Sep 17 00:00:00 2001 From: NickHardeman Date: Fri, 28 Feb 2025 21:55:02 -0500 Subject: [PATCH 1/4] Remove boost mentions from emscripten, macOS xcconfig, makefileCommon, msys2. --- .../project/emscripten/config.emscripten.default.mk | 1 - libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig | 8 -------- .../project/makefileCommon/config.linux.common.mk | 4 ---- .../project/msys2/config.msys2.default.mk | 2 -- 4 files changed, 15 deletions(-) diff --git a/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk b/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk index 59e285fae08..f2b1cf2061c 100644 --- a/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk +++ b/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk @@ -225,7 +225,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/graphics/ofCairoRende PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/gl/ofGLRenderer.cpp # third party PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glew/% -PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/include/boost/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/videoInput/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/% diff --git a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig index 5d6ca786855..a020eefff1f 100644 --- a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig @@ -55,14 +55,6 @@ OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -fra // -// BOOST can be enabled in OF Core by uncommenting this block -//HEADER_BOOST = "$(OF_PATH)/libs/boost/include" -//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a" -//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a" -//LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS) -//OF_CORE_LIBS = $(inherited) $(LIB_BOOST) -//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST) - ALWAYS_SEARCH_USER_PATHS = NO DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index c567cd83ce0..c31b10bd3d7 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -268,7 +268,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/FreeImage/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/assimp/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/rtAudio/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/% -PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glfw/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/curl/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/uriparser/% @@ -332,9 +331,6 @@ endif PLATFORM_LIBRARIES += freeimage ifeq ($(OF_USING_STD_FS),1) PLATFORM_LIBRARIES += stdc++fs -# else -# PLATFORM_LIBRARIES += boost_filesystem -# PLATFORM_LIBRARIES += boost_system endif PLATFORM_LIBRARIES += pugixml PLATFORM_LIBRARIES += uriparser diff --git a/libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk b/libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk index cc0ac0afcff..bb5e17076c0 100644 --- a/libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk +++ b/libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk @@ -190,7 +190,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/FreeImage/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glm/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/json/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/% -PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glfw/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/curl/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/pugixml/% @@ -234,7 +233,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/utf8/% PLATFORM_LIBRARIES += ksuser opengl32 gdi32 msimg32 glu32 dsound winmm strmiids #dxguid PLATFORM_LIBRARIES += uuid ole32 oleaut32 setupapi wsock32 ws2_32 Iphlpapi Comdlg32 PLATFORM_LIBRARIES += freeimage -# PLATFORM_LIBRARIES += boost_filesystem-mt boost_system-mt PLATFORM_LIBRARIES += mf mfplat mfuuid mfreadwrite # PLATFORM_LIBRARIES += glfw3 From 91a8f4a274a59af4660afc6f4824697b0744825c Mon Sep 17 00:00:00 2001 From: NickHardeman Date: Fri, 28 Feb 2025 21:55:40 -0500 Subject: [PATCH 2/4] remove boost from ci linux scripts. --- scripts/ci/linuxarmv7l/arch-bootstrap.sh | 2 +- scripts/ci/linuxarmv7l/arch-bootstrap_downloadonly.sh | 4 ++-- scripts/ci/linuxarmv7l/install.sh | 1 - scripts/ci/linuxrpi/multistrap.conf | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/ci/linuxarmv7l/arch-bootstrap.sh b/scripts/ci/linuxarmv7l/arch-bootstrap.sh index 2b68d7496a7..4e46b663f5e 100755 --- a/scripts/ci/linuxarmv7l/arch-bootstrap.sh +++ b/scripts/ci/linuxarmv7l/arch-bootstrap.sh @@ -32,7 +32,7 @@ DEFAULT_REPO_URL="http://mirrors.kernel.org/archlinux" DEFAULT_ARM_REPO_URL="http://mirror.archlinuxarm.org" PACMAN_PACKAGES_ARM=( -acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs coreutils bash grep gawk file tar systemd sed gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa mesa-libgl fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp boost cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv uriparser curl libxml2 pugixml libpsl icu +acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs coreutils bash grep gawk file tar systemd sed gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa mesa-libgl fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv uriparser curl libxml2 pugixml libpsl icu ) BASIC_PACKAGE_ARMS=(${PACMAN_PACKAGES_ARM[*]} filesystem) diff --git a/scripts/ci/linuxarmv7l/arch-bootstrap_downloadonly.sh b/scripts/ci/linuxarmv7l/arch-bootstrap_downloadonly.sh index 739c0a9b096..267d0c0196a 100755 --- a/scripts/ci/linuxarmv7l/arch-bootstrap_downloadonly.sh +++ b/scripts/ci/linuxarmv7l/arch-bootstrap_downloadonly.sh @@ -35,10 +35,10 @@ trap 'error ${LINENO}' ERR # Packages needed by pacman (see get-pacman-dependencies.sh) # PACMAN_PACKAGES=( -# acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp boost cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv glib2 pcre libsystemd filesystem libcap libffi libx11 xorg-server libsm libice libxinerama libxrandr libxext randrproto libxi inputproto glfw-x11 xineramaproto uriparser curl libxml2 pugixml orc libpsl icu +# acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv glib2 pcre libsystemd filesystem libcap libffi libx11 xorg-server libsm libice libxinerama libxrandr libxext randrproto libxi inputproto glfw-x11 xineramaproto uriparser curl libxml2 pugixml orc libpsl icu # ) PACMAN_PACKAGES=( -make pkg-config gcc raspberrypi-firmware linux-raspberrypi linux-raspberrypi-headers linux-firmware krb5 openal glew freeglut freeimage freetype2 cairo poco gstreamer gst-plugins-base gst-plugins-good assimp boost libxcursor opencv assimp glfw-x11 uriparser curl pugixml +make pkg-config gcc raspberrypi-firmware linux-raspberrypi linux-raspberrypi-headers linux-firmware krb5 openal glew freeglut freeimage freetype2 cairo poco gstreamer gst-plugins-base gst-plugins-good assimp libxcursor opencv assimp glfw-x11 uriparser curl pugixml ) BASIC_PACKAGES=(${PACMAN_PACKAGES[*]} ) EXTRA_PACKAGES=() diff --git a/scripts/ci/linuxarmv7l/install.sh b/scripts/ci/linuxarmv7l/install.sh index 6675f24407f..300bda5c939 100755 --- a/scripts/ci/linuxarmv7l/install.sh +++ b/scripts/ci/linuxarmv7l/install.sh @@ -114,7 +114,6 @@ createArchImg(){ gst-plugins-base \ gst-plugins-good \ assimp \ - boost \ libxcursor \ opencv \ assimp \ diff --git a/scripts/ci/linuxrpi/multistrap.conf b/scripts/ci/linuxrpi/multistrap.conf index 8f3008bdf4c..92c99fefee7 100644 --- a/scripts/ci/linuxrpi/multistrap.conf +++ b/scripts/ci/linuxrpi/multistrap.conf @@ -11,7 +11,6 @@ debootstrap=OpenFrameworks packages=libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev 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 libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev libblas-dev # g++ base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc -# libboost-filesystem-dev # libraspberrypi-dev raspberrypi-kernel-headers # libblas3 liblapack3 # libopenblas-dev liblapack-dev From 1a3b9eca2fd9d1cb55e3ed015b69f0c51cc83d49 Mon Sep 17 00:00:00 2001 From: NickHardeman Date: Fri, 28 Feb 2025 21:56:12 -0500 Subject: [PATCH 3/4] remove boost from dev scripts download and local_libs. --- scripts/dev/download_libs.sh | 2 +- scripts/dev/local_libs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index ce2888473f7..c107edf5970 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -338,7 +338,7 @@ cd download download "${PKGS[@]}" cd ../ # back to libs -libs=("boost" "cairo" "curl" "FreeImage" "brotli" "fmod" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "fmt") +libs=("cairo" "curl" "FreeImage" "brotli" "fmod" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "fmt") if [ $OVERWRITE -eq 1 ]; then echo " " echo " Overwrite - Removing prior libraries for [$PLATFORM]" diff --git a/scripts/dev/local_libs.sh b/scripts/dev/local_libs.sh index c3e5663264d..17673a4329d 100755 --- a/scripts/dev/local_libs.sh +++ b/scripts/dev/local_libs.sh @@ -216,7 +216,7 @@ cd libs if [ $OVERWRITE -eq 1 ]; then echo "Removing old libraries" - libs=("boost" "cairo" "curl" "FreeImage" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "README.md") + libs=("cairo" "curl" "FreeImage" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "README.md") for lib in $libs; do if [ -e $lib ]; then rm -rf $lib From 0048aa665e2e8e5f198bc7a845fd6147bdedb4b2 Mon Sep 17 00:00:00 2001 From: NickHardeman Date: Fri, 28 Feb 2025 21:56:43 -0500 Subject: [PATCH 4/4] remove boost from linux install_dependencies. --- scripts/linux/archlinux/install_dependencies.sh | 2 +- scripts/linux/archlinux_armv7/install_dependencies.sh | 2 +- scripts/linux/chip/install_dependencies.sh | 2 +- scripts/linux/debian/install_dependencies.sh | 2 +- scripts/linux/el6/install_dependencies.sh | 2 +- scripts/linux/fedora/install_dependencies.sh | 2 +- scripts/linux/ubuntu/install_dependencies.sh | 6 ------ 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/scripts/linux/archlinux/install_dependencies.sh b/scripts/linux/archlinux/install_dependencies.sh index 99c97c92695..e889a912d0c 100755 --- a/scripts/linux/archlinux/install_dependencies.sh +++ b/scripts/linux/archlinux/install_dependencies.sh @@ -11,7 +11,7 @@ fi ROOT=$(cd $(dirname $0); pwd -P) -pacman -S --needed make pkgconf gcc openal glew freeglut freeimage gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav opencv libxcursor assimp boost glfw-x11 uriparser curl pugixml rtaudio poco brotli +pacman -S --needed make pkgconf gcc openal glew freeglut freeimage gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav opencv libxcursor assimp glfw-x11 uriparser curl pugixml rtaudio poco brotli exit_code=$? if [ $exit_code != 0 ]; then diff --git a/scripts/linux/archlinux_armv7/install_dependencies.sh b/scripts/linux/archlinux_armv7/install_dependencies.sh index 8201b8acc1c..477afe3108a 100755 --- a/scripts/linux/archlinux_armv7/install_dependencies.sh +++ b/scripts/linux/archlinux_armv7/install_dependencies.sh @@ -15,7 +15,7 @@ fi ROOT=$(cd $(dirname $0); pwd -P) -pacman -S --needed make pkg-config gcc openal glew freeglut freeimage freetype2 cairo poco gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav raspberrypi-firmware gst-omx-rpi assimp boost libxcursor opencv assimp glfw-x11 uriparser curl pugixml brotli +pacman -S --needed make pkg-config gcc openal glew freeglut freeimage freetype2 cairo poco gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav raspberrypi-firmware gst-omx-rpi assimp libxcursor opencv assimp glfw-x11 uriparser curl pugixml brotli downloader http://ci.openframeworks.cc/rtaudio-armv7hf.tar.bz2 tar xjf rtaudio-armv7hf.tar.bz2 -C / diff --git a/scripts/linux/chip/install_dependencies.sh b/scripts/linux/chip/install_dependencies.sh index 36821a76396..b6427ca4a0f 100755 --- a/scripts/linux/chip/install_dependencies.sh +++ b/scripts/linux/chip/install_dependencies.sh @@ -37,7 +37,7 @@ fi echo "installing OF dependencies" -apt-get install freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ 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 libassimp-dev librtaudio-dev libboost-filesystem-dev libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev brotli +apt-get install freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ 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 libassimp-dev librtaudio-dev libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev brotli exit_code=$? if [ $exit_code != 0 ]; then echo "error installing dependencies, there could be an error with your internet connection" diff --git a/scripts/linux/debian/install_dependencies.sh b/scripts/linux/debian/install_dependencies.sh index 25800d56014..86a516645c1 100755 --- a/scripts/linux/debian/install_dependencies.sh +++ b/scripts/linux/debian/install_dependencies.sh @@ -37,7 +37,7 @@ 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 libboost-filesystem-dev libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libpoco-dev libgconf-2-4 brotli +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 exit_code=$? if [ $exit_code != 0 ]; then echo "error installing dependencies, there could be an error with your internet connection" diff --git a/scripts/linux/el6/install_dependencies.sh b/scripts/linux/el6/install_dependencies.sh index 6c52c44e42a..0b5b65485a8 100755 --- a/scripts/linux/el6/install_dependencies.sh +++ b/scripts/linux/el6/install_dependencies.sh @@ -12,7 +12,7 @@ fi ROOT=$(cd $(dirname $0); pwd -P) -yum 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 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 boost-devel gtk3-devel glfw-devel uriparser-devel curl-devel pugixml-devel brotli +yum 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 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 brotli exit_code=$? if [ $exit_code != 0 ]; then diff --git a/scripts/linux/fedora/install_dependencies.sh b/scripts/linux/fedora/install_dependencies.sh index 098e77b4163..1f1eee4532b 100755 --- a/scripts/linux/fedora/install_dependencies.sh +++ b/scripts/linux/fedora/install_dependencies.sh @@ -14,7 +14,7 @@ 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 boost-devel gtk3-devel glfw-devel uriparser-devel curl-devel pugixml-devel poco-devel brotli +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 exit_code=$? if [ $exit_code != 0 ]; then diff --git a/scripts/linux/ubuntu/install_dependencies.sh b/scripts/linux/ubuntu/install_dependencies.sh index bc837655ae4..43c395428cf 100755 --- a/scripts/linux/ubuntu/install_dependencies.sh +++ b/scripts/linux/ubuntu/install_dependencies.sh @@ -87,17 +87,12 @@ if [ $MAJOR_VERSION -lt 12 ]; then elif [ $MAJOR_VERSION -lt 13 ]; then add-apt-repository ppa:ubuntu-toolchain-r/test --yes add-apt-repository ppa:gstreamer-developers/ppa --yes - # add-apt-repository ppa:boost-latest/ppa --yes CXX_VER=-4.9 - # BOOST_VER=1.55 elif [[ $MAJOR_VERSION -lt 14 || ($MAJOR_VERSION -eq 14 && $MINOR_VERSION -eq 4) ]]; then add-apt-repository ppa:ubuntu-toolchain-r/test --yes - # add-apt-repository ppa:boost-latest/ppa --yes CXX_VER=-4.9 - # BOOST_VER=1.55 else CXX_VER= - # BOOST_VER= fi apt-get update @@ -193,7 +188,6 @@ 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" -# libgconf-2-4 libboost-filesystem${BOOST_VER}-dev echo "installing OF dependencies" echo "OF needs to install the following packages using apt-get:"