From 1efef6b10b747682c96f99fc337ff2cc863b422d Mon Sep 17 00:00:00 2001 From: Adam Copp Date: Wed, 7 Mar 2018 11:04:29 +0000 Subject: [PATCH 1/3] Add vo-amrwbenc library package. With some changes to ffmpeg build file, this enables ffmpeg to perform AMR-WB encoding. --- .../libraries/vo-amrwbenc/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/vo-amrwbenc/default.nix diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix new file mode 100644 index 00000000000..7a6089722c0 --- /dev/null +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, autoreconfHook }: + +let + version = "0.1.3"; +in +stdenv.mkDerivation { + name = "vo-amrwbenc-${version}"; + version = "0.1.3"; + buildInputs = [ autoreconfHook ]; + src = fetchurl { + url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz"; + sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c"; + }; + + meta = { + homepage = "http://sourceforge.net/projects/opencore-amr/"; + description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; + license = "stdenv.lib.licenses.apache"; + maintainers = [ stdenv.lib.maintainers.esteth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5c017f8d93..5e0f334408d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5222,6 +5222,8 @@ with pkgs; vncrec = callPackage ../tools/video/vncrec { }; + vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; + vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; From 2040e4c2f8733b30888dc7a2bd2abff40d55bc23 Mon Sep 17 00:00:00 2001 From: Adam Copp Date: Wed, 7 Mar 2018 16:32:25 +0000 Subject: [PATCH 2/3] Fix maintainer list --- maintainers/maintainer-list.nix | 4 ++++ pkgs/development/libraries/vo-amrwbenc/default.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 134ec56788e..41e09ec09f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -63,6 +63,10 @@ github = "DmitryTsygankov"; name = "Dmitry Tsygankov"; }; + Esteth = { + email = "adam.copp@gmail.com"; + name = "Adam Copp"; + }; FireyFly = { email = "nix@firefly.nu"; github = "FireyFly"; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index 7a6089722c0..70c5b5bda3e 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { homepage = "http://sourceforge.net/projects/opencore-amr/"; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = "stdenv.lib.licenses.apache"; - maintainers = [ stdenv.lib.maintainers.esteth ]; + maintainers = [ stdenv.lib.maintainers.Esteth ]; }; } From e46b27cc90e0b6795e61605e96dd91d501721d09 Mon Sep 17 00:00:00 2001 From: Adam Copp Date: Mon, 19 Mar 2018 15:55:06 +0000 Subject: [PATCH 3/3] Add platform to vo-amrwbenc --- pkgs/development/libraries/vo-amrwbenc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index 70c5b5bda3e..ba6e437ca3c 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = "stdenv.lib.licenses.apache"; maintainers = [ stdenv.lib.maintainers.Esteth ]; + platforms = stdenv.lib.platforms.unix; }; }