From c406d55e699ae2d4436eab3db6064aa6ce28aadc Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 20 Feb 2021 19:41:06 +0000 Subject: [PATCH 1/2] vo-aacenc: init at 0.1.3 Signed-off-by: Arthur Gautier --- .../libraries/vo-aacenc/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/vo-aacenc/default.nix diff --git a/pkgs/development/libraries/vo-aacenc/default.nix b/pkgs/development/libraries/vo-aacenc/default.nix new file mode 100644 index 00000000000..fb8dd43fe03 --- /dev/null +++ b/pkgs/development/libraries/vo-aacenc/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "vo-aacenc"; + version = "0.1.3"; + + src = fetchurl { + url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; + sha256 = "sha256-5Rp0d6NZ8Y33xPgtGV2rThTnQUy9SM95zBlfxEaFDzY="; + }; + + meta = with lib; { + description = "VisualOn AAC encoder library"; + homepage = "https://sourceforge.net/projects/opencore-amr/"; + license = licenses.asl20; + maintainers = [ maintainers.baloo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d488a13b22..94c01fc3d17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8765,6 +8765,8 @@ in vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; + vo-aacenc = callPackage ../development/libraries/vo-aacenc { }; + vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; From 52eba2efb9818a238bee6eea274a54db9c2dafc4 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 20 Feb 2021 19:41:48 +0000 Subject: [PATCH 2/2] gst_all_1.gst-plugins-bad: adds voaacenc support Signed-off-by: Arthur Gautier --- pkgs/development/libraries/gstreamer/bad/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 313a063cae8..89011b9230f 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,10 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext -, config , pkg-config , python3 , gst-plugins-base @@ -81,6 +79,7 @@ , x265 , libxml2 , srt +, vo-aacenc }: assert faacSupport -> faac != null; @@ -99,6 +98,7 @@ in stdenv.mkDerivation rec { }; patches = [ + # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch ]; @@ -117,6 +117,8 @@ in stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc + # gobject-introspection has to be in both nativeBuildInputs and + # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection faad2 libass @@ -163,6 +165,7 @@ in stdenv.mkDerivation rec { libxml2 libintl srt + vo-aacenc ] ++ optionals enableZbar [ zbar ] ++ optionals faacSupport [ @@ -241,7 +244,6 @@ in stdenv.mkDerivation rec { "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing - "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support