mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-29 16:57:40 +03:00
Merge pull request #281755 from jpds/libcamera-0.2.0
libcamera: 0.1.0 → 0.2.0
This commit is contained in:
commit
2d68da8a52
@ -1,6 +1,5 @@
|
||||
{ stdenv
|
||||
, fetchgit
|
||||
, fetchpatch
|
||||
, lib
|
||||
, meson
|
||||
, ninja
|
||||
@ -22,25 +21,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcamera";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.libcamera.org/libcamera/libcamera.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-icHZtv25QvJEv0DlELT3cDxho3Oz2BJAMNKr5W4bshk=";
|
||||
hash = "sha256-x0Im9m9MoACJhQKorMI34YQ+/bd62NdAPc2nWwaJAvM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5
|
||||
name = "libcamera-sphinx7.0-compat.patch";
|
||||
url = "https://git.libcamera.org/libcamera/libcamera.git/patch/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5";
|
||||
hash = "sha256-gs0EiT3gWlmRjDim+o2C0VmnoWqEouP5pNTD4XbNSdE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs utils/
|
||||
'';
|
||||
|
@ -105,6 +105,14 @@ let
|
||||
./0060-libjack-path.patch
|
||||
# Move installed tests into their own output.
|
||||
./0070-installed-tests-path.patch
|
||||
|
||||
# Remove for release post 1.0.1:
|
||||
(fetchpatch {
|
||||
# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1750
|
||||
name = "pipewire-spa-libcamera-use-cameraconfiguration-orientation-pr1750.patch";
|
||||
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1750.patch ";
|
||||
hash = "sha256-Ugg913KZDKELnYLwpDEgYh92YPxccw61l6kAJulBbIA=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
Loading…
Reference in New Issue
Block a user