2 files changed, 9 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 2511cf0f20a5..556dd5f10619 100644
--- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , pulseaudio
 , pkgconfig
-, ffmpeg_4
+, ffmpeg
 , patchelf
 , fdk_aac
 , libtool
@@ -24,18 +24,17 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "pulseaudio-modules-bt";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "EHfive";
     repo = "pulseaudio-modules-bt";
     rev = "v${version}";
-    sha256 = "00xmidcw4fvpbmg0nsm2gk5zw26fpyjbc0pjk6mzr570zbnyqqbn";
+    sha256 = "0bzg6x405j39axnkvc6n6vkl1hv1frk94y1i9sl170081bk23asd";
   };
 
   patches = [
     ./fix-install-path.patch
-    ./fix-aac-defaults.patch
   ];
 
   nativeBuildInputs = [
@@ -46,7 +45,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     pulseaudio
-    ffmpeg_4
+    ffmpeg
     fdk_aac
     libtool
     ldacbt
@@ -63,13 +62,17 @@ in stdenv.mkDerivation rec {
     # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
     substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
     substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}
+
+    # Fraunhofer recommends to enable afterburner but upstream has it set to false by default
+    substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \
+      --replace "info->aac_afterburner = false;" "info->aac_afterburner = true;"
   '';
 
   postFixup = ''
     for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
       orig_rpath=$(patchelf --print-rpath "$so")
       patchelf \
-        --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
+        --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
         "$so"
     done
   '';
diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
deleted file mode 100644
index c94c5dd61f26..000000000000
--- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/modules/bluetooth/a2dp/a2dp_aac.c b/src/modules/bluetooth/a2dp/a2dp_aac.c
-index 394a7a0..cf5abaf 100644
---- a/src/modules/bluetooth/a2dp/a2dp_aac.c
-+++ b/src/modules/bluetooth/a2dp/a2dp_aac.c
-@@ -90,8 +90,8 @@ pa_aac_encoder_init(pa_a2dp_source_read_cb_t read_cb, pa_a2dp_source_read_buf_fr
-     info->read_pcm = read_cb;
-     info->read_buf_free = free_cb;
-     info->aacenc_handle_opened = false;
--    info->aac_enc_bitrate_mode = 5;
--    info->aac_afterburner = false;
-+    info->aac_enc_bitrate_mode = 0;
-+    info->aac_afterburner = true;
-     info->force_pa_fmt = PA_SAMPLE_INVALID;
-     return true;
- }