Skip to content

rocmPackages.mivisionx{-hip,-cpu}: remove libjpeg_turbo input #448970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnRTitor merged 1 commit into from
Oct 17, 2025
Merged

rocmPackages.mivisionx{-hip,-cpu}: remove libjpeg_turbo input #448970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 0 additions & 104 deletions pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions pkgs/development/rocm-modules/6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
fetchFromGitHub,
boost179,
opencv,
libjpeg_turbo,
python3Packages,
openmpi,
stdenv,
Expand Down Expand Up @@ -197,19 +196,6 @@ let
mivisionx = self.callPackage ./mivisionx {
stdenv = origStdenv;
opencv = opencv.override { enablePython = true; };
# Unfortunately, rocAL needs a custom libjpeg-turbo until further notice
# See: https://github.com/ROCm/MIVisionX/issues/1051
libjpeg_turbo = libjpeg_turbo.overrideAttrs {
version = "2.0.6.1";
src = fetchFromGitHub {
owner = "rrawther";
repo = "libjpeg-turbo";
rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb";
sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY=";
};
# overwrite all patches, since patches for newer version do not apply
patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ];
};
};

mivisionx-hip = self.mivisionx.override {
Expand Down
7 changes: 0 additions & 7 deletions pkgs/development/rocm-modules/6/mivisionx/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
opencv,
ffmpeg,
boost,
libjpeg_turbo,
half,
lmdb,
rapidjson,
Expand Down Expand Up @@ -76,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
opencv
ffmpeg
boost
libjpeg_turbo
lmdb
rapidjson
python3Packages.pybind11
Expand Down Expand Up @@ -115,11 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
];

postPatch = ''
# Properly find turbojpeg
substituteInPlace cmake/FindTurboJpeg.cmake \
--replace-fail "\''${TURBO_JPEG_PATH}/include" "${libjpeg_turbo.dev}/include" \
--replace-fail "\''${TURBO_JPEG_PATH}/lib" "${libjpeg_turbo.out}/lib"

${lib.optionalString (!useOpenCL && !useCPU) ''
# Properly find miopen
substituteInPlace amd_openvx_extensions/CMakeLists.txt \
Expand Down
Loading