libjpeg

egnor · Dec 4, 2023 · 64f3992 · 64f3992
1 parent 41bcad5
commit 64f3992
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dev_setup.py b/dev_setup.py
@@ -34,7 +34,8 @@ def run_shell(*av, **kw):
 
 apt_packages = [
     # TODO: Make libudev and libv4l into Conan dependencies
-    "build-essential", "cmake", "direnv", "libudev-dev", "libv4l-dev",
+    "build-essential", "cmake", "direnv",
+    "libudev-dev", "libv4l-dev", "libjpeg-dev",  # libv4l2 depends on libjpeg
     "python3", "python3-pip", "python3-venv",
 ]
 installed = check_output(["dpkg-query", "--show", "--showformat=${Package}\\n"])

diff --git a/ffmpeg_rpi_recipe/conanfile.py b/ffmpeg_rpi_recipe/conanfile.py
@@ -272,7 +272,6 @@ def requirements(self):
         # Added for pivid --egnor
         if self.options.for_pivid:
             self.requires("libdrm/[>=2.4.114 <3]")
-            self.requires("libjpeg/9e")  # dep of libv4l2
 
         if self.options.with_zlib:
             self.requires("zlib/[>=1.2.11 <2]")
@@ -832,7 +831,7 @@ def package_info(self):
             # Added for pivid --egnor
             if self.options.for_pivid:
                 avcodec_cpp = self.cpp_info.components["avcodec"]
-                avcodec_cpp.requires.extend(["libdrm::libdrm"])  # "libjpeg"
+                avcodec_cpp.requires.extend(["libdrm::libdrm"])
                 avcodec_cpp.system_libs.extend(["udev", "v4l2"])
 
         if self.options.swscale: