From 54d0ccbac3b6fbd01dcd252ea006d4e9e62f8e6e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2023 01:53:29 +0000 Subject: gentoo auto-resync : 20:12:2023 - 01:53:29 --- media-sound/Manifest.gz | Bin 57591 -> 57602 bytes media-sound/elisa/Manifest | 2 - media-sound/elisa/elisa-23.04.3.ebuild | 61 --------- media-sound/kasts/Manifest | 2 - media-sound/kasts/kasts-23.04.3.ebuild | 64 --------- media-sound/krecorder/Manifest | 3 - .../krecorder/files/krecorder-23.04.1-cmake.patch | 77 ----------- media-sound/krecorder/krecorder-23.04.3.ebuild | 35 ----- media-sound/zynaddsubfx/Manifest | 11 +- .../files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch | 19 +++ .../zyn-fusion-ui-3.0.6-libzest_location.patch | 11 ++ .../files/zyn-fusion-ui-3.0.6-makefile_find.patch | 69 ++++++++++ .../zyn-fusion-ui-3.0.6-system_wide_location.patch | 40 ++++++ .../zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch | 2 - .../files/zynaddsubfx-3.0.6-libzest_location.patch | 11 ++ .../files/zynaddsubfx-3.0.6-stdint.patch | 149 ++++++++++++++++----- .../zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild | 113 ++++++++++++++++ 17 files changed, 384 insertions(+), 285 deletions(-) delete mode 100644 media-sound/elisa/elisa-23.04.3.ebuild delete mode 100644 media-sound/kasts/kasts-23.04.3.ebuild delete mode 100644 media-sound/krecorder/files/krecorder-23.04.1-cmake.patch delete mode 100644 media-sound/krecorder/krecorder-23.04.3.ebuild create mode 100644 media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch create mode 100644 media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch create mode 100644 media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch create mode 100644 media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch create mode 100644 media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch create mode 100644 media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index b9fa49d1352b..3111ae9e479e 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest index b417ce2c1afd..13d335a42516 100644 --- a/media-sound/elisa/Manifest +++ b/media-sound/elisa/Manifest @@ -1,7 +1,5 @@ -DIST elisa-23.04.3.tar.xz 1810216 BLAKE2B 0127a69a50c2cc5114fa84b72f1eb248728e4343543f761f6d0730b82b7f3c3b1d4466bad07ad6f6cd8ea567d0dbfcdb96cf80d3e33c371476f2a25d5dd79db3 SHA512 51069f720c49f3e1e1814efc4edcba4665558867acb35f91eebfe7d083fc823ff873cfb104af5a589e9eca582dee0b254677dbf878b70880815d2732c8328357 DIST elisa-23.08.3.tar.xz 1814976 BLAKE2B ce8cd0090120a4883de6ced0439f9d0c126123e8d416811fe20fd38ff88b030a8937433761e2a6fe7f5ef48bb3b00f76782aa809156c7e3bc1aebe2f73f1f9a5 SHA512 6f1515d5d4c0cafcecaefe37ecf0bcf80d1dd651ecc0d3f4f969f44d70c9c30d2ee9b6cad30d4989143b78a66bb70bc86b8095c427418bfb16d0efcd8780a321 DIST elisa-23.08.4.tar.xz 1814588 BLAKE2B f388086246eecf0afb3263bc6159ba600c5869510108026e4415196cccd8d4aa94408b7ce911a32565975e0be31aaccab024055e3f2f0b0b5533d900abcf8cb6 SHA512 77ef0109a8a2e3605036aa0e262f916f11a959cf374a5b567b2dfa74e15b2d8c5d9672b62a8227681e02628cacd6f0cdf3c5040bc1c27932c3a3799160c9d8f9 -EBUILD elisa-23.04.3.ebuild 1600 BLAKE2B 50bb2e4781e4684e2bf17d36ace846c48bc06ad277513463a6632c270261e0faa3e8bbe03239c0470952437d1d1733a3272b1521704b4cd1d4606ae4bb533bad SHA512 3b1b1fc022f68eea84ead7700404abea24ef51015f8067f260ad046733ed89d7884179e1151b230b0867df79d892ec669b3d27c3626fefe1b55c75d3ad35477b EBUILD elisa-23.08.3.ebuild 1600 BLAKE2B 50bb2e4781e4684e2bf17d36ace846c48bc06ad277513463a6632c270261e0faa3e8bbe03239c0470952437d1d1733a3272b1521704b4cd1d4606ae4bb533bad SHA512 3b1b1fc022f68eea84ead7700404abea24ef51015f8067f260ad046733ed89d7884179e1151b230b0867df79d892ec669b3d27c3626fefe1b55c75d3ad35477b EBUILD elisa-23.08.4.ebuild 1603 BLAKE2B bcf972db9a1951ca9c7c24ee2b5697d689176128e7f9d88151b2ffae9d21484b7a4b28ad1b499f68323a9890942e5734d193b937ba686ab39c78592cedb71312 SHA512 30301cd090a4acca93c25c3094a0f790d544dc5d90b1c4fa274d668100756b14e4946230115c240e4b093211effb5b75efc3ae8d9b2346fe381c2ad9e3c10b40 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751 diff --git a/media-sound/elisa/elisa-23.04.3.ebuild b/media-sound/elisa/elisa-23.04.3.ebuild deleted file mode 100644 index 933afad64350..000000000000 --- a/media-sound/elisa/elisa-23.04.3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Simple music player by KDE" -HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/elisa/" - -LICENSE="LGPL-3+" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="mpris semantic-desktop +vlc" - -RESTRICT="test" - -BDEPEND="sys-devel/gettext" -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib] - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - mpris? ( - >=dev-qt/qtdbus-${QTMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - vlc? ( media-video/vlc:= ) - !vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package mpris KF5DBusAddons) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package vlc LIBVLC) - ) - - ecm_src_configure -} diff --git a/media-sound/kasts/Manifest b/media-sound/kasts/Manifest index fd20b1b8ac3f..00fd0be050bb 100644 --- a/media-sound/kasts/Manifest +++ b/media-sound/kasts/Manifest @@ -1,7 +1,5 @@ -DIST kasts-23.04.3.tar.xz 549396 BLAKE2B a142e3573ad9daf12c6fdc65096126e9bdb9691df412f569c65117512a447974a98afbd5dab6d41d6d714ae70885964717cafb9e243eb44728ad00aceb7c07d0 SHA512 dd423bca4d70a1c6c0b94b6e6248aa562bb37fb1eb06f1b011b585d31e30413dcf2ce3cf2192596bcc3f24f73ef5aed080dc6b9d9a12d139380519dd9f214ac1 DIST kasts-23.08.3.tar.xz 570040 BLAKE2B 1a30857b0189087123a06ca3f35c941ec45e2a194c5f5ef8a3560770bec11108ec0b5ba0e23ff93a13dbaff9a077bfd16891b23348ab2be4ac0d198ac04735d1 SHA512 07bebd82b6d2a76d5935898d4a46e4380d5d427c304fe67250be98f7ecabac5de9f02e827295c6ee447e56767b327aa925074e301f2b960b25261191cedacd83 DIST kasts-23.08.4.tar.xz 575640 BLAKE2B cf2a598fac65107253349e912d674a460a423d45b769fa1ace5f6f269f49538910c1125aaac2375d53a40c8029c072ad7c3b56073c0a3385483ea7240fcb8d00 SHA512 17539110dcb72c74c4dcfadfbff07635db194b3c07a21bd81fa744fb5d8e32f8a00bb9a9a2bb09882dbd5b044c99073cf9b22b6accf046479953320d5bdbbfbf -EBUILD kasts-23.04.3.ebuild 1645 BLAKE2B f8fb0918e7f015610214ac88bf67a11a0b87d0c6572f93924911546364a59f85bf6841958ef21247ecf68fd4988abe10ffac98c6491842a02b63e964fb2a20bf SHA512 4586fe77e951b89acfa3515811a7e79b3e8e540b2684f3e6caeb9f2459ea215037726c2429ef36db6f22d3c2a59e1fd8f4973a415c32a364ea40e536b50d312f EBUILD kasts-23.08.3.ebuild 1638 BLAKE2B 6a3b0be59d33de31063122a401e23100c36597df619215a92a693a4ea3417e56e743ac1e38b8fba7d76adf39a513d09f98ed5be7e3a42d18f91c3341229fffac SHA512 911822cecb049751885afecb2439d660f2ca9de9deb54b5e2f38b39e38c182351f60ecebec677d01259cc42379c50efa3529c3dfd86e76a367b232cf37401b56 EBUILD kasts-23.08.4.ebuild 1641 BLAKE2B a44e67b93c57fbd29f1c1c6a2870850bc8a7a26ad47dcd8c3a0868fbf8b62e43efc212f3fd0fdb8ee07aacbea50aafc4f4c41a99a857b969ea1fcb86d234fa77 SHA512 a67adc8de7a340890cd6a76d4036d91ac1d0cf639122645cd30429b044a34c9953096c1ebec79291e9070e95fa199558c6f07530f07c57e1fcaf486efd909c4a MISC metadata.xml 461 BLAKE2B f69d730a1f4e042650158f9819d07209c9d98492076400efebc152aa60950bd512bce5f8fabbd0a1bded16af201a03db57a56ef5c708662d7e8b058c2f0aa194 SHA512 4ac8027c4d3068ba151104708b13c3cbf21617da83e32d7a471421e9007d31ae5122335072bc99c7c2e4e2981e8ce1812e0b4dbf168f6d8adfeb6d079e68793f diff --git a/media-sound/kasts/kasts-23.04.3.ebuild b/media-sound/kasts/kasts-23.04.3.ebuild deleted file mode 100644 index 88a2b43794ce..000000000000 --- a/media-sound/kasts/kasts-23.04.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Convergent podcast application for desktop and mobile" -HOMEPAGE="https://apps.kde.org/kasts/" - -LICENSE="GPL-2 GPL-2+ GPL-3+ BSD LGPL-3+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -IUSE="gstreamer networkmanager vlc" - -DEPEND=" - >=dev-libs/kirigami-addons-0.7.2:5 - dev-libs/qtkeychain:=[qt5(+)] - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/syndication-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 - media-libs/taglib - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-good:1.0 - ) - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) - vlc? ( media-video/vlc:= ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 -" -BDEPEND="gstreamer? ( virtual/pkgconfig )" - -src_prepare() { - ecm_src_prepare - ecm_punt_qt_module Test -} - -src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLE_PLAYER=OFF - -DBUILD_GSTREAMER_BACKEND=$(usex gstreamer) - $(cmake_use_find_package networkmanager NetworkManagerQt) - $(cmake_use_find_package vlc NetworkManagerQt) - ) - ecm_src_configure -} diff --git a/media-sound/krecorder/Manifest b/media-sound/krecorder/Manifest index 6dc5dca95b64..c75a4ee7d722 100644 --- a/media-sound/krecorder/Manifest +++ b/media-sound/krecorder/Manifest @@ -1,8 +1,5 @@ -AUX krecorder-23.04.1-cmake.patch 1968 BLAKE2B 8d02a8f8eda795e5885425ebf44a375176eee24fc39a9748fa365418d009d818fc8fe33330f7eea9fd6e50a99aabf223ed835aa9f4325d91510773b88691d1e8 SHA512 ea3167776d35187d3e80ca4b701d92094c93a8d17eaf7c5ab23bae8673412150d39409b95d246d0ef30c21b66ef8ef807a441838097ef13ea807cf2d5ad32927 -DIST krecorder-23.04.3.tar.xz 160176 BLAKE2B 7e2bafbb65bd1b951c5a204e9c053afa87aee37947ae60c3e11407e62cd265d3d3180f0d90f88ec54d82bfdca115b27ed55c067f6a2d2445fd89ad99d677c65d SHA512 db3016bd8d5a454f683df5deb58478be6cf33df9970388bb92b770317e2986a150a26712a6d0b93ed69c155bdab7325270ae8489d353dd2d0f29fe146ba90c74 DIST krecorder-23.08.3.tar.xz 162420 BLAKE2B 4bc4c6cb9c51fd75ed809476890de7f3db575226a7ec23ee4953b8021d9cb234ea5bf50e626aba7c2494f7527dab8432be3a776801f513c2e487772a9a32260b SHA512 c242bf3a7f6eb9b1f86c5aed38cf83f87bca711f9f0af324aa5893f7307c2b88533fa412346c0593d14d1df16fae53b15fc2d79ae3b9a17d0cf8a071d63b677e DIST krecorder-23.08.4.tar.xz 162504 BLAKE2B a7525c59531732ff1a339653eddfe77169abcec0d54e59e0ae36b52797d555833f2cc8a2032d48f29ede40b2c9186638e17a90c4c112e64a41b3a3cd89af9a22 SHA512 5315e316376b151cc3d2cfb85aad8363196ffe3cd0da8b060ee862d45dde1f44b33a441ab7d5d0950e6aaa5d23cb749f38a46faf0513df0f4e0c5f90a9c0e7e6 -EBUILD krecorder-23.04.3.ebuild 917 BLAKE2B ce5b15f0d704a80bae310d1a4a9f71b5fc8d2bbb169bc788a2351249c04bb961d2217f7470ec002953961f0b03b2e674f7bb716523fa001170071e21f2cd284e SHA512 df7ccdd2f8214a9da565d1d7f71e6d58656860d6b319e6c2cbaf970a2de61440571ddfffb256a29555931c3cf978ab8c3ca2782cc530340e6f43b3c9c8c535b5 EBUILD krecorder-23.08.3.ebuild 853 BLAKE2B bba171efda33ddbc4c2f49fdb9a0ef2d88aff0358616bd12a93b52c9d6ee900399bdb761aeee0de1f53c70fd4a1f56b96b8c095971fb416ebf124dece0d168db SHA512 59dff1fb0d3d89b9f8543ae47e54f1cd745f2b8794693741cf7d302f1a9b745c4cdde92bc1a719a1f3dc3ed214fea7ff7e6e6f0bced097e3e7e7bfa5296479cd EBUILD krecorder-23.08.4.ebuild 856 BLAKE2B 682403b6d5073d0321268f4aed74e33adc3ca91ddbb69ef3ac9aab6be028d02dae2444bfd701f1870a1b600a07e5bed44e857497510d55cf625ba2f328c02530 SHA512 b757b6b7204a0d11c9436991cde89e6503b0f3bb1211fe7b25309db3eed7c82efaaa547253fa0f7c538218296be01c5cfb7a4f20fdacc0cad0eddd9771161ab8 MISC metadata.xml 729 BLAKE2B 5afa1d385a0f5183b46590e95ef8e99b94d235a4720379222d8bbe43ff86e067d6d0d8580767ec31a0e80c38627535540ccb20c27ee09a4066ed268378f25272 SHA512 82df50c08faa64aa436b674336648887d13f77c2d6417a5ddf3c9f75b77ac705d2181dbbdc4bed0bb5d35276f3616f2e339ab48b7d4e3e2234515f245ce8c3f2 diff --git a/media-sound/krecorder/files/krecorder-23.04.1-cmake.patch b/media-sound/krecorder/files/krecorder-23.04.1-cmake.patch deleted file mode 100644 index adb94f31209a..000000000000 --- a/media-sound/krecorder/files/krecorder-23.04.1-cmake.patch +++ /dev/null @@ -1,77 +0,0 @@ -From cb60c63a1c266729fec678d0b1ad5d49fa71a0fe Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 27 May 2023 12:17:58 +0200 -Subject: [PATCH 1/2] Drop unused KF5Config - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 1 - - src/CMakeLists.txt | 2 -- - 2 files changed, 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43d62ef..ac753ff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,7 +63,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS - find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS - Kirigami2 - I18n -- Config - CoreAddons - WindowSystem - ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 664865b..f5576f4 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,8 +26,6 @@ target_link_libraries(krecorder - Qt5::Multimedia - Qt5::Svg - KF5::I18n -- KF5::ConfigCore -- KF5::ConfigGui - KF5::CoreAddons - KF5::WindowSystem - ) --- -2.40.1 - - -From 75f8647733304fa485d18ed007a44644d5e4d906 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 27 May 2023 12:23:01 +0200 -Subject: [PATCH 2/2] Mark KF5Kirigami2 RUNTIME required only - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac753ff..a7a6477 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,12 +60,16 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS - QuickCompiler - ) - --find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS -- Kirigami2 -- I18n -+find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS -+ I18n - CoreAddons - WindowSystem - ) -+ -+find_package(KF5Kirigami2 ${KF_MIN_VERSION}) -+set_package_properties(KF5Kirigami2 PROPERTIES -+ TYPE RUNTIME -+) - find_package(KF5KirigamiAddons 0.6 REQUIRED) - - add_subdirectory(src) --- -2.40.1 - diff --git a/media-sound/krecorder/krecorder-23.04.3.ebuild b/media-sound/krecorder/krecorder-23.04.3.ebuild deleted file mode 100644 index ce850b52603f..000000000000 --- a/media-sound/krecorder/krecorder-23.04.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_CATEGORY="utilities" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Convergent audio recording application for Plasma" -HOMEPAGE="https://apps.kde.org/krecorder/" - -LICENSE="CC0-1.0 CC-BY-4.0 GPL-3+" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-libs/kirigami-addons-0.6:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtsvg-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 -" -BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:5" - -PATCHES=( "${FILESDIR}/${PN}-23.04.1-cmake.patch" ) # in 23.08 diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest index 5528c6e86437..85baf3f3f240 100644 --- a/media-sound/zynaddsubfx/Manifest +++ b/media-sound/zynaddsubfx/Manifest @@ -1,5 +1,12 @@ -AUX zynaddsubfx-3.0.6-docs.patch 500 BLAKE2B 6f6e81c4e700f42c56417f4226408bfb7b45b67999a2c15eed5871d108f88cad49bcb5ea794b34dfaded63af335351c3a376d56797234403896d4337d05bae4a SHA512 5f240dc9256b6398a8b1ae517b0efc737afd87420a263d8bab63e1e6d81d522d43fcc95b696987d489072753bc283399e9792a0d6d44c4717111dc5fa45cd809 -AUX zynaddsubfx-3.0.6-stdint.patch 1318 BLAKE2B dc35d7032723366e515d328ef26f55bc6291346f92e5fa056b2592c66f77c899efb89598d99e84b21c263ad96a1c3c8ddaee2b2b568525812c535555e083acd7 SHA512 2a39555a0481be4cfd3d094d91924aeecdede42e2a151f5b2fce81a083b33dbb8615e4a7cd782fe83981bf6fa268a71d7c00a2bfa9ca04502341ca73d36cc79d +AUX zyn-fusion-ui-3.0.6-cflags_ldflags.patch 698 BLAKE2B a99c32abb0a3d533a66d6ad1373828ed5a9e4df344aace4f2c4c7b639b9259af7b88085a809b2cd6b6dd01f1bdf857109cd18ac50d2cc5d562984e5c7a45d84d SHA512 b1344525a149c09199b0b0ad4b4aeec41661427243029bc6e63a8ebefa3244c896f5033a85e14b3e34b649d5b3145991b2241ba6287a3169f4dd74e6432acc22 +AUX zyn-fusion-ui-3.0.6-libzest_location.patch 406 BLAKE2B 3e9fbe0b1de034b0a452087de87875c643c144d3807330db820bca5330497c7dff0c3f938a94c946cc275c9fee4804a7488af44148cb13c20f4d315f1dd23afd SHA512 29ba870c57ce429eded6d026144589e7fbb8d2db6f617f4dd6163ca60260fa4e3b0ab8a84bc6021a8d256c580bfdb77708dc497d5f4d36aaa49155a42d69bcc2 +AUX zyn-fusion-ui-3.0.6-makefile_find.patch 4224 BLAKE2B 9f0c2dd1b22e2a15cec4ab1fa7b0bcce27e9f51de2b6ae76f4edf3c452eb73023407810e93b2d7c86e2a6bd9d40db212a7396f11b2cc07879f56d70ab52e7edd SHA512 50104b01593c7e726cbd3964be393017a1721dd4e10818db416da780413933051dba13f2b87e82045583a7fb5990e35098708f4ada0545292e0707f75457f2b7 +AUX zyn-fusion-ui-3.0.6-system_wide_location.patch 2027 BLAKE2B 94d9f41e0857db86f2fe9991adba31ada2e58f923f5edd2ece3237d1c44a606f3e6b145b0faaa206432dab1b5733bb2579ddb6bb2c69159483c91af33fa6da68 SHA512 b2a71f7a3d3616748037021091422ddc49d600aaed2bbd260ce49f4a2677a8a53f2884930251fbb792468fa0679bfd74168605a50508fd1c042a311a6bed9acd +AUX zynaddsubfx-3.0.6-docs.patch 425 BLAKE2B ba34e77df73a889992965f6adb518259d0fd4acd2bbcd9e48f2fb5d199f3d301fef383ce6fe8a8c994b92e04c21e64ecf1c8c8a95bdecf422d70562ac54632af SHA512 a9de9608d9f4bed663411551edbd1facd4ef8dddcabc2d6a831fb2175d5826cdc0ea8fbfa016fc55bb2c357312e115c40043aecd55bcbf3cbc9eb613671c6d67 +AUX zynaddsubfx-3.0.6-libzest_location.patch 446 BLAKE2B 68425cda772935e71d06977fa3e4e5a60411a0069316848698be957614d3ec681a74ae2ef894b3575bdc737fd19555e238e18d4cbffbb9720ca78b2521ccdb74 SHA512 4d5891c0e84a1570e5d861beb1ba72f9920871660226587f23c14cf4657cfcd466eda222fa73d5bc6cc7151ef0aef159784a2eb3c52ca0598cd9829bffd0a030 +AUX zynaddsubfx-3.0.6-stdint.patch 2758 BLAKE2B cbf55ba32bdcd7a0af06a418fdb6d1c0caaf8b806382d41bb4946a6d68ab89f878c40a30fb5a2f89b42118653658e7721f7fbd14f62172253aff6d282d2494e2 SHA512 8aca66bc2ee3d886d8b3741dbbf67f1b90804a7b87a3a2858a4134f3104a5ab374e3823afc4e07f5deb02c193474f7e00b536c9c87b2fe897c1db6ffd4bdbe66 +DIST zyn-fusion-ui-src-3.0.6.tar.bz2 5266884 BLAKE2B d9715c319bfd313792f550e12a47939dec665eda6ef395f8bb7a175b11f0922a4037428f99dc95fe749c40074ce8976fa9d257b6bc1e8f1feb63ca943c3bdd76 SHA512 7f195cf6a193376160441863d725383640bc75ad0c21b8ef7786da67a42fe014be103e3c3d9c29c83ffc3d78b9e11a4031a6b3922d457a336d184228c16077cd DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea EBUILD zynaddsubfx-3.0.6-r1.ebuild 2051 BLAKE2B d202a0ca32eebaa0ca9fc72b054461bfd4aa15bee764b42ddfcc14de0f6783f085c38f48d1afbd2ef8eb216f08b8c13ed79aa9a9263b29bdb9e9115ec0e2d578 SHA512 e2e7e8fbd11043e802fe426b1b22e99c879464a32cbedb2f870ebf06ecc43a71e5566f40d1fbdf498b2a2b6ae655732731e1482562d6bd61f956590cd92e311d +EBUILD zynaddsubfx-3.0.6-r2.ebuild 2702 BLAKE2B 9196fd356f8bcb431784e9164ece0a5fb9938b6900017e5d4f6fe4c0ae843c84de374cffd47c5d2f63b9328cfc33d436e6589b4c28cfaf275a9dc8b7a9dfb44e SHA512 230f60a8882ff59f826252eb6b20e391832374b0e2169de736b10504f3fe7a7b507366efe46beb029d584770995e819b726b59f7d202184f2c3e46e763c49914 MISC metadata.xml 428 BLAKE2B 5a450f26afae683f0aa9ff386c87c37c3445b81240d4864fe90564f2c86913af772174cfeaeb82c29b4df0b92337d00f710d8779c9f3300865e7d20e6f9fc06c SHA512 53de61301fd080758dc195c67dfaf9ece5fba941988d17ca6edb7249e01a8804fe4e7edf961a4a0ec6891730dc6f6250e5cf7e91441061eb1e487be243c9b111 diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch new file mode 100644 index 000000000000..005b1733e5e2 --- /dev/null +++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch @@ -0,0 +1,19 @@ +--- i/Makefile ++++ w/Makefile +@@ -16,10 +16,14 @@ linux: + $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread ++ $(CFLAGS) \ ++ `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread \ ++ $(LDFLAGS) + $(CC) test-libversion.c deps/pugl/pugl/pugl_x11.c \ ++ $(CFLAGS) \ + -DPUGL_HAVE_GL \ +- -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs ++ -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs \ ++ $(LDFLAGS) + + osx: deps/libuv.a + ruby ./rebuild-fcache.rb diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch new file mode 100644 index 000000000000..a24921196fe6 --- /dev/null +++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch @@ -0,0 +1,11 @@ +--- i/test-libversion.c ++++ w/test-libversion.c +@@ -660,7 +660,7 @@ int main(int argc, char **argv) + if(!handle) + handle = dlopen("libzest.so", RTLD_LAZY); + if(!handle) +- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY); ++ handle = dlopen("/usr/lib64/zynaddsubfx/libzest.so", RTLD_LAZY); + #endif + if(!handle) { + printf("[ERROR] Cannot Open libzest.so\n"); diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch new file mode 100644 index 000000000000..77cc47913f57 --- /dev/null +++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch @@ -0,0 +1,69 @@ +From c1f5fcbad97c20b14a35e894477081d69519f6b0 Mon Sep 17 00:00:00 2001 +From: David Runge +Date: Sat, 21 May 2022 13:19:48 +0200 +Subject: [PATCH] Use find internals instead of piping into grep + +Makefile: +Use GNU find internals (e.g. `-iname`, `-exec` and conditionals) instead +of piping into multiple instances of grep. +Simplify line counting by using wc from find. +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ linux: + # force rebuilding all code that depends on hotloading. + touch src/mruby-widget-lib/src/api.c + cd mruby && $(HOTLOADING) MRUBY_CONFIG=../build_config.rb rake +- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ ++ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ + `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread +@@ -30,7 +30,7 @@ osx: deps/libuv.a + cd deps/pugl && python2 ./waf + cd src/osc-bridge && CFLAGS="-I ../../deps/libuv/include " make lib + cd mruby && MRUBY_CONFIG=../build_config.rb rake +- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ ++ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ + ./deps/libuv/.libs/libuv.a -lm -framework OpenGL -lpthread +@@ -41,7 +41,7 @@ windows: buildpuglwin deps/libuv-win.a + $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o + cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/libuv/include " make lib + cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake +- $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ ++ $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ + ./deps/libuv-win.a \ +@@ -98,21 +98,21 @@ stats: + @echo 'mruby-qml-parse commits: ' `cd src/mruby-qml-parse && git log --oneline | wc -l` + @echo 'mruby-qml-spawn commits: ' `cd src/mruby-qml-spawn && git log --oneline | wc -l` + @echo 'osc-bridge commits: ' `cd src/osc-bridge && git log --oneline | wc -l` +- @echo 'number of qml files:' `find src/ -type f | grep -e qml$$ | wc -l` +- @echo 'number of ruby files:' `find src/ -type f | grep -e rb$$ | wc -l` +- @echo 'number of c files:' `find src/ -type f | grep -e c$$ | wc -l` +- @echo 'number of header files:' `find src/ -type f | grep -e h$$ | wc -l` ++ @echo 'number of qml files:' `find src/ -type f -iname "*.qml" | wc -l` ++ @echo 'number of ruby files:' `find src/ -type f -iname "*.rb" | wc -l` ++ @echo 'number of c files:' `find src/ -type f -iname "*.c" | wc -l` ++ @echo 'number of header files:' `find src/ -type f -iname "*.h" | wc -l` + @echo 'lines of OSC schema:' `wc -l src/osc-bridge/schema/test.json` + @echo 'lines of qml:' +- @wc -l `find src/ -type f | grep qml$$` | tail -n 1 ++ @`find src/ -type f -iname "*.qml" -exec wc -l {} +` | tail -n 1 + @echo 'lines of ruby:' +- @wc -l `find src/ -type f | grep -e rb$$ | grep -v fcache` | tail -n 1 ++ @`find src/ -type f \( -iname "*.rb" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1 + @echo 'lines of c source:' +- @wc -l `find src/ -type f | grep -e c$$` | tail -n 1 ++ @`find src/ -type f -iname "*.c" -exec wc -l {} +` | tail -n 1 + @echo 'lines of c header:' +- @wc -l `find src/ -type f | grep -e h$$` | tail -n 1 ++ @`find src/ -type f -iname "*.h" -exec wc -l {} +` | tail -n 1 + @echo 'total lines of code:' +- @wc -l `find src/ -type f | grep -Ee "(qml|rb|c|h)$$" | grep -v fcache` | tail -n 1 ++ @`find src/ -type f \( -iname "*.qml" -o -iname "*.rb" -o -iname "*.c" -o -iname "*.h" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1 + + + verbose: ## Compile mruby with --trace diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch new file mode 100644 index 000000000000..3001e08754dc --- /dev/null +++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch @@ -0,0 +1,40 @@ +--- i/src/mruby-widget-lib/mrblib/script.rb ++++ w/src/mruby-widget-lib/mrblib/script.rb +@@ -160,13 +160,13 @@ class ZRunner + search = @search_path + search ||= "" + font_error = false +- sans = [search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"] ++ sans = ["/usr/share/fonts/roboto/Roboto-Regular.ttf", search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"] + if(@vg.create_font('sans', sans[0]) == -1 && @vg.create_font('sans', sans[1]) == -1) + GL::debug "[ERROR] could not find sans font" + font_error = true + end + +- bold = [search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"] ++ bold = ["/usr/share/fonts/roboto/Roboto-Bold.ttf", search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"] + if(@vg.create_font('bold', bold[0]) == -1 && @vg.create_font('bold', bold[1]) == -1) + GL::debug "[ERROR] could not find bold font" + font_error = true +--- i/src/mruby-widget-lib/src/api.c ++++ w/src/mruby-widget-lib/src/api.c +@@ -110,7 +110,7 @@ zest_open(char *address) + if(strstr(path, "libzest")) + strstr(path, "libzest")[0] = 0; + char path2[256]; +- snprintf(path2, sizeof(path2), "%s%s", path, "./qml/MainWindow.qml"); ++ snprintf(path2, sizeof(path2), "%s%s", path, "../../share/zynaddsubfx/qml/MainWindow.qml"); + FILE *f = fopen(path2, "r"); + if(f) { + printf("[INFO:Zyn] Found Assets at %s\n", path); +--- i/src/osc-bridge/src/bridge.c ++++ w/src/osc-bridge/src/bridge.c +@@ -431,7 +431,7 @@ schema_t br_get_schema(bridge_t *br, uri_t uri) + schema_t sch; + + //printf("[debug] loading json file\n"); +- FILE *f = fopen("schema/test.json", "r"); ++ FILE *f = fopen("/usr/share/zynaddsubfx/schema/test.json", "r"); + if(!f && br->search_path) { + char tmp[256]; + snprintf(tmp, sizeof(tmp), "%s%s", br->search_path, "schema/test.json"); diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch index e10b92d096eb..0db30ed2395c 100644 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c70857..20e20d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,9 +35,6 @@ include(CTestConfig.cmake) diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch new file mode 100644 index 000000000000..79e9e30083e5 --- /dev/null +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch @@ -0,0 +1,11 @@ +--- i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp ++++ w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp +@@ -68,7 +68,7 @@ public: + #else + handle = dlopen("./libzest.so", RTLD_LAZY); + if(!handle) +- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY); ++ handle = dlopen("/usr/lib64/zynaddsubfx/libzest.so", RTLD_LAZY); + if(!handle) + handle = dlopen("libzest.so", RTLD_LAZY); + #endif diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch index 4590183ab0f9..3c1bd7937810 100644 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch @@ -1,46 +1,121 @@ -Upstream Commit: https://github.com/zynaddsubfx/zynaddsubfx/commit/f384d92486d6b515cb628d0f52008a9e03341d8c -Upstream Commit: https://github.com/zynaddsubfx/zynaddsubfx/commit/70905c96fe7b9ffde19bc4bc05b0dc53a1ed1707 - -From f384d92486d6b515cb628d0f52008a9e03341d8c Mon Sep 17 00:00:00 2001 -From: fundamental -Date: Wed, 19 Apr 2023 21:52:01 -0400 -Subject: [PATCH] Bank: Add stdint.h header include - -As uint8_t is used, this header should be included. ---- - src/Misc/Bank.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Misc/Bank.h b/src/Misc/Bank.h -index 5120441a5..3f324dd84 100644 ---- a/src/Misc/Bank.h -+++ b/src/Misc/Bank.h -@@ -18,6 +18,7 @@ +--- zynaddsubfx-3.0.6/src/Params/ADnoteParameters.h ++++ zynaddsubfx-3.0.6.mod/src/Params/ADnoteParameters.h +@@ -16,6 +16,7 @@ + + #include "../globals.h" + #include "PresetsArray.h" ++#include + + namespace zyn { + +--- zynaddsubfx-3.0.6/src/Params/Controller.h ++++ zynaddsubfx-3.0.6.mod/src/Params/Controller.h +@@ -17,6 +17,7 @@ + + #include + #include "../globals.h" ++#include + + namespace zyn { + +--- zynaddsubfx-3.0.6/src/Params/EnvelopeParams.h ++++ zynaddsubfx-3.0.6.mod/src/Params/EnvelopeParams.h +@@ -17,6 +17,7 @@ + #include "../globals.h" + #include "../Misc/XMLwrapper.h" + #include "Presets.h" ++#include + + namespace zyn { + +--- zynaddsubfx-3.0.6/src/Params/FilterParams.h ++++ zynaddsubfx-3.0.6.mod/src/Params/FilterParams.h +@@ -17,6 +17,7 @@ + #include "../globals.h" + #include "../Misc/XMLwrapper.h" + #include "PresetsArray.h" ++#include + + namespace zyn { + +--- zynaddsubfx-3.0.6/src/Params/LFOParams.h ++++ zynaddsubfx-3.0.6.mod/src/Params/LFOParams.h +@@ -17,6 +17,7 @@ + #include + #include + #include "Presets.h" ++#include + + #define LFO_SINE 0 + #define LFO_TRIANGLE 1 +--- zynaddsubfx-3.0.6/src/Params/PADnoteParameters.h ++++ zynaddsubfx-3.0.6.mod/src/Params/PADnoteParameters.h +@@ -19,7 +19,7 @@ + #include "Presets.h" + #include + #include +- ++#include + namespace zyn { + + /** +--- zynaddsubfx-3.0.6/src/Params/SUBnoteParameters.h ++++ zynaddsubfx-3.0.6.mod/src/Params/SUBnoteParameters.h +@@ -17,6 +17,7 @@ + #include + #include "../globals.h" + #include "Presets.h" ++#include + + namespace zyn { + +--- zynaddsubfx-3.0.6.old/src/Misc/Bank.cpp ++++ zynaddsubfx-3.0.6/src/Misc/Bank.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- zynaddsubfx-3.0.6.old/src/Misc/Bank.h ++++ zynaddsubfx-3.0.6/src/Misc/Bank.h +@@ -16,6 +16,7 @@ + + #include #include ++#include #include "../globals.h" #include "Config.h" -+#include - - //entries in a bank - #define BANK_SIZE 160 - -From 70905c96fe7b9ffde19bc4bc05b0dc53a1ed1707 Mon Sep 17 00:00:00 2001 -From: fundamental -Date: Sat, 22 Apr 2023 10:21:09 -0400 -Subject: [PATCH] MidiIn: Add stdint.h header include - ---- - src/Nio/MidiIn.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Nio/MidiIn.h b/src/Nio/MidiIn.h -index ce0bcfec3..c6b30c61d 100644 ---- a/src/Nio/MidiIn.h -+++ b/src/Nio/MidiIn.h + +--- zynaddsubfx-3.0.6.old/src/Nio/InMgr.cpp ++++ zynaddsubfx-3.0.6/src/Nio/InMgr.cpp +@@ -17,6 +17,7 @@ + #include "../Misc/MiddleWare.h" + #include + #include ++#include + using namespace std; + + extern zyn::MiddleWare *middleware; +--- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.cpp ++++ zynaddsubfx-3.0.6/src/Nio/MidiIn.cpp +@@ -15,6 +15,7 @@ + #include "../globals.h" + #include "InMgr.h" + #include ++#include + + namespace zyn { + +--- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.h ++++ zynaddsubfx-3.0.6/src/Nio/MidiIn.h @@ -17,6 +17,7 @@ #define MIDI_IN_H #include "Engine.h" -+#include //uint8_t ++#include namespace zyn { + diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild new file mode 100644 index 000000000000..7303db4ad930 --- /dev/null +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="Software synthesizer capable of making a countless number of instruments" +HOMEPAGE="https://zynaddsubfx.sourceforge.net/" + +SRC_URI=" + mirror://sourceforge/zynaddsubfx/${P}.tar.bz2 + mirror://sourceforge/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2 +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+alsa doc dssi jack lash portaudio" +REQUIRED_USE="|| ( alsa jack portaudio )" + +DEPEND=" + dev-libs/mxml + media-libs/liblo + sci-libs/fftw:3.0 + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + doc? ( dev-texlive/texlive-fontutils ) + dssi? ( media-libs/dssi ) + jack? ( virtual/jack ) + lash? ( media-sound/lash ) + portaudio? ( media-libs/portaudio ) +" +RDEPEND=" + ${DEPEND} + media-fonts/roboto +" +BDEPEND=" + dev-lang/ruby:* + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${P}-docs.patch + "${FILESDIR}"/${P}-stdint.patch + "${FILESDIR}"/${P}-libzest_location.patch +) +ZYN_FUSION_UI_PATCHES=( + "${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch + "${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch + "${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch + "${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch +) + +DOCS=( AUTHORS.txt NEWS.txt README.adoc ) + +src_prepare() { + cmake_src_prepare + + if ! use dssi; then + sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die + fi + if ! use jack; then + sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die + fi + if ! use lash; then + sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die + fi + if ! use portaudio; then + sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die + fi + + # FIXME upstream: sandbox error + sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die + + cd ../zyn-fusion-ui-src-${PV} + eapply "${ZYN_FUSION_UI_PATCHES[@]}" +} + +src_configure() { + append-cxxflags -std=c++11 + + local mycmakeargs=( + -DPluginLibDir=$(get_libdir) + -DGuiModule=zest + -DDefaultInput=jack + -DDefaultOutput=jack + $(cmake_use_find_package alsa Alsa) + $(cmake_use_find_package doc Doxygen) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc + emake -C ../zyn-fusion-ui-src-${PV} +} + +src_install() { + use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + cmake_src_install + + cd ../zyn-fusion-ui-src-${PV} + newbin zest zyn-fusion + insinto /usr/$(get_libdir)/${PN} + doins libzest.so + insinto /usr/share/${PN}/qml + doins -r src/mruby-zest/{example,qml}/*.qml + insinto /usr/share/${PN}/schema + doins src/osc-bridge/schema/test.json +} -- cgit v1.2.3