From patchwork Tue May 23 08:49:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 24313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE5ACC7EE23 for ; Tue, 23 May 2023 08:49:48 +0000 (UTC) Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by mx.groups.io with SMTP id smtpd.web10.17112.1684831787636352738 for ; Tue, 23 May 2023 01:49:48 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.84, mailfrom: f_l_k@t-online.de) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout09.t-online.de (Postfix) with SMTP id 3B85377FA for ; Tue, 23 May 2023 10:49:45 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.41.120]) by fwd86.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1q1NiC-1gwuIL0; Tue, 23 May 2023 10:49:44 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-multimedia][PATCH] fluidsynth: update 2.2.6 -> 2.3.2 Date: Tue, 23 May 2023 10:49:28 +0200 Message-Id: <20230523084928.1109458-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1684831784-0EFFDC77-4737F879/0/0 CLEAN NORMAL X-TOI-MSGID: ffd92db9-658d-4c81-8a7d-e15e259568f5 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 23 May 2023 08:49:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102730 -remove unneeded patch -remove fluidsynth-native as it seems to be unneeded -remove STAGING_LIBDIR from target files -add more packageconfig options Signed-off-by: Markus Volk --- .../fluidsynth/fluidsynth-native_git.bb | 10 ---- .../fluidsynth/fluidsynth.inc | 12 ----- ...tables-helper-we-have-to-use-native-.patch | 49 ------------------- .../fluidsynth/fluidsynth_git.bb | 33 ++++++++++--- 4 files changed, 25 insertions(+), 79 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb delete mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc delete mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb deleted file mode 100644 index a95c4c42a8..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -inherit native - -OECMAKE_SOURCEPATH = "${S}/src/gentables" - -do_install() { - install -d ${D}/${bindir} - install -m 755 ${B}/make_tables.exe ${D}/${bindir}/ -} diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc deleted file mode 100644 index a4590d61a9..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Fluidsynth is a software synthesizer" -HOMEPAGE = "http://www.fluidsynth.org/" -SECTION = "libs/multimedia" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" - -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" -SRCREV = "8b00644751578ba67b709a827cbe5133d849d339" -S = "${WORKDIR}/git" -PV = "2.2.6" - -inherit cmake pkgconfig lib_package diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch deleted file mode 100644 index cc73bdb1d9..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 81ea820b155e887b13ea5986c3407cf93b2737f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 2 Jan 2019 18:42:46 +0100 -Subject: [PATCH] Do not build gentables helper - we have to use native variant -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller ---- - src/CMakeLists.txt | 23 +---------------------- - 1 file changed, 1 insertion(+), 22 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 356bb734..58ff7635 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -399,25 +399,4 @@ else ( MACOSX_FRAMEWORK ) - install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} ) - endif ( MACOSX_FRAMEWORK ) - --# ******* Auto Generated Lookup Tables ****** -- --include(ExternalProject) -- --set (GENTAB_SDIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables) --set (GENTAB_BDIR ${CMAKE_CURRENT_BINARY_DIR}/gentables) -- --# Use external project to ensure that cmake uses the host compiler when building make_tables.exe --# To fix cross-compiling fluidsynth from Win32 to ARM (using vcpkg), we need to pass the current generator --# on to the external project, otherwise (for some unknown reason) the target compiler will be used rather --# than the host compiler. --ExternalProject_Add(gentables -- DOWNLOAD_COMMAND "" -- SOURCE_DIR ${GENTAB_SDIR} -- BINARY_DIR ${GENTAB_BDIR} -- CONFIGURE_COMMAND -- "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}" -- BUILD_COMMAND -- "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}" -- INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" --) --add_dependencies(libfluidsynth-OBJ gentables) -+ --- -2.21.1 - diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb index 984f37b756..a1083af56d 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb @@ -1,23 +1,40 @@ -require ${BPN}.inc +SUMMARY = "Fluidsynth is a software synthesizer" +HOMEPAGE = "http://www.fluidsynth.org/" +SECTION = "libs/multimedia" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -DEPENDS = "${BPN}-native alsa-lib ncurses glib-2.0" +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" +SRCREV = "4d8fe638e1a48660a4c843d493f69a86579e12f0" +S = "${WORKDIR}/git" +PV = "2.3.2" + +inherit cmake pkgconfig lib_package + +DEPENDS = "glib-2.0" SRC_URI += " \ - file://0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch \ file://0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch \ file://0003-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \ " EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" -do_configure:append() { - make_tables.exe ${B}/ +do_install:append() { + sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/pkgconfig/fluidsynth.pc + sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/cmake/fluidsynth/FluidSynthTargets.cmake } -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGECONFIG[sndfile] = "-Denable-libsndfile=ON,-Denable-libsndfile=OFF,libsndfile1" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio pipewire systemd alsa dbus', d)}" +PACKAGECONFIG[alsa] = "-Denable-alsa=ON,-Denable-alsa=OFF,alsa-lib" +PACKAGECONFIG[dbus] = "-Denable-dbus=ON,-Denable-dbus=OFF,dbus" PACKAGECONFIG[jack] = "-Denable-jack=ON,-Denable-jack=OFF,jack" -PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" +PACKAGECONFIG[oss] = "-Denable-oss=ON,-Denable-oss=OFF" +PACKAGECONFIG[pipewire] = "-Denable-pipewire=ON,-Denable-pipewire=OFF,pipewire" PACKAGECONFIG[portaudio] = "-Denable-portaudio=ON,-Denable-portaudio=OFF,portaudio-v19" PACKAGECONFIG[profiling] = "-Denable-profiling=ON,-Denable-profiling=OFF" +PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" PACKAGECONFIG[readline] = "-Denable-readline=ON,-Denable-readline=OFF,readline" +PACKAGECONFIG[sdl] = "-Denable-sdl2=ON,-Denable-sdl2=OFF,libsdl2" +PACKAGECONFIG[sndfile] = "-Denable-libsndfile=ON,-Denable-libsndfile=OFF,libsndfile1" +PACKAGECONFIG[systemd] = "-Denable-systemd=ON,-Denable-systemd=OFF,systemd"