libmegapixels: 2024-05-11 -> 2024-05-18 and patch some observed errors
not enough that it works completely though
This commit is contained in:
parent
631e0db7b4
commit
38c2db0333
|
@ -1,5 +1,6 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
|
, fetchpatch
|
||||||
, lib
|
, lib
|
||||||
, libconfig
|
, libconfig
|
||||||
, glib
|
, glib
|
||||||
|
@ -9,15 +10,29 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "libmegapixels";
|
pname = "libmegapixels";
|
||||||
version = "0.1.0-unstable-2024-05-11";
|
version = "0.1.0-unstable-2024-05-18";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "megapixels-org";
|
owner = "megapixels-org";
|
||||||
repo = "libmegapixels";
|
repo = "libmegapixels";
|
||||||
rev = "4da88c662bea868574f9ee670231288cc94d9a36";
|
rev = "b3249721d22cb6047d6037309c7db6d9927be3d4";
|
||||||
hash = "sha256-KF0kBQmUCvXXFG7TYn7zb2UkrvphTZpJJfxlTRWaFVE=";
|
hash = "sha256-OdZFaS+suYLmGugm/BIsgMRMkMvbmnP0CiNgel4lrjs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "load_camera: initialize with `calloc` to avoid uninitialized reads";
|
||||||
|
url = "https://git.uninsane.org/colin/libmegapixels/commit/dec641dc510221a50f3d30bbd1bfd82ec8d17621.patch";
|
||||||
|
hash = "sha256-c8KrFDWfekk+mqf03IEynfCPd+sVyxphG/0RWSdZZqQ=";
|
||||||
|
})
|
||||||
|
# (fetchpatch {
|
||||||
|
# # not actually necessary: video_path is INTENDED to never be NULL (as part of initialization)
|
||||||
|
# name = "pipeline: NULL check against video_path before using it";
|
||||||
|
# url = "https://git.uninsane.org/colin/libmegapixels/commit/07afaaebc6b6bb51641dc5777d9563e337a45672.patch";
|
||||||
|
# hash = "sha256-fNJKgI6rjNdGRiO0O4Runfd72bfhjUrxu4zABKBeKNs=";
|
||||||
|
# })
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
|
Loading…
Reference in New Issue
Block a user