mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-01-27 17:08:36 +00:00
cmake: Remove unused ffmpeg dependency
This commit is contained in:
Bailey Morgan
parent
d808aabaae
commit
20cb556f6d
|
|
@ -173,7 +173,7 @@ debian:bullseye:container_prep:
|
|||
- .fdo.container-build@debian # from ci-templates
|
||||
|
||||
variables:
|
||||
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates clang-format cmake codespell curl debhelper devscripts doxygen dput-ng gettext-base git glslang-tools graphviz libavcodec-dev libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 python3-click python3-pip unzip wget'
|
||||
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates clang-format cmake codespell curl debhelper devscripts doxygen dput-ng gettext-base git glslang-tools graphviz libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 python3-click python3-pip unzip wget'
|
||||
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/i386_and_proclamation_container_prep.sh'
|
||||
|
||||
# Make Debian bookworm-ndk image
|
||||
|
|
@ -197,7 +197,7 @@ ubuntu:focal:container_prep:
|
|||
- .fdo.container-build@ubuntu # from ci-templates
|
||||
|
||||
variables:
|
||||
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-dev libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 unzip wget'
|
||||
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 unzip wget'
|
||||
|
||||
# Make Ubuntu jammy image
|
||||
ubuntu:jammy:container_prep:
|
||||
|
|
@ -208,7 +208,7 @@ ubuntu:jammy:container_prep:
|
|||
- .fdo.container-build@ubuntu # from ci-templates
|
||||
|
||||
variables:
|
||||
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-dev libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 reprepro unzip wget'
|
||||
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 reprepro unzip wget'
|
||||
|
||||
# Make Arch image
|
||||
arch:container_prep:
|
||||
|
|
@ -219,7 +219,7 @@ arch:container_prep:
|
|||
- .fdo.container-build@arch # from ci-templates
|
||||
|
||||
variables:
|
||||
FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen ffmpeg fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt6-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber'
|
||||
FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt6-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber'
|
||||
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/install-arch-additional-deps.sh'
|
||||
|
||||
# Make Alpine image
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ fdo_ci_templates_sha: 185ede0e9b9b1924b92306ab8b882a6294e92613
|
|||
libhidapi-dev:
|
||||
libwayland-dev:
|
||||
libuvc-dev:
|
||||
libavcodec-dev:
|
||||
libopencv-dev:
|
||||
libv4l-dev:
|
||||
libcjson-dev:
|
||||
|
|
@ -212,7 +211,6 @@ distributions:
|
|||
diffutils:
|
||||
doxygen:
|
||||
eigen:
|
||||
ffmpeg:
|
||||
gcc:
|
||||
git:
|
||||
glfw-x11:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ for arch in $CROSS_ARCHITECTURES; do
|
|||
apt-get install -y --no-install-recommends --no-remove \
|
||||
crossbuild-essential-${arch} \
|
||||
libelf-dev:${arch} \
|
||||
libavcodec-dev:${arch} \
|
||||
libegl1-mesa-dev:${arch} \
|
||||
libgl1-mesa-dev:${arch} \
|
||||
libglvnd-dev:${arch} \
|
||||
|
|
|
|||
|
|
@ -148,9 +148,6 @@ endif()
|
|||
if(PKGCONFIG_FOUND AND NOT ANDROID)
|
||||
# @TODO Turn into a find_package LIBUVC file.
|
||||
pkg_check_modules(LIBUVC libuvc)
|
||||
|
||||
# @TODO Turn into a find_package FFMPEG file.
|
||||
pkg_check_modules(FFMPEG libavcodec)
|
||||
endif()
|
||||
|
||||
find_package(OpenGL)
|
||||
|
|
@ -313,7 +310,6 @@ option_with_deps(XRT_INSTALL_ABSOLUTE_SYSTEMD_UNIT_FILES "Use an absolute path t
|
|||
|
||||
# Driver deps to use (sorted, though there are some internal dependencies)
|
||||
option_with_deps(XRT_HAVE_BLUETOOTH "Enable Bluetooth (legacy, non-ble)" DEPENDS BLUETOOTH_FOUND)
|
||||
option_with_deps(XRT_HAVE_FFMPEG "Enable ffmpeg testing video driver" DEPENDS FFMPEG_FOUND)
|
||||
option_with_deps(XRT_HAVE_GST "Enable gstreamer" DEPENDS GST_FOUND)
|
||||
option_with_deps(XRT_HAVE_HIDAPI "Enable libhidapi (used for PSVR)" DEPENDS HIDAPI_FOUND)
|
||||
option_with_deps(XRT_HAVE_JPEG "Enable jpeg code (used for some video drivers)" DEPENDS JPEG_FOUND)
|
||||
|
|
@ -597,7 +593,6 @@ message(STATUS "# D3D11: ${XRT_HAVE_D3D11}")
|
|||
message(STATUS "# D3D12: ${XRT_HAVE_D3D12}")
|
||||
message(STATUS "# DBUS: ${XRT_HAVE_DBUS}")
|
||||
message(STATUS "# EGL: ${XRT_HAVE_EGL}")
|
||||
message(STATUS "# FFMPEG: ${XRT_HAVE_FFMPEG}")
|
||||
message(STATUS "# GST (GStreamer): ${XRT_HAVE_GST}")
|
||||
message(STATUS "# HIDAPI: ${XRT_HAVE_HIDAPI}")
|
||||
message(STATUS "# JPEG: ${XRT_HAVE_JPEG}")
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ Truly optional dependencies, useful for some drivers, app support, etc.:
|
|||
* libhidapi - Debian/Ubuntu package ´libhidapi-dev´
|
||||
* OpenCV
|
||||
* libuvc - Debian/Ubuntu package ´libuvc-dev´
|
||||
* ffmpeg
|
||||
* libjpeg
|
||||
* libbluetooth - Debian/Ubuntu package ´libbluetooth-dev´
|
||||
* libsdl - Debian/Ubuntu package ´libsdl2-dev´
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@
|
|||
{ symbol: ["XRT_HAVE_DBUS", "public", "\"xrt/xrt_config_have.h\"", "public"] },
|
||||
{ symbol: ["XRT_HAVE_DXGI", "public", "\"xrt/xrt_config_have.h\"", "public"] },
|
||||
{ symbol: ["XRT_HAVE_EGL", "public", "\"xrt/xrt_config_have.h\"", "public"] },
|
||||
{ symbol: ["XRT_HAVE_FFMPEG", "public", "\"xrt/xrt_config_have.h\"", "public"] },
|
||||
{ symbol: ["XRT_HAVE_GST", "public", "\"xrt/xrt_config_have.h\"", "public"] },
|
||||
{ symbol: ["XRT_HAVE_HIDAPI", "public", "\"xrt/xrt_config_have.h\"", "public"] },
|
||||
{ symbol: ["XRT_HAVE_JPEG", "public", "\"xrt/xrt_config_have.h\"", "public"] },
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#cmakedefine XRT_HAVE_DBUS
|
||||
#cmakedefine XRT_HAVE_DXGI
|
||||
#cmakedefine XRT_HAVE_EGL
|
||||
#cmakedefine XRT_HAVE_FFMPEG
|
||||
#cmakedefine XRT_HAVE_GST
|
||||
#cmakedefine XRT_HAVE_HIDAPI
|
||||
#cmakedefine XRT_HAVE_JPEG
|
||||
|
|
|
|||
Loading…
Reference in a new issue