From 24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 10:15:15 +0200 Subject: [PATCH] acoustidFingerprinter: use ffmpeg instead of ffmpeg_2 --- .../audio/acoustid-fingerprinter/default.nix | 7 ++++- .../audio/acoustid-fingerprinter/ffmpeg.patch | 26 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 5703ca77bd01..4fc3d957e13d 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -17,10 +17,15 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + name = "fix-build-with-libav-10.patch"; + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/2c778334a9fc2f0ccf9b1d7635c116bce6509748/raw"; + sha256 = "1smyp3x5n6jwxpgw60xsijq2fn6g1gl759h1lm5agaxhcyyqn0i0"; + }) + (fetchpatch { + name = "fix-build-failure-on-gcc-6.patch"; url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; }) - ./ffmpeg.patch ]; meta = with lib; { diff --git a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch b/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch deleted file mode 100644 index f3eacae26f77..000000000000 --- a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/decoder.h b/decoder.h -index 028f58f..4428ac1 100644 ---- a/decoder.h -+++ b/decoder.h -@@ -39,6 +39,8 @@ extern "C" { - #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 - #endif - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - class Decoder - { - public: -diff --git a/ffmpeg/audioconvert.h b/ffmpeg/audioconvert.h -index 2b28e2e..a699986 100644 ---- a/ffmpeg/audioconvert.h -+++ b/ffmpeg/audioconvert.h -@@ -79,7 +79,7 @@ int avcodec_channel_layout_num_channels(int64_t channel_layout); - * @param fmt_name Format name, or NULL if unknown - * @return Channel layout mask - */ --uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name); -+uint64_t avcodec_guess_channel_layout(int nb_channels, enum AVCodecID codec_id, const char *fmt_name); - - struct AVAudioConvert; - typedef struct AVAudioConvert AVAudioConvert; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f1b7ebc8549..bfbb0ec25364 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -685,9 +685,7 @@ in acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; - acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { - ffmpeg = ffmpeg_2; - }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { }; alsaequal = callPackage ../tools/audio/alsaequal { };