mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-22 03:53:47 +00:00
Merge pull request #285797 from atorres1985-contrib/openh264
openh264: 2.4.0 -> 2.4.1
This commit is contained in:
commit
a174c73d7d
48
pkgs/by-name/op/openh264/package.nix
Normal file
48
pkgs/by-name/op/openh264/package.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gtest
|
||||
, meson
|
||||
, nasm
|
||||
, ninja
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, windows
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openh264";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cisco";
|
||||
repo = "openh264";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
nasm
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtest
|
||||
] ++ lib.optionals stdenv.hostPlatform.isWindows [
|
||||
windows.pthreads
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.openh264.org";
|
||||
description = "A codec library which supports H.264 encoding and decoding";
|
||||
changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}";
|
||||
license = with lib.licenses; [ bsd2 ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix ++ lib.platforms.windows;
|
||||
};
|
||||
})
|
@ -1,33 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nasm, windows }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openh264";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cisco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vPVHXATsSWmqKOAj09WRR5jCi2NU2lq0j4K15KBzARY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nasm ];
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads;
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"ARCH=${stdenv.hostPlatform.linuxArch}"
|
||||
] ++ lib.optional stdenv.hostPlatform.isWindows "OS=mingw_nt";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "stackprotector";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A codec library which supports H.264 encoding and decoding";
|
||||
homepage = "https://www.openh264.org";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -24238,8 +24238,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel;
|
||||
};
|
||||
|
||||
openh264 = callPackage ../development/libraries/openh264 { };
|
||||
|
||||
openjpeg = callPackage ../development/libraries/openjpeg { };
|
||||
|
||||
openpa = callPackage ../development/libraries/openpa { };
|
||||
|
Loading…
Reference in New Issue
Block a user