Skip to content
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.

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

librealsense: 2.38.0 -> 2.40.0 #105297

Merged
merged 1 commit into from Nov 29, 2020
Merged

librealsense: 2.38.0 -> 2.40.0 #105297

merged 1 commit into from Nov 29, 2020

Conversation

@freezeboy
Copy link
Contributor

@freezeboy freezeboy commented Nov 28, 2020

Motivation for this change

Upstream update

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Copy link
Contributor

@brian-dawn brian-dawn left a comment

Looks good to me!

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 29, 2020

Result of nixpkgs-review pr 105297 run on x86_64-darwin 1

4 packages marked as broken and skipped:
  • librealsenseWithCuda
  • python27Packages.pyrealsense2WithCuda
  • python37Packages.pyrealsense2WithCuda
  • python38Packages.pyrealsense2WithCuda
4 packages failed to build:
  • librealsense (librealsenseWithoutCuda)
  • python27Packages.pyrealsense2 (python27Packages.pyrealsense2WithoutCuda)
  • python37Packages.pyrealsense2 (python37Packages.pyrealsense2WithoutCuda)
  • python38Packages.pyrealsense2 (python38Packages.pyrealsense2WithoutCuda)
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/snprlldb22zhp5r87nywbxvgmwgca0cl-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
@nix { "action": "setPhase", "phase": "configurePhase" }
configuring
fixing cmake files...
cmake flags: -GNinja -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DBUILD_TESTING=OFF -DCMAKE_INSTALL_LOCALEDIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/share/locale -DCMAKE_INSTALL_LIBEXECDIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/libexec -DCMAKE_INSTALL_LIBDIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/lib -DCMAKE_INSTALL_DOCDIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/share/doc/librealsense2 -DCMAKE_INSTALL_INFODIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/share/info -DCMAKE_INSTALL_MANDIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/share/man -DCMAKE_INSTALL_OLDINCLUDEDIR=/nix/store/k9ky085kgg6giij51cz2q0i5zz301imz-librealsense-2.40.0-dev/include -DCMAKE_INSTALL_INCLUDEDIR=/nix/store/k9ky085kgg6giij51cz2q0i5zz301imz-librealsense-2.40.0-dev/include -DCMAKE_INSTALL_SBINDIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/sbin -DCMAKE_INSTALL_BINDIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/bin -DCMAKE_INSTALL_NAME_DIR=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0/lib -DCMAKE_POLICY_DEFAULT_CMP0025=NEW -DCMAKE_OSX_SYSROOT= -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_STRIP=/nix/store/l5707pca91sq99fd5fq4x84302zssyjj-cctools-binutils-darwin-949.0.1/bin/strip -DCMAKE_RANLIB=/nix/store/l5707pca91sq99fd5fq4x84302zssyjj-cctools-binutils-darwin-949.0.1/bin/ranlib -DCMAKE_AR=/nix/store/l5707pca91sq99fd5fq4x84302zssyjj-cctools-binutils-darwin-949.0.1/bin/ar -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_INSTALL_PREFIX=/nix/store/ayi7ikb4p17wn0cpzhfa74lzqc4nlqp8-librealsense-2.40.0 -DBUILD_EXAMPLES=ON -DBUILD_GRAPHICAL_EXAMPLES=OFF -DBUILD_GLSL_EXTENSIONS=OFF 
-- The CXX compiler identification is Clang 7.1.0
-- The C compiler identification is Clang 7.1.0
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /nix/store/b2qvdc4738nl7d8bn6d5gb6p9s34c78v-clang-wrapper-7.1.0/bin/clang++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /nix/store/b2qvdc4738nl7d8bn6d5gb6p9s34c78v-clang-wrapper-7.1.0/bin/clang - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Checking internet connection...
-- Failed to identify Internet connection
CMake Warning at CMakeLists.txt:16 (message):
  No internet connection, disabling BUILD_WITH_TM2


CMake Warning at CMakeLists.txt:22 (message):
  No internet connection, disabling IMPORT_DEPTH_CAM_FW


-- Info: REALSENSE_VERSION_STRING=2.40.0
-- Performing Test COMPILER_SUPPORTS_CXX11
-- Performing Test COMPILER_SUPPORTS_CXX11 - Success
-- Performing Test COMPILER_SUPPORTS_CXX0X
-- Performing Test COMPILER_SUPPORTS_CXX0X - Success
-- Setting Unix configurations
-- using RS2_USE_LIBUVC_BACKEND
-- Found usb: /nix/store/67v7kjgi9mcyi2i9yh9f22rkpvdxqgi9-libusb-1.0.23/lib/libusb-1.0.dylib  
CMake Error at src/tm2/CMakeLists.txt:16 (message):
  BUILD_WITH_TM2 requires IMPORT_DEPTH_CAM_FW
Call Stack (most recent call first):
  src/CMakeLists.txt:57 (include)
  CMakeLists.txt:56 (include)


-- Looking for pthread.h
-- Looking for pthread.h - found
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
-- Found Threads: TRUE  
-- Could NOT find apriltag (missing: APRILTAG_INC APRILTAG_LIB) 
-- Unable to find apriltag library, skipping pose-apriltag example
-- Building with TM2
-- Configuring incomplete, errors occurred!
See also "/tmp/nix-build-librealsense-2.40.0.drv-0/source/build/CMakeFiles/CMakeOutput.log".

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 29, 2020

Result of nixpkgs-review pr 105297 run on x86_64-linux 1

8 packages built:
  • librealsense (librealsenseWithoutCuda)
  • librealsenseWithCuda
  • python27Packages.pyrealsense2 (python27Packages.pyrealsense2WithoutCuda)
  • python27Packages.pyrealsense2WithCuda
  • python37Packages.pyrealsense2 (python37Packages.pyrealsense2WithoutCuda)
  • python37Packages.pyrealsense2WithCuda
  • python38Packages.pyrealsense2 (python38Packages.pyrealsense2WithoutCuda)
  • python38Packages.pyrealsense2WithCuda

Copy link
Contributor

@jonringer jonringer left a comment

LGTM

Result of nixpkgs-review pr 105297 1

8 packages built:
  • librealsense (librealsenseWithoutCuda)
  • librealsenseWithCuda
  • python27Packages.pyrealsense2 (python27Packages.pyrealsense2WithoutCuda)
  • python27Packages.pyrealsense2WithCuda
  • python37Packages.pyrealsense2 (python37Packages.pyrealsense2WithoutCuda)
  • python37Packages.pyrealsense2WithCuda
  • python38Packages.pyrealsense2 (python38Packages.pyrealsense2WithoutCuda)
  • python38Packages.pyrealsense2WithCuda

@jonringer jonringer merged commit 72b87b7 into NixOS:master Nov 29, 2020
19 checks passed
@freezeboy freezeboy deleted the update-realsense branch Nov 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants