diff options
author | Piotr Bogdan <ppbogdan@gmail.com> | 2018-11-11 01:18:29 +0000 |
---|---|---|
committer | Piotr Bogdan <ppbogdan@gmail.com> | 2019-01-27 00:40:00 +0000 |
commit | 12298ba68db826fbf7e881ae1461691f19cb8035 (patch) | |
tree | d695fcd649ea3dd448032b407eced62b67f620dc /pkgs/tools/audio/acoustid-fingerprinter | |
parent | d79ec45ebe003dc61b936481c8ab0a3b7c675c02 (diff) | |
download | nixpkgs-12298ba68db826fbf7e881ae1461691f19cb8035.tar nixpkgs-12298ba68db826fbf7e881ae1461691f19cb8035.tar.gz nixpkgs-12298ba68db826fbf7e881ae1461691f19cb8035.tar.bz2 nixpkgs-12298ba68db826fbf7e881ae1461691f19cb8035.tar.lz nixpkgs-12298ba68db826fbf7e881ae1461691f19cb8035.tar.xz nixpkgs-12298ba68db826fbf7e881ae1461691f19cb8035.tar.zst nixpkgs-12298ba68db826fbf7e881ae1461691f19cb8035.zip |
acoustid-fingerprinter: switch to ffmpeg_2
Diffstat (limited to 'pkgs/tools/audio/acoustid-fingerprinter')
-rw-r--r-- | pkgs/tools/audio/acoustid-fingerprinter/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch | 26 |
2 files changed, 33 insertions, 4 deletions
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index f68671bc6fb..4c28c4f3458 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -15,10 +15,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ]; - patches = [ (fetchpatch { - url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; - sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; - }) ]; + patches = [ + (fetchpatch { + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; + sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; + }) + ./ffmpeg.patch + ]; meta = with stdenv.lib; { homepage = https://acoustid.org/fingerprinter; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch b/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch new file mode 100644 index 00000000000..f3eacae26f7 --- /dev/null +++ b/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch @@ -0,0 +1,26 @@ +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; |