Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001
|
||||
From: James Cowgill <jcowgill@jcowgill.uk>
|
||||
Date: Sun, 25 Feb 2018 14:23:25 +0000
|
||||
Subject: [PATCH] Fix build with FFmpeg 4.0
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://git.aubio.org/?p=aubio.git;a=commitdiff;h=5690daf759b473b9d13b4547ef37adc2695cf524
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/io/source_avcodec.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
|
||||
index ccdce807..8197445c 100644
|
||||
--- a/src/io/source_avcodec.c
|
||||
+++ b/src/io/source_avcodec.c
|
||||
@@ -58,7 +58,11 @@
|
||||
#include "fmat.h"
|
||||
#include "source_avcodec.h"
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
|
||||
#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
|
||||
+#else
|
||||
+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
|
||||
+#endif
|
||||
|
||||
struct _aubio_source_avcodec_t {
|
||||
uint_t hop_size;
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
# From https://aubio.org/pub/aubio-0.4.5.tar.bz2.sha256
|
||||
sha256 70c2804e6f4fbf0ebc0fb9ac8cc9d465ef4a4d438311c074c9a7364e98827af6 aubio-0.4.5.tar.bz2
|
||||
# From https://aubio.org/pub/aubio-0.4.6.tar.bz2.sha256
|
||||
sha256 bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb aubio-0.4.6.tar.bz2
|
||||
|
||||
# Hash for license file:
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AUBIO_VERSION = 0.4.5
|
||||
AUBIO_VERSION = 0.4.6
|
||||
AUBIO_SITE = https://aubio.org/pub
|
||||
AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
|
||||
AUBIO_LICENSE = GPL-3.0+
|
||||
@@ -27,7 +27,7 @@ AUBIO_CONF_OPTS += --disable-sndfile
|
||||
endif
|
||||
|
||||
# Could not compile aubio in double precision mode with libsamplerate
|
||||
ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy)
|
||||
ifeq ($(BR2_PACKAGE_LIBSAMPLERATE):$(BR2_PACKAGE_FFTW_DOUBLE),y:)
|
||||
AUBIO_DEPENDENCIES += libsamplerate
|
||||
AUBIO_CONF_OPTS += --enable-samplerate
|
||||
else
|
||||
@@ -41,15 +41,14 @@ else
|
||||
AUBIO_CONF_OPTS += --disable-jack
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FFTW),y)
|
||||
AUBIO_DEPENDENCIES += fftw
|
||||
# fftw3 require double otherwise it will look for fftw3f
|
||||
ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y)
|
||||
ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y)
|
||||
AUBIO_CONF_OPTS += --enable-fftw3 --enable-double
|
||||
else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y)
|
||||
AUBIO_DEPENDENCIES += fftw-double
|
||||
else ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y)
|
||||
AUBIO_CONF_OPTS += --enable-fftw3f --disable-double
|
||||
endif
|
||||
else # !BR2_PACKAGE_FFTW
|
||||
AUBIO_DEPENDENCIES += fftw-single
|
||||
else
|
||||
AUBIO_CONF_OPTS += --disable-fftw3
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user