octavePackages.video: 2.0.2 -> 2.1.1
Includes fixes for FFmpeg 7.
This commit is contained in:
parent
2f5176c2b4
commit
b2b7066b25
@ -1,18 +1,20 @@
|
|||||||
{ buildOctavePackage
|
{ buildOctavePackage
|
||||||
, stdenv
|
, stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchurl
|
, fetchFromGitHub
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ffmpeg_4
|
, ffmpeg_7
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildOctavePackage rec {
|
buildOctavePackage rec {
|
||||||
pname = "video";
|
pname = "video";
|
||||||
version = "2.0.2";
|
version = "2.1.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
owner = "Andy1978";
|
||||||
sha256 = "sha256-bZNaRnmJl5UF0bQMNoEWvoIXJaB0E6/V9eChE725OHY=";
|
repo = "octave-video";
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-JFySAu/3lCnfuFMNGYPzX2MqhsRi1+IyJQBcKB9vCo0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -20,7 +22,7 @@ buildOctavePackage rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
ffmpeg_4
|
ffmpeg_7
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
@ -28,7 +30,5 @@ buildOctavePackage rec {
|
|||||||
license = with licenses; [ gpl3Plus bsd3 ];
|
license = with licenses; [ gpl3Plus bsd3 ];
|
||||||
maintainers = with maintainers; [ KarlJoad ];
|
maintainers = with maintainers; [ KarlJoad ];
|
||||||
description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
|
description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
|
||||||
# error: declaration of 'panic' has a different language linkage
|
|
||||||
broken = stdenv.isDarwin;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user