From e3802695c8d5f610b871a51d47330c40a2ec5676 Mon Sep 17 00:00:00 2001 From: betaboon Date: Sun, 2 Apr 2023 20:28:17 +0200 Subject: [PATCH] gst_all_1.icamerasrc: 20221209 -> 2023-03-09 --- .../libraries/gstreamer/default.nix | 22 +++++++++++++++++-- .../gstreamer/icamerasrc/default.nix | 12 ++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 69ee36149776..9acad3fb6244 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,19 @@ -{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }: +{ callPackage +, AVFoundation +, AudioToolbox +, Cocoa +, CoreFoundation +, CoreMedia +, CoreServices +, CoreVideo +, DiskArbitration +, Foundation +, IOKit +, MediaToolbox +, OpenGL +, VideoToolbox +, ipu6ep-camera-hal +}: { gstreamer = callPackage ./core { inherit CoreServices; }; @@ -25,7 +40,10 @@ gst-vaapi = callPackage ./vaapi { }; - icamerasrc = callPackage ./icamerasrc { }; + icamerasrc-ipu6 = callPackage ./icamerasrc { }; + icamerasrc-ipu6ep = callPackage ./icamerasrc { + ipu6-camera-hal = ipu6ep-camera-hal; + }; # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index d67f646b2b62..f7ef0018cb25 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - pname = "icamerasrc"; - version = "20221209"; + pname = "icamerasrc-${ipu6-camera-hal.ipuVersion}"; + version = "unstable-2023-03-09"; src = fetchFromGitHub { owner = "intel"; repo = "icamerasrc"; - rev = "refs/tags/rpl_plat_${version}_pv"; - hash = "sha256-qlV363l4tUjUAa1LiZQq55byKpz1tLESKAXEmgiYHVo="; + rev = "17841ab6249aaa69bd9b3959262bf182dee74111"; + hash = "sha256-j8ZYe4nyy5yfo10CGeXDwbAaAPvdr0ptMWB8hQDyESQ="; }; nativeBuildInputs = [ @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + inherit (ipu6-camera-hal) ipuVersion; + }; + meta = with lib; { description = "GStreamer Plugin for MIPI camera support through the IPU6/IPU6EP/IPU6SE on Intel Tigerlake/Alderlake/Jasperlake platforms"; homepage = "https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api";