From 92117ac3915ec64f010781d93b05034b43e9e381 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Sun, 7 Apr 2024 13:44:26 +0200
Subject: [PATCH] package/aubio: bump version

The latest release from aubio dates back to 2019 while upstream is
active: https://github.com/aubio/aubio/issues/381

Current git HEAD includes support for ffmpeg 6.x:
https://github.com/aubio/aubio/commits/master/src/io/source_avcodec.c

and also removed the dependency to libavresample which was dropped in
ffmpeg 6.0:
https://github.com/aubio/aubio/commit/245deeadd81afc4ec5635b65d71646490c5c19fd

so we can just depend on the ffmpeg package without suboptions, quoting
configure log:

Checking for 'libavcodec'                : yes
Checking for 'libavformat'               : yes
Checking for 'libavutil'                 : yes
Checking for 'libswresample'             : yes
Checking for all libav libraries         : yes

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/aubio/aubio.hash | 5 ++---
 package/aubio/aubio.mk   | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/package/aubio/aubio.hash b/package/aubio/aubio.hash
index 6195788327..dff02ffa9f 100644
--- a/package/aubio/aubio.hash
+++ b/package/aubio/aubio.hash
@@ -1,5 +1,4 @@
-# From https://aubio.org/pub/aubio-0.4.9.tar.bz2.sha256
-sha256  d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da  aubio-0.4.9.tar.bz2
-
+# Locally computed
+sha256  b0e20427750fbfbf017f2b54e41dc0d61ab61335b705bc056ca92a928b2bdd30  aubio-152d6819b360c2e7b379ee3f373d444ab3df0895.tar.gz
 # Hash for license file:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
index bfc627fa91..07634e41c6 100644
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-AUBIO_VERSION = 0.4.9
-AUBIO_SITE = https://aubio.org/pub
-AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
+AUBIO_VERSION = 152d6819b360c2e7b379ee3f373d444ab3df0895
+AUBIO_SITE = $(call github,aubio,aubio,$(AUBIO_VERSION))
 AUBIO_LICENSE = GPL-3.0+
 AUBIO_LICENSE_FILES = COPYING
 AUBIO_CPE_ID_VENDOR = aubio
@@ -59,7 +58,7 @@ else
 AUBIO_CONF_OPTS += --disable-fftw3
 endif
 
-ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y)
+ifeq ($(BR2_PACKAGE_FFMPEG),y)
 AUBIO_DEPENDENCIES += ffmpeg
 AUBIO_CONF_OPTS += --enable-avcodec
 else