From 97dbbb6b8b656c9175f09c4c5f7e92cd441e4aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 17 Mar 2022 21:56:58 +0100 Subject: [PATCH] audacity: Fix build by using ffmpeg4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/audacity/audacity.bb | 3 +- .../audacity/0002-Build-with-ffmpeg4.patch | 47 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 recipes-musicians/audacity/audacity/0002-Build-with-ffmpeg4.patch diff --git a/recipes-musicians/audacity/audacity.bb b/recipes-musicians/audacity/audacity.bb index 03bc0b9..24f7e88 100644 --- a/recipes-musicians/audacity/audacity.bb +++ b/recipes-musicians/audacity/audacity.bb @@ -7,6 +7,7 @@ PV = "2.4.2" SRC_URI = " \ git://github.com/audacity/audacity.git;branch=master;protocol=https \ file://0001-Do-not-ask-git-for-version-information-it-breaks-bui.patch \ + file://0002-Build-with-ffmpeg4.patch \ " SRCREV ="16d52f63a4183bba77ef7305d14622958dc0d1d5" S = "${WORKDIR}/git" @@ -20,7 +21,7 @@ DEPENDS = " \ alsa-lib \ jack \ libid3tag \ - ffmpeg \ + ffmpeg4 \ libmad \ vamp-plugin-sdk \ libogg \ diff --git a/recipes-musicians/audacity/audacity/0002-Build-with-ffmpeg4.patch b/recipes-musicians/audacity/audacity/0002-Build-with-ffmpeg4.patch new file mode 100644 index 0000000..4374d9d --- /dev/null +++ b/recipes-musicians/audacity/audacity/0002-Build-with-ffmpeg4.patch @@ -0,0 +1,47 @@ +From 7b62fe6f493f0110ccdea23c9cf7ea493d152f0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 17 Mar 2022 21:50:27 +0100 +Subject: [PATCH] Build with ffmpeg4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + cmake-proxies/CMakeLists.txt | 2 +- + cmake-proxies/ffmpeg/CMakeLists.txt | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt +index 9ca7286ac..62e515491 100644 +--- a/cmake-proxies/CMakeLists.txt ++++ b/cmake-proxies/CMakeLists.txt +@@ -137,7 +137,7 @@ addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" ) + # Optional libraries + # + # directory option symbol req chk version +-addlib( ffmpeg ffmpeg FFMPEG NO NO "libavcodec >= 51.53" "libavformat >= 52.12" "libavutil >= 52.66" ) ++addlib( ffmpeg ffmpeg FFMPEG NO NO "libavcodec4 >= 51.53" "libavformat4 >= 52.12" "libavutil4 >= 52.66" ) + addlib( libid3tag id3tag LIBID3TAG NO YES "id3tag >= 0.15.1b" ) + addlib( libmad mad LIBMAD NO YES "mad >= 0.15.1b" ) + addlib( libnyquist nyquist NYQUIST NO YES "" ) +diff --git a/cmake-proxies/ffmpeg/CMakeLists.txt b/cmake-proxies/ffmpeg/CMakeLists.txt +index 98f12c86d..f5ed33f33 100644 +--- a/cmake-proxies/ffmpeg/CMakeLists.txt ++++ b/cmake-proxies/ffmpeg/CMakeLists.txt +@@ -2,9 +2,9 @@ + # Add our target and all of it's aliases + add_library( ${TARGET} INTERFACE ) + add_library( ${symbol} ALIAS ${TARGET} ) +-add_library( libavcodec ALIAS ${TARGET} ) +-add_library( libavformat ALIAS ${TARGET} ) +-add_library( libavutil ALIAS ${TARGET} ) ++add_library( libavcodec4 ALIAS ${TARGET} ) ++add_library( libavformat4 ALIAS ${TARGET} ) ++add_library( libavutil4 ALIAS ${TARGET} ) + + # Pull in standard variables + def_vars() +-- +2.34.1 +