mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 19:47:17 +00:00
portaudio-v19: Update to latest tip of trunk
The patches are already upstreamed therefore deleted. Additionally it fixes shared library versioning scheme which in turn fixes build of dependent package python3-pyaudio failing with QA Issue: /usr/lib/python3.11/site-packages/pyaudio/_portaudio.cpython-311-x86_64-linux-gnu.so contained in package python3-pyaudio requires libportaudio.so.2()(64bit), but no providers found in RDEPENDS:python3-pyaudio? [file-rdeps] Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,32 +0,0 @@
|
|||||||
From 8ec1b100afda5b3e31f9d44af04b04b16dfff2e4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
||||||
Date: Tue, 18 May 2021 00:15:46 +0200
|
|
||||||
Subject: [PATCH] Find jack with pkgconfig
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 122fe93..ab7d7f5 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -274,7 +274,8 @@ ELSE()
|
|
||||||
|
|
||||||
ELSEIF(UNIX)
|
|
||||||
|
|
||||||
- FIND_PACKAGE(Jack)
|
|
||||||
+ find_package(PkgConfig REQUIRED)
|
|
||||||
+ pkg_check_modules (JACK jack)
|
|
||||||
IF(JACK_FOUND)
|
|
||||||
OPTION(PA_USE_JACK "Enable support for Jack" ON)
|
|
||||||
ELSE()
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
From ced7af0420c1df0ac02f0c25e7c3534431ebd7fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 4 Jul 2021 17:09:49 -0700
|
|
||||||
Subject: [PATCH] cmake: Use GNUInstallDirs
|
|
||||||
|
|
||||||
Helps install cmakefiles in right libdir
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/PortAudio/portaudio/pull/610]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 12 +++++++-----
|
|
||||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -6,6 +6,8 @@
|
|
||||||
|
|
||||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
|
|
||||||
|
|
||||||
+include(GNUInstallDirs)
|
|
||||||
+
|
|
||||||
# Check if the user is building PortAudio stand-alone or as part of a larger
|
|
||||||
# project. If this is part of a larger project (i.e. the CMakeLists.txt has
|
|
||||||
# been imported by some other CMakeLists.txt), we don't want to trump over
|
|
||||||
@@ -452,18 +454,18 @@ IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT P
|
|
||||||
CONFIGURE_FILE(cmake_support/portaudio-2.0.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc @ONLY)
|
|
||||||
INSTALL(FILES README.md DESTINATION share/doc/portaudio)
|
|
||||||
INSTALL(FILES LICENSE.txt DESTINATION share/doc/portaudio)
|
|
||||||
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig)
|
|
||||||
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
||||||
INSTALL(FILES ${PA_PUBLIC_INCLUDES} DESTINATION include)
|
|
||||||
INSTALL(TARGETS ${PA_TARGETS}
|
|
||||||
EXPORT portaudio-targets
|
|
||||||
- RUNTIME DESTINATION bin
|
|
||||||
- LIBRARY DESTINATION lib
|
|
||||||
- ARCHIVE DESTINATION lib)
|
|
||||||
- INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "lib/cmake/portaudio")
|
|
||||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
||||||
+ INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio")
|
|
||||||
EXPORT(TARGETS ${PA_TARGETS} FILE "${PROJECT_BINARY_DIR}/cmake/portaudio/portaudioTargets.cmake")
|
|
||||||
INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfig.cmake"
|
|
||||||
"${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake"
|
|
||||||
- DESTINATION "lib/cmake/portaudio")
|
|
||||||
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio")
|
|
||||||
|
|
||||||
IF (NOT TARGET uninstall)
|
|
||||||
CONFIGURE_FILE(
|
|
||||||
@@ -3,18 +3,17 @@ SECTION = "libs/multimedia"
|
|||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df"
|
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df"
|
||||||
|
|
||||||
PV = "v190700"
|
PV .= "+git${SRCPV}"
|
||||||
|
|
||||||
|
SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https"
|
||||||
|
SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97"
|
||||||
|
|
||||||
SRC_URI = " \
|
|
||||||
git://github.com/PortAudio/portaudio.git;branch=master;protocol=https \
|
|
||||||
file://0001-Find-jack.patch \
|
|
||||||
file://0001-cmake-Use-GNUInstallDirs.patch \
|
|
||||||
"
|
|
||||||
SRCREV = "147dd722548358763a8b649b3e4b41dfffbcfbb6"
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit cmake pkgconfig
|
inherit cmake pkgconfig
|
||||||
|
|
||||||
|
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
|
||||||
|
|
||||||
PACKAGECONFIG ??= "alsa jack"
|
PACKAGECONFIG ??= "alsa jack"
|
||||||
PACKAGECONFIG[alsa] = ",,alsa-lib"
|
PACKAGECONFIG[alsa] = ",,alsa-lib"
|
||||||
PACKAGECONFIG[jack] = ",,jack"
|
PACKAGECONFIG[jack] = ",,jack"
|
||||||
@@ -28,6 +27,3 @@ do_install:append() {
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES_SOLIBSDEV = ""
|
|
||||||
FILES:${PN} += "${libdir}/libportaudio.so"
|
|
||||||
|
|||||||
Reference in New Issue
Block a user