diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-04-25 10:15:15 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-05-01 10:08:47 +0200 |
| commit | 24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3 (patch) | |
| tree | 455b75fd0e1228f3a4a7bb600981c122ae925143 /pkgs | |
| parent | 5cecebfb2f76da7b93f19967e99b3ff4fb4d2850 (diff) | |
| download | nixpkgs-24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3.tar nixpkgs-24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3.tar.gz nixpkgs-24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3.tar.bz2 nixpkgs-24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3.tar.lz nixpkgs-24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3.tar.xz nixpkgs-24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3.tar.zst nixpkgs-24571a55f8c138e9b8a96a0d8e09df3bc03b5bb3.zip | |
acoustidFingerprinter: use ffmpeg instead of ffmpeg_2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/audio/acoustid-fingerprinter/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 30 deletions
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 5703ca77bd0..4fc3d957e13 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 f3eacae26f7..00000000000 --- 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 8f1b7ebc854..bfbb0ec2536 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 { }; |