zepto-mirrors/meta-musicians
1
0
Fork 0
mirror of https://github.com/schnitzeltony/meta-musicians.git synced 2026-01-29 17:18:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

audacity: Fix build by using ffmpeg4

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-03-17 21:56:58 +01:00
parent 5574ff98fb
commit 97dbbb6b8b
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
recipes-musicians/audacity/audacity.bb
View File

@@ -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 \

47
recipes-musicians/audacity/audacity/0002-Build-with-ffmpeg4.patch Normal file
View File

@@ -0,0 +1,47 @@
From 7b62fe6f493f0110ccdea23c9cf7ea493d152f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
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 <schnitzeltony@gmail.com>
---
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