diff options
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/Manifest.gz | bin | 57236 -> 57228 bytes | |||
| -rw-r--r-- | media-sound/alsa-tools/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild | 159 | ||||
| -rw-r--r-- | media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch | 23 | ||||
| -rw-r--r-- | media-sound/musescore/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch | 26 | ||||
| -rw-r--r-- | media-sound/musescore/musescore-9999.ebuild | 2 |
7 files changed, 29 insertions, 187 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex 7cec90e4c04a..6e6ccf02060f 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest index f333b2682988..83b772b2bd02 100644 --- a/media-sound/alsa-tools/Manifest +++ b/media-sound/alsa-tools/Manifest @@ -1,7 +1,4 @@ -AUX alsa-tools-1.2.5-hdspmixer-crash.patch 761 BLAKE2B a2290baa6b4436a2d1cfdfd12039b42ee83017a991b7f05bb8118e27942c7b60bdb0a5636a0859d035290472069a485c2c1d6d45491c9b560b56cd80c36a859e SHA512 220fc805687d04e43914ae13ebfd6f9cfcf4415f7e9a25b0f9d57ee399656a5cc0aa17d75b8e27ee634dd3d66e88bb93fe8caed84b37c0e90bb154f086b3b71f AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef DIST alsa-tools-1.2.11.tar.bz2 1882262 BLAKE2B 2c429cb0dceb1dcb186578e2109a1b3b6eece7ba5e8e1c6de14cc5e2f37ecc947469247e95fb894bb1171fa490deb000405135ec82e822d0fc24bf5c920ec724 SHA512 b5a29a83121a637eaa16d225875feeabaea893eabc61b97d0c18a5852d851ff2e6932bd732786bb43525b410c2bb9185261cc4509fd3ee5fd8536557f12b2154 -DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498 EBUILD alsa-tools-1.2.11.ebuild 3461 BLAKE2B 00b817cf69b901d93a8d9e63b198c2b1b59e174046301f12d83d9b8f0a4108138264d6153d63974a48b4c54766490578f078aa1ad18430d2b1059a2609c3c8a7 SHA512 55fe370bc07f7f2faa01935bb1dcd1fbfc8ed237f9da7a61d0379168194d631683c56e5c41f46fc876a11212f68de77e97953e675920aee94a6f8cd038e4a5d1 -EBUILD alsa-tools-1.2.5-r1.ebuild 3510 BLAKE2B b4c1999d25b0ea7d71929221f4a94b3973f0217012af5f741c72e4474df518584d0100e762721455cfd2f74a17eec721a4cab51cd11b1ca45002678361820ca6 SHA512 78e24a3eb7e97cdf5be37c70c356d39551e37cb7b46e9ab08e3cff61ceb6f2fc147d7b64a61367cca8aced05f6aba8428e90204a7221a739ec47cef97d7ad799 MISC metadata.xml 256 BLAKE2B 3be321130aefff26e604c89e89b7dea5ea5744a30f6f8562ef4a0354c39af70378da523cbc08ea0aaa41d16684e50adc34e4b861744d6b566ce5c714ab3afca4 SHA512 5570207ba0cd9ac093d943bb7899c750a923dec6a39580e3e3efff2d584037457d3e35f6d3fd1b507d70a9c0fe20e5ba9c479345bddf2714dd7d4f07b87d858e diff --git a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild deleted file mode 100644 index 59b1622d6c0b..000000000000 --- a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic libtool xdg - -DESCRIPTION="Advanced Linux Sound Architecture tools" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0.9" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" - -IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart -alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe -alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 -alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr" - -# bug #468294 -DEPEND=" - >=media-libs/alsa-lib-${PV} - >=dev-python/pyalsa-1.0.26 - fltk? ( >=x11-libs/fltk-1.3.0:1 ) - gtk? ( - dev-libs/gobject-introspection - x11-libs/gtk+:2 - x11-libs/gtk+:3 - ) -" -# bug #456114 -RDEPEND=" - ${DEPEND} - gtk? ( media-fonts/font-misc-misc ) -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/envy24control-config-dir.patch - "${FILESDIR}"/${PN}-1.2.5-hdspmixer-crash.patch -) - -pkg_setup() { - ALSA_TOOLS=( - seq/sbiload - us428control - hwmixvolume - hda-verb - $(usev alsa_cards_mixart mixartloader) - $(usev alsa_cards_vx222 vxloader) - $(usev alsa_cards_usb-usx2y usx2yloader) - $(usev alsa_cards_pcxhr pcxhrloader) - $(usev alsa_cards_sscape sscape_ctl) - ) - - if use gtk; then - ALSA_TOOLS+=( - echomixer - hdajackretask - $(usev alsa_cards_ice1712 envy24control) - ) - # Perhaps a typo the following && logic? - if use alsa_cards_rme32 && use alsa_cards_rme96 ; then - ALSA_TOOLS+=( rmedigicontrol ) - fi - fi - - if use alsa_cards_hdsp || use alsa_cards_hdspm ; then - ALSA_TOOLS+=( - hdsploader - $(usev fltk 'hdspconf hdspmixer') - ) - fi - - if use alsa_cards_sb16 || use alsa_cards_sbawe ; then - ALSA_TOOLS+=( sb16_csp ) - fi - - if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then - ALSA_TOOLS+=( as10k1 ld10k1 ) - fi -} - -src_prepare() { - default - - # This block only deals with the tools that still use GTK and the - # AM_PATH_GTK macro. - for dir in echomixer envy24control rmedigicontrol; do - has "${dir}" "${ALSA_TOOLS[*]}" || continue - pushd "${dir}" &> /dev/null || die - eautoreconf - popd &> /dev/null || die - done - - # This block deals with the tools that are being patched - for dir in hdspconf; do - has "${dir}" "${ALSA_TOOLS[*]}" || continue - pushd "${dir}" &> /dev/null || die - eautoreconf - popd &> /dev/null || die - done - - elibtoolize -} - -src_configure() { - if use fltk; then - # hdspmixer requires fltk - append-ldflags "-L$(dirname $(fltk-config --libs))" - append-flags "-I$(fltk-config --includedir)" - fi - - local f - for f in ${ALSA_TOOLS[@]} ; do - cd "${S}/${f}" || die - case "${f}" in - echomixer,envy24control,rmedigicontrol ) - econf --with-gtk2 - ;; - * ) - econf - ;; - esac - done -} - -src_compile() { - local f - for f in ${ALSA_TOOLS[@]} ; do - cd "${S}/${f}" || die - emake - done -} - -src_install() { - local f - for f in ${ALSA_TOOLS[@]} ; do - # Install the main stuff - cd "${S}/${f}" || die - # hotplugdir is for usx2yloader/Makefile.am - emake DESTDIR="${D}" hotplugdir=/lib/firmware install - - # Install the text documentation - local doc - for doc in README TODO ChangeLog AUTHORS; do - if [[ -f "${doc}" ]]; then - mv "${doc}" "${doc}.$(basename ${f})" || die - dodoc "${doc}.$(basename ${f})" - fi - done - done - - # Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27) - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch b/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch deleted file mode 100644 index c80e3f7e47bb..000000000000 --- a/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/alsa-project/alsa-tools/commit/8c8d6941f21ea68894ce7fd13e92b3ac9f16dc8a - -From 8c8d6941f21ea68894ce7fd13e92b3ac9f16dc8a Mon Sep 17 00:00:00 2001 -From: wynnfeng <wynnfeng@tencent.com> -Date: Sun, 29 Jan 2023 20:47:53 +0800 -Subject: [PATCH] hdspmixer: fix core dump - -Initialize the name pointer to NULL. - -Fixes: https://github.com/alsa-project/alsa-tools/pull/14 -Signed-off-by: wynnfeng <wynnfeng@tencent.com> -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- a/hdspmixer/src/hdspmixer.cxx -+++ b/hdspmixer/src/hdspmixer.cxx -@@ -39,7 +39,7 @@ int main(int argc, char **argv) - { - HDSPMixerWindow *window; - HDSPMixerCard *hdsp_cards[3]; -- char *name, *shortname; -+ char *name = NULL, *shortname; - int card; - int cards = 0; - diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index 54401b2a49f2..b826bbb24437 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -8,6 +8,7 @@ AUX musescore-4.4.0-fix-main-toolbar-and-menubar.patch 1441 BLAKE2B f3a3e5d34fe6 AUX musescore-4.4.0-include.patch 345 BLAKE2B 1660b215ca97008b8ca97c0b457aeae5fde24cb51c626f398259cfdf54ee3104413cc001c3312c576ae221aeaaff009ae01f2826ae2e013e1f1856a73eec90da SHA512 c72a106c9758a600cd75ca1f858d48a27c91fae7376859960351276057e4ae8406bf0d5fd0e2bcaa74cdde9816d67ded929caf30611f81b66fde18336c1c5490 AUX musescore-4.4.0-unbundle-deps.patch 713 BLAKE2B e400b26901dcb435ab0b5f382de57ed0183cc16e94cb5656764355998d80ae33e40410fa4ffbaaec06b3fcac8da656e025bfd6e751ba67756dca1f7d10d77f36 SHA512 87b9976f6a470632fc52b2c01d81ae36e57bc545223c67ecbdedace4b8953ca6417986d2c3cdccf8f37306a48678e6e7c0ff1db1d2e59e9f4e7c19a7796ed5de AUX musescore-4.4.0-uncompressed-man-pages.patch 1598 BLAKE2B 79b4c6c2a84f1a02db2664b358cd54716979684ebcb7f335c56f0fe64f82850e83fea9916f20a547452ff44dac45d2bd1600a4b75785882ef90c72f31e2ea2d0 SHA512 30eb90e083d87a304d55942e3de2252fe890fc30c08cd0f5b2d64b8969323a1c7f098791d70f8c61ff90cfb9277576e2b957db0876f443b040edf9525acfb858 +AUX musescore-4.5.0-unbundle-deps.patch 730 BLAKE2B 2789b5007ab6a3a588887dbc28e60d9381b9e11ad832cb44f192ee19140f1002fe28d1d437358efde5a42d32bd9ebec73b20c61771f55e804444c355cef080c3 SHA512 ff365316bb9ae33e9bca4d5a2018371dbed4dbd7b3d804bdb8bdf8e4058a1bd6ad1ed1d2496f88c61aaa7a59e33761254feefa86e0a9587b224d0e19a1c1ce50 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5 @@ -15,5 +16,5 @@ DIST musescore-4.4.3.tar.gz 143462048 BLAKE2B 98a0a685093dc4f21d263308663ce263f1 EBUILD musescore-3.6.2-r1.ebuild 3193 BLAKE2B dc44dcc6cb9d6003efcdb1174ccf7f2a66527e4ce5db525780560aa9b3731b908414c369e6384048758663ce14beff11544b32a9675ea970ede394b48da207eb SHA512 041af2ab74dfdefe5714eb92f30bd90340b47af39fbde2a5c95bb993c0c32e8b6d0cc79e704836d55cc10511c0fc8f9f7f8b0a4f0f38dcb2dffc02d695644e17 EBUILD musescore-4.3.2.ebuild 3512 BLAKE2B 26f40f19afce67c6a110ba22a188cd28a9bded91ced5aa73805b9a73480e449e0d2f93e824b50d28f20790131a40c7a383aaabe65e0f9ea1675045151d53acb2 SHA512 e3eec4cf8bc414b585ac9cd9232f1776060baee02f9e7dfbc9e78fc39f8f5c76d6ee60eb59f8964952458a8f7e42c19618c3d4da9fc16787ac3ef7ab9d32d4ba EBUILD musescore-4.4.3.ebuild 3320 BLAKE2B 9603a42f5fda4201ff6e2b96222f581e388c393f9a0eb2c6c47553131f7e66cd388c20c73ee51b3de440f015d5dae3dba18ff0bac592e392af2379fbee292f02 SHA512 ef00e5d51f3d1f57b65f5b09f3852fd1980e0026163d826cc664e55c073361f62edab367886baf43466e1c00c090aa39d3e42d281c5b8cc12a8a62b91bda0a95 -EBUILD musescore-9999.ebuild 3320 BLAKE2B 9603a42f5fda4201ff6e2b96222f581e388c393f9a0eb2c6c47553131f7e66cd388c20c73ee51b3de440f015d5dae3dba18ff0bac592e392af2379fbee292f02 SHA512 ef00e5d51f3d1f57b65f5b09f3852fd1980e0026163d826cc664e55c073361f62edab367886baf43466e1c00c090aa39d3e42d281c5b8cc12a8a62b91bda0a95 +EBUILD musescore-9999.ebuild 3320 BLAKE2B a771655dcc660a4ccb6de839849e89fe3371cb1f34c5a392998bc2b6054760656e0fd2cff60167122f9a6216104d650311e6e9d9286a3b587567725dc561037c SHA512 c4e2c09b6f27531861c00412c9debd741930d62508838c9d501ab41afed7a32f20d0c0ac12447e1ef4b623b8906c8beeadcc4a29e8536dfdea2d8ff025e1fd14 MISC metadata.xml 968 BLAKE2B 40353ff933140a132cf852f6131123d9817b8f5918efcf66c9ee0f6eb79f3945972dc26428d324c05307e9889aaf6ffcab5ea96cafd5c0b019188924165e49a9 SHA512 11cb6ef3bbfde4b84b8cd6a3620360c981feddb93cfe6f5fc3c73a371bd31ed61564b8a8a4b7489fa9dd87616c2e29e87d1a48a7151464dcd6da20d936ae5d34 diff --git a/media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch new file mode 100644 index 000000000000..3321b4fc34ad --- /dev/null +++ b/media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch @@ -0,0 +1,26 @@ +--- a/src/framework/audio/CMakeLists.txt ++++ b/src/framework/audio/CMakeLists.txt +@@ -242,10 +242,10 @@ if (MUSE_MODULE_AUDIO_EXPORT) + ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h + ) + +- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/lame lame EXCLUDE_FROM_ALL) ++ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame) + set(MODULE_LINK + ${MODULE_LINK} +- lame ++ PkgConfig::lame + ) + + include(cmake/SetupOpusEnc.cmake) +--- a/src/framework/audio/internal/encoders/mp3encoder.cpp ++++ b/src/framework/audio/internal/encoders/mp3encoder.cpp +@@ -22,7 +22,7 @@ + + #include "mp3encoder.h" + +-#include "lame.h" ++#include "lame/lame.h" + + #include "log.h" + diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index 453e2ca9139c..5c0787665552 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -59,7 +59,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch" - "${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch" + "${FILESDIR}/${PN}-4.5.0-unbundle-deps.patch" "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch" "${FILESDIR}/${PN}-4.4.0-include.patch" ) |