diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-01 03:04:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-01 03:04:34 +0000 |
commit | aac5e1b02ac846f5e1ce85f4f66fdec46aa9b0d1 (patch) | |
tree | c95b33a77f5b447d4d4e83204c5a846a5c481a08 /media-sound | |
parent | b846e1a1ef5685462a20abbc77cf57ead9064b85 (diff) |
gentoo auto-resync : 01:11:2024 - 03:04:33
Diffstat (limited to 'media-sound')
39 files changed, 784 insertions, 380 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex 7e1ff3c5681b..bcd3304c0890 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index 053b29b52fe4..4b02106702da 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -2,7 +2,8 @@ AUX ardour-6.8-boost-1.85.patch 750 BLAKE2B 9a86275431cb735b32b36a570450d4b5c035 AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c DIST Ardour-8.10.0.tar.bz2 17811275 BLAKE2B 5a0edc68c707ae1659b080cf543a4a3dc3397c91366e5c5e3084fe0095d983ba1170acc1fde49dbd6abd1b05325e2117b79fcf96c1d5c84b24d5ecc76a39cd64 SHA512 744e4bc73e35a758fce46c0035a11b430b70aa77503446a0118aba62b86b62fb293be1418ec8cfc0e1495a3a005bb71445f48661d9302a3b5bacc1a7f6c2874b DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0 +EBUILD ardour-8.10-r1.ebuild 5272 BLAKE2B 52c0bba86ffb317e835ab53aa15dad0c0c44a52141caf218a63931c2d5457df1f4d50c280c471a79b85533a80a232a060abd91b7e209255547e19d04b56429dd SHA512 9030c756d44f3605c12a7fb99583a65edc50aff4bef6e49a0fe54c77ab71958baa0605e049a1b6ad995e554b9ff0be340442b165e55d278dc77ca0b42e8cdfeb EBUILD ardour-8.10.ebuild 5216 BLAKE2B 76147b3a790cccf26e6c7cb11305d2f50271f93abab3eb83d25c98559aced9ea0719e80240986d1adb0e6bf5adbf337b6422443babf2388f533aeb98a99dc188 SHA512 941298dfb89c7c86b100a4d127f8aa775b084f8c98cac7bba8d1e5a10a6922d8cb7828a5d16afd9896635e11b09bce653f3bc07bb8bb870953c1d142192a1ea1 EBUILD ardour-8.7.ebuild 5257 BLAKE2B 48899bdee879dd24d9530e2eadb4c89a03241a1c793e87bd8ff5df3cdd25e598bc73ae2cb4dae131bfd6607957e77b42ddf0d33e996949e10887a0b8cbd6047d SHA512 d37fb303db968c36017d1e6a4a296e534bfd6280bd25ef841f5fb556ebda5b87e6bbf3d8e4b47517c28d0f99573d6d6852a5c6801960a5309a2107be2e8b4552 -EBUILD ardour-9999.ebuild 5092 BLAKE2B 4b97b979bfc1537a798f070ebccd50163ec2a09f831065a553cd1d9db6c87cd08ca75d381907e6af760ccbe136f4e75389239762acf3735d03cab9e70be4b0ad SHA512 2645736349e6b3796ed9a301b784fe409125e44d95d10efb8936abe7c6c276def21d338f6596dc84743b23090462fea3aaa3447393da46e417fcf9dec873d18d +EBUILD ardour-9999.ebuild 5150 BLAKE2B dc3d456ef39ed244244ceeafea10a6e6c841638f3c1b8a8608990f69d6e96fe10d822a3e59edb00d743090471d4c78461250189bac4838ac8144862a977090a9 SHA512 aed242f55912801b1ded17e06fd1c2666d11d2254c1d142bb8d8fd861742176922e391b095d063701fc26e0a76315d42913656832fa4a3e91d844625f786a1e5 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb diff --git a/media-sound/ardour/ardour-8.10-r1.ebuild b/media-sound/ardour/ardour-8.10-r1.ebuild new file mode 100644 index 000000000000..0f3b1f15c091 --- /dev/null +++ b/media-sound/ardour/ardour-8.10-r1.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..13} python3_13t ) +PYTHON_REQ_USE='threads(+)' +PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" +inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg + +DESCRIPTION="Digital Audio Workstation" +HOMEPAGE="https://ardour.org/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~loong ~x86" + SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" + S="${WORKDIR}/Ardour-${PV}.0" +fi + +LICENSE="GPL-2" +SLOT="8" +IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" + +RDEPEND=" + dev-cpp/cairomm:0 + dev-cpp/glibmm:2 + dev-cpp/pangomm:1.4 + dev-libs/boost:= + dev-libs/glib:2 + dev-libs/libsigc++:2 + dev-libs/libxml2:2 + media-libs/alsa-lib + media-libs/aubio + media-libs/flac:= + media-libs/freetype:2 + media-libs/liblo + media-libs/liblrdf + media-libs/libsamplerate + media-libs/libsndfile + media-libs/libsoundtouch + media-libs/raptor:2 + media-libs/rubberband + media-libs/taglib + media-libs/vamp-plugin-sdk + net-libs/libwebsockets + net-misc/curl + sys-libs/readline:0= + sci-libs/fftw:3.0[threads] + virtual/libusb:1 + x11-libs/cairo + x11-libs/pango + jack? ( virtual/jack ) + pulseaudio? ( media-libs/libpulse ) + media-libs/lilv + media-libs/sratom + dev-libs/sord + media-libs/lv2" +# media-libs/suil[X,gtk2] bundled suil is now used, probably because of ytk +# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + doc? ( app-text/doxygen[dot] ) + jack? ( virtual/jack )" + +PATCHES=( + "${FILESDIR}/${PN}-6.8-metadata.patch" +) + +pkg_pretend() { + [[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \ + ewarn "Linking with gold linker might produce broken executable, see bug #733972" +} + +pkg_setup() { + if has_version \>=dev-libs/libsigc++-2.6 ; then + append-cxxflags -std=c++11 + fi + python-any-r1_pkg_setup +} + +src_prepare() { + default + + # delete optimization flags + sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die + + # handle arch + MARCH=$(get-flag march) + OPTFLAGS="" + if use cpu_flags_x86_sse; then + if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then + elog "You enabled sse but use an march that does not support sse!" + elog "We add -msse to the flags now, but please consider switching your march in make.conf!" + fi + OPTFLAGS="sse" + fi + if use cpu_flags_x86_mmx; then + if [[ ${MARCH} == "i486" ]]; then + elog "You enabled mmx with i486 set as march! You have been warned!" + fi + OPTFLAGS="${OPTFLAGS} mmx" + fi + if use cpu_flags_x86_3dnow; then + OPTFLAGS="${OPTFLAGS} 3dnow" + fi + sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \ + -i "${S}"/wscript || die + sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die + + # boost and shebang + append-flags "-lboost_system" + python_fix_shebang "${S}"/wscript + python_fix_shebang "${S}"/waf + + # handle locales + my_lcmsg() { + rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po + } + plocale_for_each_disabled_locale my_lcmsg +} + +src_configure() { + # avoid bug https://bugs.gentoo.org/800067 + local -x AS="$(tc-getCC) -c" + + # -Werror=odr + # https://tracker.ardour.org/view.php?id=9649 + # https://bugs.gentoo.org/917095 + filter-lto + + local backends="alsa,dummy" + use jack && backends+=",jack" + use pulseaudio && backends+=",pulseaudio" + + tc-export CC CXX + local myconf=( + --configdir=/etc + --freedesktop + --noconfirm + --optimize + --with-backends=${backends} + $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \ + echo '' || echo "--no-fpu-optimization") + $(usex doc "--docs" '') + $(usex nls '' "--no-nls") + $(usex phonehome '' "--no-phone-home") + # not possible right now --use-external-libs + # missing dependency: https://github.com/c4dm/qm-dsp + ) + + waf-utils_src_configure "${myconf[@]}" +} + +src_compile() { + waf-utils_src_compile + use nls && waf-utils_src_compile i18n +} + +src_install() { + local s + + waf-utils_src_install + + mv ${PN}.1 ${PN}${SLOT}.1 || die + doman ${PN}${SLOT}.1 + + for s in 16 22 32 48 256 512; do + newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png + done + + # the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6 + find "${D}/usr/share/icons/" -name ardour6.png -delete + + sed -i \ + -e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \ + -e 's/;AudioEditing;/;X-AudioEditing;/' \ + build/gtk2_ardour/ardour${SLOT}.desktop || die + domenu build/gtk2_ardour/ardour${SLOT}.desktop + + insinto /usr/share/mime/packages + newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml + rm "${D}/usr/share/mime/packages/ardour.xml" || die +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "Please do _not_ report problems with the package to ${PN} upstream." + elog "If you think you've found a bug, check the upstream binary package" + elog "before you report anything to upstream." +} diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild index 24a2798f1e9a..86fc01e0c354 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{9..13} python3_13t ) PYTHON_REQ_USE='threads(+)' PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg @@ -25,8 +25,9 @@ SLOT="9" IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" RDEPEND=" + dev-cpp/cairomm:0 dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 + dev-cpp/pangomm:1.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 @@ -50,15 +51,14 @@ RDEPEND=" sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo - x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) media-libs/lilv media-libs/sratom dev-libs/sord - media-libs/suil[X,gtk2] media-libs/lv2" +# media-libs/suil[X,gtk2] bundled suil is used, maybe probably because of ytk # !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... DEPEND="${RDEPEND} @@ -138,7 +138,6 @@ src_configure() { --freedesktop --noconfirm --optimize - --no-ytk --with-backends=${backends} $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \ echo '' || echo "--no-fpu-optimization") diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest index 6f63c4039cce..c551d5a5e051 100644 --- a/media-sound/audacity/Manifest +++ b/media-sound/audacity/Manifest @@ -1,19 +1,25 @@ -AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1683 BLAKE2B bd8081283dfc87e5e8a3c4826b1a57daed5f28a70a45ff86834d2f3ccf9fa699301cee953c2b3b51095b7bd163247efd9e07bc8548f1195a43e3e5c069a59bfc SHA512 a83ce313094533f7308bfc7c847e5fe908f3e4182c5a86f13b53f3f4df7a63ae6778a85f85c84e348b7db702f07066f4e8d552319a84e4edc459ea6751b73878 -AUX audacity-3.2.3-disable-ccache.patch 850 BLAKE2B 0f8fab52e0f8205c90b0ed798d1793cbde1395715445ac66e6d9b612fd825650f38dc95759b56d0d7455f45202e901de4d2cea3c54ede17356f3ff4f1c8c61ff SHA512 468676dfeff2aa40a3ccbab3c4eb5cf04a8dae0db2772c580d6455b93b4feb9665b3badab7ea8085a6bce1ab243e7c8b0fc2974ab7b2c703db7c49f757bdd48e -AUX audacity-3.3.3-Findlibmad.patch 1758 BLAKE2B c1e0ef6734f925127b0be9abc84fb1b6411d15b8b973683f84f54d9c0e557c7b4dcc786baa9962ff039529f9306144008f1f12b1edb8f519df5a0f0c4d06d9de SHA512 0724cabecd37e2c740227fdc6f0144d97d68bd9846609aea25dfaa41289e8eea790487af320e784e1e6e8c3c2e27689af9643bcc2114c9e5f9d09d679f4ed754 -AUX audacity-3.3.3-fix-includes.patch 1764 BLAKE2B ea7f73f60b8b5ffc42218b65d8148273689d2460b97e4728adf878cb3980762375615cf6b29e205945b69dd36f17b760e949d8805f4bd2d867d0b37133290c6e SHA512 d3dd1c39bfda4146b315f923fb6ecda07ad30d77dae7d930e315a4aae8e2a45de04c217b982aa719d8579c3933bd3843ca42095c1ddc161860a204f8d94dcb12 -AUX audacity-3.3.3-fix-rpaths.patch 3819 BLAKE2B 29079fb4fd63b383546b1f82c08fb98b16eba0588da99b936f7de104bcb826fd6a0dc7f63fd379e44ace9d80ea612d86deda9f68980e3cd5c0874f1925b35b91 SHA512 d05868e7adf91c613534aa965059da5e393582bbaee0b49605c2e270d528dfd8fa882ce356e5fed38752afbbb09539165ea566b13c13df4bc949ed8c5f2617e1 +AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1344 BLAKE2B e21bd17fee679472a2035b6aafc7c183b1a251c7a8b9b27350fe8ebab46efa00f10917d1eed2782b170907dd98c129e7449d8c95e6a27b5c961cc6ac320422f4 SHA512 b3ca905ed9237b2046c08374801ac72a3f26009e3713fdd91d604760bd442216f506bcf772d2a41147e7e365ed8a55e54b1881ec9c16bb6140bfe84e53d27e34 +AUX audacity-3.2.3-disable-ccache.patch 653 BLAKE2B 5c5a9d07df52746077c963d9d174433aca75eaee4ed06de82547e7b760f3f1bc14d718591d322c50a2cbf8b8a089fbc7d2d8fb00268b478e617eff50ee522115 SHA512 5b4924fdb62ce792adeb30d4c0d760b34b0177e4faf27dbcffb829a273fef6010dfeb2f7f12896d6b6f6953384322b69738b88dc7d083884e39e04d50979ca64 +AUX audacity-3.3.3-Findlibmad.patch 1423 BLAKE2B cd007fba05b459b48663bfd1ca9e3e7ec42454de1eafa460d3f6eb673d379ebcc4a4bdece680b99ec141a3a1fcaaa7dd616d6fc03ca050a2b3ed26c0c1944c32 SHA512 897325655811bba295d65e4a52d9dbc727dea9db4ea102934065b717cb6ef6e08e91709fbd37cf8973af28eb087c01f52f7e44e217d1d7cdc6e98c7ccdd5cd95 +AUX audacity-3.3.3-fix-includes.patch 1409 BLAKE2B b173b21c1d33ecf3ffbc9b295e5112cf481b4dacafcd4d820e1c04ab5086e4f57dda7a5d39c0fece1edc9c632386fcf953c23fb92ce0e21b1e4dc4855e266bbb SHA512 9d8da4469a4a65402d3998ba93247de0a389e892ed8d41129f80139705534ee64c615f01d9f05638d8f9d2ae61796ba9cae0457658dba9cbf8bbd188e7d7e896 +AUX audacity-3.3.3-fix-rpaths.patch 3221 BLAKE2B 9573de885e113556c8816a57509532222eca4d66c4aeb935682a5eafb0db235dccaf82068af69dd9ee6c6df405e90db96d69f4ba0f65c3ad6f0d5c381eee3a51 SHA512 596c529155c7162f59e7ec10cee09ab063f89ec2c9f72ca3784c67e36aecf174271f0ade063105f6f24fa5d4df21fbc585cb2c336aecbe19f044adb8706e1f8a AUX audacity-3.3.3-gettext-0.22.patch 872 BLAKE2B 5de981a0b86606f688ca9fa8f036d58d160d0c98f2f5c980089af076ad37951f4675e4e6d6f40e9b719ffd2793cf747a259fc847a60d72e84d56c89f7349499f SHA512 459092cd0bd192468e55ba7174b1b23a0334fb3186fddbf0d14348c870efad23a7e4baa69a288ca6f2bbe5363e5a4251006b8fb580bdf6035184f3c5205c338d -AUX audacity-3.3.3-local-threadpool-libraries.patch 1377 BLAKE2B 6031d9e3f9b4e11a2d16fe96dc261254dbba62dcb461d9c395f9e8d61cb46176680f3eb3f63a0bb5b581bcf35e9c6c7ab954177476c08d0118c0f0d41a34b496 SHA512 1d61c9fbeaae67fff1c02bc84c6791abab5fcdd886c729caf4cd87ecd8d1ede58bd634cebce133d3209212939603aba5a05c5b8cee762a8b2c2bda10a2c11888 -AUX audacity-3.3.3-remove-conan-test-dependency.patch 1140 BLAKE2B 8c74631de260406f47f1d1b5bd869e726ec086eaca143f747f7c0dfd8e0c193c86de44a5ace3e69d85a6dfb7a0ee755ba5defd79bbc114f46974cf6ba7f74f5a SHA512 bfc0b07f03a530486a496447a235384c018dc7a284aa6660e22c6540648be15264e92cb1151f40fe198b46576f0a63b86e6042bb9ccfce32036c596510fbc2c1 -AUX audacity-3.3.3-upstream-fix-rapidjson.patch 2461 BLAKE2B d59077e4729aa5702db6181eb3dac9a9c98f6f64c3b4e61c87c6856c76b8ddb2d9f9036db07efe8263619fa5a9b14fd1ae4be380df34a5483f102b2bde809a18 SHA512 67c6760c472c4161335f9c65129a28495ad9e8605a1f17cd1570037fc4767c9d326221598c93e0e1595bd10d6044a1d7b8dcac9b6c29babecee60a526ef6dd92 -AUX audacity-3.4.2-audiocom-std-string.patch 898 BLAKE2B 697c0ce279a2d0618a7be3dc64d5b54b864516e9ddc1493244d4f555eca270057f0d4e2472ad77c897a810f262a5e8af8c86d738e59063ed5eb5b977406c708d SHA512 438c72c1139180218012c1bdebcb33a5bfd1851beef4ceeb8d60bbc64348f760710b0f64644f9aeed841bd929d3cc07f0dd302567d65fa8d37cdbb48557d56bc -AUX audacity-3.4.2-fix-build-with-use-lv2-off.patch 1006 BLAKE2B cc38f68aa3febbdc604f28cb787bd66f5d67149a77dca8ab4db060147b94bb104a5480754d70200a962f297b5c0fd2dc11cdf8a34bfd71a8b7ef43489e461688 SHA512 d1a667fed915669b66cf037d25fb932e724a93e7620f837d3780a68dbf6c3afe522da7668858e7ea24523c6c0842806ed3ae8de7eb691d3272d94e669787afd0 +AUX audacity-3.3.3-local-threadpool-libraries.patch 1011 BLAKE2B f31560308b008c44081de361f5d353a0520dc2d82d4ba6cf149b0736cccd2507ffe9561f9b80fbb456adaff41fb376d9cae264b0b19d591313b9b960516f0839 SHA512 47d0455709eb1f9dea1cfcccf2b2e8e0840e05fae54d0dc77bee33a2c3f9420a912752dedbbf2de52da99f58f80b3340d019174d2e6f8f3634afc4c174cec9e2 +AUX audacity-3.3.3-remove-conan-test-dependency.patch 967 BLAKE2B 8e5815ecd1dbaa222a128cfb27f4b8c9138d180ec52d15c85639377a05ea8d7953eba054fece5fb44563e9714cae0e5a71d08c06e895066cd719b88b59255f77 SHA512 e8bf2b76b0879600ea9f6d186d2a7bf397a17879facb3ee9279712360358195242ff13fbc2c1f7d24c71348ed0ed83d9bfefccc7f934b667bf688b39c0d89cd1 +AUX audacity-3.3.3-upstream-fix-rapidjson.patch 1786 BLAKE2B 5d269ae42c2c900ba3ac62b4ca721c9d0ff267419c45261e52b90670d45aaf02a4f902678b46a0409e46c090191f0891437041c48973682cd954b10e08c40b12 SHA512 231e6f7a0f5e1068e709e4d3742ffdd1f34f3ed1a60292d1cfc9f3fb673e5b95116f4d7eda9a134c4c585540d848a8587db4caf0525379a509faa34d2c028251 +AUX audacity-3.4.2-audiocom-std-string.patch 673 BLAKE2B b533c2d3e3a55d2c8aca7d81fbad4af349607b6b7c4f8ea4f930d38d04b17448f327f89ce811826df06532692a4c98cb3ddcae68da154cc1f90c20c6195794c2 SHA512 a645e4352b76d806c194e57b89ed506fc8b9b8f837c0b036fbf6a827d76c969fc9f6e5264f7f65f0e979d4e0225d9439319fef3b4c6c22ef50002c2f294c211f +AUX audacity-3.4.2-fix-build-with-use-lv2-off.patch 812 BLAKE2B 561e83d0f027ee7f5328bac3f50d19a7ce8233c02d1c15fc01a6488940ddb3a1811077912c1ee3d35e1daff8ccdf66c0e21a7487d40c32c728860fb86fd30a3b SHA512 f00a7d30efb4e07ba7c38e2e1c3496764d44f7769f0315a0e5b3437a01919271c7ee635168cc5163f46b17267668df9c96318d31a38ce0be3d52b8283485b674 +AUX audacity-3.7.0-allow-overriding-alsa-jack.patch 1342 BLAKE2B a5ced9a9d0c4b094d07e5e23a55f23531ae662cd88c6306576238946212519787f1aaea7d297e90c736d765ee4037fdd335e484b7368691e536af1ab68010119 SHA512 6961e5997eb892b51693b6f9d49909bc219e579a8408ef69b7b174682a58ffeaf38a43f0c11e7803d79bbbd4e132564bd75bd340c6f4d3740a4ed20382ad2778 +AUX audacity-3.7.0-audiocom-std-string.patch 688 BLAKE2B 66b760eeca4d1a6d5cc7dcc34f03bf120fab9372dd283268a1169d70d025ef470ee39719dc8924003c6db9639924238326c131fce5f94091e42e02f76197ed3c SHA512 9d7bfa580d08ac3ad8aed7d500afe9a2e76f52e53623d4428d832084bc793c89779a8f14d222b2b8cc2a7a25eee14fcfad7c5cce53a3630aa4b5148992735dfe +AUX audacity-3.7.0-disable-ccache.patch 641 BLAKE2B 794dc3ccaff8c420631829a98322164d7441a3f08946f98372a2d9bdad308040ab9c958e3dc64af3dc6c7f1e56cc453e8c1fd8f7b8157781cab6949dfce357d2 SHA512 77dd2d18bf537a8e93710e1a32976e92873b154b89b919645c65de607284897127193bd947076e93278241f76136b2c1d8b765bd8ac7a0b15551200fedd05714 +AUX audacity-3.7.0-local-threadpool-libraries.patch 1066 BLAKE2B 8ceadbbb9e2b841be73ab6f970eeb6fbe30285b83968bba5b722086aeae699d86d1e6529dac4c77f16296dacb42f09652fc8b133f08ce8382e17ec5633403f35 SHA512 e946f6558faa32046ad098c52352c9b6150aa52c49732081b54985dbc079bfab39fd2bd27b329f6f06028b0d62ebbed0bcb865e2f41171ec917920631b26b808 +AUX audacity-3.7.0-portsmf.patch 302 BLAKE2B 2dee89e346934ff5cadd1cbc5304fbec9b3391fd4be1cf9c3b27d8b1dbda8acfba2a6fff4f76a1237d277d540109c48efc03b7c8af88f58b40f0662992050d87 SHA512 b9b0bacf9f75120c40ca4796015ef11a80bc5d868b15009bfeb3f0bc15c2b2fe070326b70f6c09a1dde8dbb30de7372577ef4f07bc7c3cb95380e0065aeb45df DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937 DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c +DIST audacity-sources-3.7.0.tar.gz 61801488 BLAKE2B 97ff912d60c07a4e7509ad60814b944f3a0feb6b892328aee9375d64673eb2460bc54ef0dc2385173d92f8121ce330d0529a48940b0e08a434cbf05a8912f05c SHA512 0306cae5c42eb3b86781e37866fe1f95c0564c5a14525c69bbe9cfd614ee31d5296fa845bfd4be5f7a4c3e9ac67224e75dd114a16df9b5c6d1a1c79ce1d874bb DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d -EBUILD audacity-3.3.3-r1.ebuild 7417 BLAKE2B d2765f71208c5c1df301fd33d04e880e34133e364e1789e723082c144cc4ca1138b5edb6541dc8d30f74041a5c365fccdea965e6d3b6cefb778c700e3bbc216a SHA512 57a8168d6dcc83c8412881eda35df1e17b0bd2592ca9a95dbd7366c4902b6e0ac59cf4f9709e86be5993ef8d50abe790d7a360fe37b60ba31c4024401c521d4d EBUILD audacity-3.3.3.ebuild 7247 BLAKE2B d13edb80efb3cc7da04706b30972265594527b09003be5c690e1a4f3c8fa3b918fea751eec1fc6bd29d3810547204fcc4421681ed657be63847b341e38d58708 SHA512 6120da23d94e41ceb840a3cc6e9a6295e4da03674fffce158625ab671eca780ba77985916396af40c0a19eb99facd9a4e31fda7b6ef6aff79b2f4a9d1ffa4888 EBUILD audacity-3.4.2-r1.ebuild 6904 BLAKE2B 1884b799dbbcf59ea235d4351b1fe9da68f0d3c5964e671e8ddca49eb88e63512a19d774676b182711fd9742d9f18a1bdde1f6008a449200d73df19bd6130485 SHA512 b19140ac540f2c874eec6086475a1967c5fea707a80ff490e286c305dc0538666df48d5cf88f0fec9d912e9890e7e702c128efd3c3f421321a4fbcc9ce1feb66 +EBUILD audacity-3.7.0.ebuild 6802 BLAKE2B 4d867dd13f855223aa584da30b405024bd951072b672b242b2a0e156ffe1f339b95d55b151c350c13baf4af8554c58a2223cea0f32d967f24965b8a3b62e6cca SHA512 b9946fc171a9af922f9c94248ea92da87ba6a46a80ad5d433a538969da044935e14d02c59c68e72740eec42270592952e703ee52100a58fd5d2d4005c26dab33 EBUILD audacity-9999.ebuild 7048 BLAKE2B 6c661ade492cc7d7287d7c69be4b4475b3f5fcfae01b29922842c8364260c3f05293679fd225d6a578d2a509e4b932bf0cac3b8910505bc91d5a5741b673b134 SHA512 9418de04b75ce522bc0b3d08278cae3802491a67e2a74ad120e3bf4b1dcc1d2b7c965e97773d5b4e44ef3fd029f135bfa4ccbcc53d79bd2f425199456cdc5ece MISC metadata.xml 1409 BLAKE2B a3ca34262c6bc000ba252729024afdf354aa2f61cfb31a382e8d2571cb5321451ed88b6baa2c976b5adadb0b76a07aa64b2e75b61441f46d431c09b1aebb9804 SHA512 d9e0158632dfa398fd07602e65a3e5a4a8a12a3786a5b3672f7983be976cdfe023fc38b9a3c2c1742d0a0fc0411eea5989c3cf48c2ecfe33b2533c27e9098b05 diff --git a/media-sound/audacity/audacity-3.3.3-r1.ebuild b/media-sound/audacity/audacity-3.7.0.ebuild index 82c770a5849d..3b9ac4e8b0de 100644 --- a/media-sound/audacity/audacity-3.3.3-r1.ebuild +++ b/media-sound/audacity/audacity-3.7.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit cmake flag-o-matic wxwidgets xdg virtualx +inherit cmake wxwidgets xdg virtualx DESCRIPTION="Free crossplatform audio editor" HOMEPAGE="https://www.audacityteam.org/" @@ -22,8 +22,8 @@ if [[ ${PV} = 9999* ]]; then else KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" MY_P="Audacity-${PV}" - S="${WORKDIR}/${PN}-${MY_P}" - SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz" + S="${WORKDIR}/${PN}-sources-${PV}" + SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz" fi SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )" @@ -36,10 +36,9 @@ LICENSE="GPL-2+ audiocom? ( ZLIB ) " SLOT="0" -IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 +ogg +IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg opus +portmixer sbsms test twolame vamp +vorbis wavpack" REQUIRED_USE=" - mad? ( !mpg123 ) opus? ( ogg ) vorbis? ( ogg ) " @@ -70,6 +69,8 @@ RESTRICT="!test? ( test )" RDEPEND="dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] @@ -77,12 +78,15 @@ RDEPEND="dev-db/sqlite:3 media-libs/portsmf:= media-libs/soxr media-sound/lame + sys-apps/util-linux + sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:${WX_GTK_VER}[X] - sys-apps/util-linux alsa? ( media-libs/alsa-lib ) - audiocom? ( net-misc/curl ) + audiocom? ( + net-misc/curl + ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) @@ -94,10 +98,12 @@ RDEPEND="dev-db/sqlite:3 media-libs/sratom media-libs/suil ) - mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123-base ) ogg? ( media-libs/libogg ) - opus? ( media-libs/opus ) + opus? ( + media-libs/opus + media-libs/opusfile + ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) @@ -105,93 +111,76 @@ RDEPEND="dev-db/sqlite:3 wavpack? ( media-sound/wavpack ) " DEPEND="${RDEPEND} - audiocom? ( dev-libs/rapidjson ) + dev-libs/rapidjson x11-base/xorg-proto test? ( <dev-cpp/catch-3:0 )" -BDEPEND="app-arch/unzip - || ( dev-lang/nasm dev-lang/yasm ) +BDEPEND="|| ( dev-lang/nasm dev-lang/yasm ) sys-devel/gettext virtual/pkgconfig" PATCHES=( - # Equivalent to previous versions - "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch" - # From Debian - "${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch" + # fixes include path + "${FILESDIR}/audacity-3.7.0-portsmf.patch" + + # disables ccache + "${FILESDIR}/audacity-3.7.0-disable-ccache.patch" # Disables some header-based detection - "${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch" + "${FILESDIR}/audacity-3.7.0-allow-overriding-alsa-jack.patch" # For has_networking - "${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch" - "${FILESDIR}/${PN}-3.3.3-upstream-fix-rapidjson.patch" - - # Add Findlibmad.cmake - "${FILESDIR}/${PN}-3.3.3-Findlibmad.patch" - - # Fix includes - "${FILESDIR}/${PN}-3.3.3-fix-includes.patch" - - # gettext 0.22 - "${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch" + "${FILESDIR}/audacity-3.7.0-local-threadpool-libraries.patch" # Allows running tests without conan - "${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch" + "${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch" # #920363 - "${FILESDIR}/${PN}-3.4.2-audiocom-std-string.patch" + "${FILESDIR}/audacity-3.7.0-audiocom-std-string.patch" ) src_prepare() { cmake_src_prepare - local header_subs="${S}/lib-src/header-substitutes" - cat <<-EOF >"${header_subs}/allegro.h" || die - /* Hack the allegro.h header substitute to use system headers. */ - #include <portsmf/allegro.h> - EOF - # Keep in sync with has_networking and the ThreadPool.h SRC_URI. if use audiocom; then - mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die - cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \ - "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die + mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die + cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \ + "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die fi + + # Remove documentation incorrect installations + sed -i -e \ + '/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \ + src/CMakeLists.txt || die } src_configure() { - # -Werror=strict-aliasing - # Reportedly also -Werror=odr but I could not get that far. - # https://bugs.gentoo.org/915226 - # https://github.com/audacity/audacity/issues/6096 - append-flags -fno-strict-aliasing - filter-lto - setup-wxwidgets # * always use system libraries if possible - # * options listed roughly in the order specified in - # cmake-proxies/CMakeLists.txt # * USE_VST was omitted, it appears to no longer have dependencies # (this is different from VST3) local mycmakeargs=( # Tell the CMake-based build system it's building a release. -DAUDACITY_BUILD_LEVEL=2 - -Daudacity_use_nyquist=local - -Daudacity_use_pch=OFF - -Daudacity_use_portmixer=$(usex portmixer system off) - -Daudacity_use_soxr=system - -Daudacity_conan_enabled=OFF + -Daudacity_conan_enabled=off -Daudacity_has_networking=$(usex audiocom on off) # Not useful on Gentoo. -Daudacity_has_updates_check=OFF -Daudacity_has_audiocom_upload=$(usex audiocom on off) + # Disable telemetry features. + -Daudacity_has_sentry_reporting=off + -Daudacity_has_crashreports=off + + -Daudacity_has_tests=$(usex test on off) + # The VST3 SDK is unpackaged, and it appears to be under a breed # of a proprietary license and the GPL. - -Daudacity_has_vst3=OFF + -Daudacity_has_vst3=off + -Daudacity_lib_preference=system -Daudacity_obey_system_dependencies=ON -Daudacity_use_expat=system @@ -200,35 +189,34 @@ src_configure() { -Daudacity_use_ladspa=$(usex ladspa) -Daudacity_use_lame=system -Daudacity_use_wxwidgets=system + -Daudacity_use_libflac=$(usex flac system off) -Daudacity_use_libmp3lame=system -Daudacity_use_libmpg123=$(usex mpg123 system off) - -Daudacity_use_libmad=$(usex mad system off) - -Daudacity_use_wavpack=$(usex wavpack system off) -Daudacity_use_libogg=$(usex ogg system off) - -Daudacity_use_libflac=$(usex flac system off) -Daudacity_use_libopus=$(usex opus system off) -Daudacity_use_libsndfile=system -Daudacity_use_libvorbis=$(usex vorbis system off) - -Daudacity_use_portaudio=system - -Daudacity_use_midi=system - -Daudacity_use_vamp=$(usex vamp system off) -Daudacity_use_lv2=$(usex lv2 system off) + -Daudacity_use_midi=system + -Daudacity_use_nyquist=local + -Daudacity_use_opusfile=$(usex opus system off) + -Daudacity_use_pch=off + -Daudacity_use_portaudio=system + -Daudacity_use_portmixer=$(usex portmixer system off) -Daudacity_use_portsmf=system + -Daudacity_use_rapidjson=system -Daudacity_use_sbsms=$(usex sbsms system off) -Daudacity_use_soundtouch=system + -Daudacity_use_soxr=system -Daudacity_use_twolame=$(usex twolame system off) - - # Disable telemetry features. - -Daudacity_has_sentry_reporting=off - -Daudacity_has_crashreports=off + -Daudacity_use_vamp=$(usex vamp system off) + -Daudacity_use_wavpack=$(usex wavpack system off) # See the allow-overriding-alsa-jack.patch patch -DPA_HAS_ALSA=$(usex alsa on off) ## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt; ## AFAICT it introduces no deps as-is, but that could change. ## Similar goes for PA_HAS_JACK. - - -Daudacity_has_tests=$(usex test ON OFF) ) cmake_src_configure @@ -237,10 +225,3 @@ src_configure() { src_test() { virtx cmake_src_test } - -src_install() { - cmake_src_install - - # Remove bad doc install - rm -r "${ED}"/usr/share/doc || die -} diff --git a/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch index 53ac8edc33fb..00852c3889a9 100644 --- a/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch +++ b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch @@ -4,13 +4,6 @@ Date: Sat, 17 Dec 2022 21:13:56 +0100 Subject: [PATCH] portmixer: Allow overriding PA_HAS_{ALSA,JACK} Not included for OSS as OSS is always included AFAICT. ---- - CMakeLists.txt | 3 +++ - lib-src/portmixer/CMakeLists.txt | 9 ++++++--- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42e765691..c18a939e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -624,6 +624,9 @@ cmd_option( ${_OPT}use_portmixer "Build PortMixer support into Audacity" On) @@ -23,8 +16,6 @@ index 42e765691..c18a939e6 100644 endif() cmd_option( ${_OPT}use_nyquist "Build Nyquist support into Audacity" On) -diff --git a/lib-src/portmixer/CMakeLists.txt b/lib-src/portmixer/CMakeLists.txt -index 65a384fa0..1ddc8ed50 100644 --- a/lib-src/portmixer/CMakeLists.txt +++ b/lib-src/portmixer/CMakeLists.txt @@ -8,9 +8,12 @@ if (UNIX AND NOT APPLE) diff --git a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch index a40847bb941c..c18e9e521d62 100644 --- a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch +++ b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch @@ -3,14 +3,6 @@ From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> Date: Fri, 16 Dec 2022 23:37:36 +0100 Subject: [PATCH] Don't force enable ccache ---- -Analogous to the similar patches in prior versions. - -CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c1c7baf2..42e765691 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,14 +142,6 @@ set( CMAKE_PREFIX_PATH diff --git a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch index 7237614782b3..908d7efeb316 100644 --- a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch +++ b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch @@ -7,14 +7,6 @@ Date: Fri, 14 Jul 2023 21:17:45 +0000 Subject: [PATCH] Add missing Findlibmad.cmake file This fixes compiling against the system installed libmad. ---- - cmake-proxies/cmake-modules/Findlibmad.cmake | 35 ++++++++++++++++++++ - 1 file changed, 35 insertions(+) - create mode 100644 cmake-proxies/cmake-modules/Findlibmad.cmake - -diff --git a/cmake-proxies/cmake-modules/Findlibmad.cmake b/cmake-proxies/cmake-modules/Findlibmad.cmake -new file mode 100644 -index 000000000000..0858c2d93e24 --- /dev/null +++ b/cmake-proxies/cmake-modules/Findlibmad.cmake @@ -0,0 +1,35 @@ diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch index 2e8685a09a3f..4e9d2d0788d3 100644 --- a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch +++ b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch @@ -4,13 +4,6 @@ Date: Fri, 14 Jul 2023 21:08:52 +0000 Subject: [PATCH] Fix ImportMP3_MAD and ImportQT include directives This fixes 'file not found' errors. ---- - src/import/ImportMP3_MAD.cpp | 6 +++--- - src/import/ImportQT.cpp | 8 ++++---- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/import/ImportMP3_MAD.cpp b/src/import/ImportMP3_MAD.cpp -index fa26eaca49dd..9e6dfdf3a534 100644 --- a/src/import/ImportMP3_MAD.cpp +++ b/src/import/ImportMP3_MAD.cpp @@ -62,10 +62,10 @@ static Importer::RegisteredUnusableImportPlugin registered @@ -27,8 +20,6 @@ index fa26eaca49dd..9e6dfdf3a534 100644 // PRL: include these last, // and correct some preprocessor namespace pollution from wxWidgets that -diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp -index f931b5a63fc1..5b49c1630b7f 100644 --- a/src/import/ImportQT.cpp +++ b/src/import/ImportQT.cpp @@ -17,8 +17,8 @@ diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch index b3fcdb85b022..5588f2e2b968 100644 --- a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch +++ b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch @@ -8,9 +8,8 @@ Fixes: https://github.com/audacity/audacity/issues/3289 Forwarded: https://github.com/audacity/audacity/pull/3671 [1] https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#caveats -diff -Nuar a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200 -+++ b/CMakeLists.txt 2023-07-14 01:18:46.452163033 +0200 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -412,6 +412,7 @@ set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" ) set( _DATADIR "${CMAKE_INSTALL_DATADIR}" ) @@ -19,9 +18,8 @@ diff -Nuar a/CMakeLists.txt b/CMakeLists.txt set( _PKGDATA "${_DATADIR}/audacity/" ) set( _MANDIR "${CMAKE_INSTALL_MANDIR}" ) set( _MODDIR "${_PKGLIB}/modules" ) -diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake ---- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake 2023-06-08 15:17:02.000000000 +0200 -+++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake 2023-07-14 01:23:42.025628702 +0200 +--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake ++++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake @@ -338,6 +338,17 @@ set( "${var}" "${node}" PARENT_SCOPE ) endfunction() @@ -70,17 +68,15 @@ diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" ) -diff -Nuar a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt ---- a/modules/mod-script-pipe/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200 -+++ b/modules/mod-script-pipe/CMakeLists.txt 2023-07-14 01:25:10.730068564 +0200 +--- a/modules/mod-script-pipe/CMakeLists.txt ++++ b/modules/mod-script-pipe/CMakeLists.txt @@ -15,3 +15,4 @@ ) audacity_module( mod-script-pipe "${SOURCES}" "Audacity" "${DEFINES}" "" ) +install_audacity_module( mod-script-pipe ) -diff -Nuar a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200 -+++ b/src/CMakeLists.txt 2023-07-14 01:26:23.098427419 +0200 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -1557,11 +1557,6 @@ RUNTIME RESOURCE DESTINATION "${_PKGDATA}" ) diff --git a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch index a3ef6cf3859d..8ca232d5896a 100644 --- a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch +++ b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch @@ -5,9 +5,8 @@ From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> Date: Sun, 18 Dec 2022 13:37:35 +0100 Subject: [PATCH] Allow using local dependency for threadpool -diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/cmake-modules/DependenciesList.cmake ---- a/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:22.518292749 +0200 -+++ b/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:43.790398232 +0200 +--- a/cmake-proxies/cmake-modules/DependenciesList.cmake ++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake @@ -56,7 +56,6 @@ audacity_find_package(PortAudio REQUIRED) @@ -16,9 +15,8 @@ diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/ audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl) endif() -diff -Nuar a/libraries/lib-network-manager/CMakeLists.txt b/libraries/lib-network-manager/CMakeLists.txt ---- a/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:42.061794613 +0200 -+++ b/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:27.913724456 +0200 +--- a/libraries/lib-network-manager/CMakeLists.txt ++++ b/libraries/lib-network-manager/CMakeLists.txt @@ -43,4 +43,8 @@ set ( DEFINES INTERFACE "HAS_NETWORKING" ) diff --git a/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch index 63dd3b58f0f0..2898cd1a53cf 100644 --- a/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch +++ b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch @@ -9,12 +9,6 @@ Subject: [PATCH] Remove dependency on conan for unit tests These run fine with catch2 installed from system package manager; there is no reason to enforce conan dependency. ---- - CMakeLists.txt | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cbe79a43b933..7b682c4e729d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,15 +228,11 @@ cmd_option( ${_OPT}has_url_schemes_support diff --git a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch index c95676a18cfe..e3c110e72d07 100644 --- a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch +++ b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch @@ -6,14 +6,6 @@ From: Dmitry Vedenko <dmitry@crsib.me> Date: Mon, 7 Aug 2023 17:12:49 +0300 Subject: [PATCH] Fixes RapidJSON missing from Linux builds ---- - .../cmake-modules/dependencies/rapidjson.cmake | 15 +++++++++++++-- - linux/packages/arch/dependencies.sh | 1 + - linux/packages/fedora34/dependencies.sh | 1 + - 3 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake -index c44aad81b8e4..ba95962a6eb6 100644 --- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake +++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake @@ -1,7 +1,18 @@ @@ -37,8 +29,6 @@ index c44aad81b8e4..ba95962a6eb6 100644 + endif() endif() endif() -diff --git a/linux/packages/arch/dependencies.sh b/linux/packages/arch/dependencies.sh -index d34012442efd..8aa8792057d4 100755 --- a/linux/packages/arch/dependencies.sh +++ b/linux/packages/arch/dependencies.sh @@ -44,6 +44,7 @@ deps=( @@ -49,8 +39,6 @@ index d34012442efd..8aa8792057d4 100755 ) pacman -Syu --noconfirm \ -diff --git a/linux/packages/fedora34/dependencies.sh b/linux/packages/fedora34/dependencies.sh -index 8f6ce8ff2eb8..1e039612b095 100755 --- a/linux/packages/fedora34/dependencies.sh +++ b/linux/packages/fedora34/dependencies.sh @@ -54,6 +54,7 @@ deps=( diff --git a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch index f06799030b4b..3a0289c69a0f 100644 --- a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch +++ b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch @@ -9,12 +9,6 @@ std::string {aka std::_cxx11::basic_string<char>}` See: https://bugs.gentoo.org/920363 Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com> ---- - libraries/lib-cloud-audiocom/OAuthService.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/lib-cloud-audiocom/OAuthService.h b/libraries/lib-cloud-audiocom/OAuthService.h -index bd01f1656..18761df6d 100644 --- a/libraries/lib-cloud-audiocom/OAuthService.h +++ b/libraries/lib-cloud-audiocom/OAuthService.h @@ -12,6 +12,7 @@ diff --git a/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch index 8c47ff8642d7..4a21f19dd0e5 100644 --- a/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch +++ b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch @@ -7,12 +7,6 @@ libraries/lib-lv2/LV2Utils.h:18:10: fatal error: lilv/lilv.h: No such file or di 18 | #include "lilv/lilv.h" // for lilv_free | ^~~~~~~~~~~~~ compilation terminated. ---- - libraries/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt -index b1ebefa1b023..879cd948791d 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -50,7 +50,6 @@ set( LIBRARIES diff --git a/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch b/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch new file mode 100644 index 000000000000..c0689d4724ac --- /dev/null +++ b/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch @@ -0,0 +1,39 @@ +From e46dbcb9763f4367705c66009703f15ff0ff5558 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Sat, 17 Dec 2022 21:13:56 +0100 +Subject: [PATCH] portmixer: Allow overriding PA_HAS_{ALSA,JACK} + +Not included for OSS as OSS is always included AFAICT. + +REBASED + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,6 +607,9 @@ cmd_option( ${_OPT}use_portmixer "Build PortMixer support into Audacity" On) + if( ${_OPT}use_portmixer ) + set(USE_PORTMIXER Yes) + add_subdirectory( "lib-src/portmixer" ) ++else() ++ # Suppress bogus warnings about unused variables ++ set (unusedIgnore "${PA_HAS_ALSA}${PA_HAS_JACK}${PA_HAS_OSS}") + endif() + + cmd_option( ${_OPT}use_nyquist "Build Nyquist support into Audacity" On) +--- a/lib-src/portmixer/CMakeLists.txt ++++ b/lib-src/portmixer/CMakeLists.txt +@@ -8,9 +8,12 @@ if (UNIX AND NOT APPLE) + include(CheckIncludeFile) + set(CMAKE_REQUIRED_LIBRARIES portaudio::portaudio) + +- check_include_file( "pa_jack.h" PA_HAS_JACK ) +- +- check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA ) ++ if ( NOT DEFINED PA_HAS_JACK ) ++ check_include_file( "pa_jack.h" PA_HAS_JACK ) ++ endif() ++ if ( NOT DEFINED PA_HAS_ALSA ) ++ check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA ) ++ endif() + if( PA_HAS_ALSA ) + find_package( ALSA REQUIRED QUIET ) + endif() diff --git a/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch new file mode 100644 index 000000000000..b844429c8776 --- /dev/null +++ b/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch @@ -0,0 +1,24 @@ +From 23f1df0b13c46cef746674434640588864f8c453 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Sun, 18 Feb 2024 23:16:28 +0300 +Subject: [PATCH] Fix compilation with audiocom + +Fix error `OAuthService.h: error: field mAccessToken has incomplete type +std::string {aka std::_cxx11::basic_string<char>}` + +See: https://bugs.gentoo.org/920363 + +Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com> + +REBASED + +--- a/libraries/lib-cloud-audiocom/OAuthService.h ++++ b/libraries/lib-cloud-audiocom/OAuthService.h +@@ -12,6 +12,7 @@ + + #include <chrono> + #include <functional> ++#include <string> + #include <string_view> + #include <string> + #include <mutex> diff --git a/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch b/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch new file mode 100644 index 000000000000..9c2b9ebebde6 --- /dev/null +++ b/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch @@ -0,0 +1,22 @@ +From afd777fbcbaa9e9c14b80374c60ecd631eb537ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Fri, 16 Dec 2022 23:37:36 +0100 +Subject: [PATCH] Don't force enable ccache + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,14 +140,6 @@ set( CMAKE_PREFIX_PATH + set( CMAKE_CXX_STANDARD 17 ) + set( CMAKE_CXX_STANDARD_REQUIRED ON ) + +-# Use ccache if available +-find_program( CCACHE_PROGRAM ccache ) +-mark_as_advanced( FORCE CCACHE_PROGRAM ) +- +-if( CCACHE_PROGRAM ) +- set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" ) +-endif() +- + # Define option() prefix + set( _OPT "audacity_" ) + diff --git a/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch new file mode 100644 index 000000000000..c47ae9bd508a --- /dev/null +++ b/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch @@ -0,0 +1,30 @@ +This is an adapted version of: + +From 7b5f56ec441fb472b61bae14e1efa353db4d7aca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Sun, 18 Dec 2022 13:37:35 +0100 +Subject: [PATCH] Allow using local dependency for threadpool + +REBASED + +--- a/cmake-proxies/cmake-modules/DependenciesList.cmake ++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake +@@ -63,7 +63,6 @@ endif() + audacity_find_package(PortAudio REQUIRED) + + if( ${_OPT}has_networking ) +- audacity_find_package(ThreadPool REQUIRED) + audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl) + endif() + +--- a/libraries/lib-network-manager/CMakeLists.txt ++++ b/libraries/lib-network-manager/CMakeLists.txt +@@ -53,4 +53,8 @@ PRIVATE + set ( DEFINES INTERFACE "HAS_NETWORKING" PRIVATE "WIN32_LEAN_AND_MEAN" ) + + ++add_library ( threadpool::threadpool INTERFACE IMPORTED GLOBAL ) ++target_include_directories ( threadpool::threadpool INTERFACE ++ ${CMAKE_SOURCE_DIR}/lib-src/threadpool ++) + audacity_library( ${TARGET} "${SOURCES}" "${LIBRARIES}" "${DEFINES}" "" ) diff --git a/media-sound/audacity/files/audacity-3.7.0-portsmf.patch b/media-sound/audacity/files/audacity-3.7.0-portsmf.patch new file mode 100644 index 000000000000..612f8b7b5161 --- /dev/null +++ b/media-sound/audacity/files/audacity-3.7.0-portsmf.patch @@ -0,0 +1,11 @@ +--- a/libraries/lib-note-track/WrapAllegro.h ++++ b/libraries/lib-note-track/WrapAllegro.h +@@ -13,7 +13,7 @@ + #elif defined(__linux__) + + #include <cstring> // Allegro include fails if this header isn't included due to no memcpy +-#include "allegro.h" ++#include <portsmf/allegro.h> + + #else //_MSC_VER + diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest index 0ddde3c8327e..2871f3fd6de7 100644 --- a/media-sound/audex/Manifest +++ b/media-sound/audex/Manifest @@ -1,7 +1,5 @@ -DIST audex-24.05.2.tar.xz 706044 BLAKE2B 0f3e8781e5a8a8194899a3342de7463c0e075f5e0eaa57ef9e388c713c487273a7460a6ad4cd8171ba172d3ab121c9a9c81b9bd17d7546aeac69e0d9aa86cbff SHA512 ed43e59fb93b4836c9a65baebe8ab50d05d3389c63c38568f38706108af76905048b9d62e403ba1e36c3f3496fc1eb6d4e801d4571738bea428ef31d539db72e DIST audex-24.08.1.tar.xz 708788 BLAKE2B ab393b351afee6d119176020a9a791857f3e31a17f90295fb0dda362620216b97e2e4b351ae0fe732d149d16006aacd5595f5e009c51999e15b344c1c6676c00 SHA512 7a40d0bc0a605129500889c8192e43cc3591c4c3bb5d372fe8bdabe2bc7714ea5b249ce076b4db619aecbdb12c02416834e3eb2bf0fd64190e59a11091c75a7e DIST audex-24.08.2.tar.xz 708800 BLAKE2B 1f3101aff4cb3fe87c2c2fa9c70850609c3fb6fd3b7e8fa066817c2e6d270748fadb657391bdb20e6ae37e6ce0bc65c43a45930d5595fb648d042054d89ff352 SHA512 f4136321602ba7be94a62484c8e3fd40639320f17409f27ada700689b1c2bd01ec4c933a6b4b6b150e577d7af11fd9eacb5dbebb1f89633fe19fdc4adfd54c6f -EBUILD audex-24.05.2.ebuild 1093 BLAKE2B 2c178b89be4271f3c655da8df87246a891f1c68b75a895ddb178e6ccee98ca16475d9d0d1c0aec24e1dac2bf3e3241a0ffa40741ccab75b1cbe1600f2c0756cf SHA512 dafaec896b063097db9747385625fa10d569ba977ed2a1b8adc39f616a61cd7a21672cf830b1b1a60f286aea8d706aa60a6c2ac93dab25f39067168c61bc7d74 EBUILD audex-24.08.1.ebuild 1093 BLAKE2B db66a15006f0146c997fdc3cefe2ff6542f02e9f67f428da7b2978a2f09b5f15bb75c3a2fd73c9f823e9a558f585bede9151587ed97635f53ff86573e08f4ab3 SHA512 1059ff6e5d75fe4be3d1fd8e5ab1a565cffe7b32c187706536d0e1f51d2752783755537462c2a459ef5f33f51439df1b2ac7eed097aa21b8fcf4d95e54cb1c54 EBUILD audex-24.08.2.ebuild 1095 BLAKE2B 57512f73f723b2fd534dce22e73c4b2e79431f2d54864ec40c6081bcbbb516b01daa5b791a1abb54cdcb0696285b8ac4074dd7caad83c3bee75c5eb60963de91 SHA512 510ffad083f4aba3a10f4548e796975676fff187204e8200ab1639e74b0887968f9e8ce0ea628b608da9dd434cc7b83dc2848a06138b01e3b7786c150439efb7 MISC metadata.xml 378 BLAKE2B 3364d201ed8d0e27a85b8ff1db8dff1f76d3d44933ced0a1ffe14921f7fe8ef37f2d94c0e9fffb81a0a6181770f411c6bf061175200b92e686d061276b7751b5 SHA512 704ad11b3e7156c5a83c2a6e439a6c718acf9f520a17e8718b90ea3bb21e185b364d12998ed1929b90ba84c4f599e06ff02d27980176aeeea1dd8f3252b27385 diff --git a/media-sound/audex/audex-24.05.2.ebuild b/media-sound/audex/audex-24.05.2.ebuild deleted file mode 100644 index e3357526c349..000000000000 --- a/media-sound/audex/audex-24.05.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit ecm gear.kde.org - -DESCRIPTION="Tool for ripping compact discs" -HOMEPAGE="https://apps.kde.org/audex/ https://userbase.kde.org/Audex" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=kde-apps/libkcddb-${PVCUT}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - dev-libs/libcdio:= - dev-libs/libcdio-paranoia:= -" -RDEPEND="${DEPEND}" diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest index 2dfdc05fd695..c7fe4986df91 100644 --- a/media-sound/chuck/Manifest +++ b/media-sound/chuck/Manifest @@ -1,5 +1,8 @@ -AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0 -AUX chuck-1.4.1.1-makefile.patch 1482 BLAKE2B 42e88771eebc224b217ce51dc0d127609b157874f81b23cbc641e0437a37a1ebc17d8977e068deb21db5660a1bb5b4ab349370c69a5ba253ac2260885b6561a9 SHA512 b11d263a26cea372ab93212805592e260ef4626b8513758b1b78f678623eb0da1826236d36c15af75129962e8735ead2aa31836f87dd3ee6c4388e99e7ddd7a1 +AUX chuck-1.4.0.0-hid-smc.patch 2887 BLAKE2B e02129a2f3e550fa383a691a3e55870d152c89386703e01d134ef345efadadcccf190d07b191f096995b9df2f27e85ccc3e26cb7e73052432c44e43bf82c8d5a SHA512 fb15c2c5e0cfe1e8326c71fe11a72bd3d04996890e7a466111d0360e6f8050408c7ba61f23ab57ae8d3d21fa009ac3afbba002b63819c321d6a55e83e000fe0a +AUX chuck-1.4.1.1-makefile.patch 1185 BLAKE2B 25ab9eadab5e3ddf5369cc0b44f66d3a37010b0dab35251cafd6b663ef8382e699b05cf32d0771e7292c4019b9b3326774e7b081208123b73c592424e46b6b6f SHA512 3e2253fdb32a0eca92e2a8555d4d49f252b1a512d7ba8eb4ef7c9a68e51b4260529e5988f7cab53fabdb11198c710211734e1bec44688bc0315754c825a7b473 +AUX chuck-1.5.3.2-makefile.patch 567 BLAKE2B e860079107526b090d592fadf0652dd26b29139cb081eaf43071544ac6f23cde2ddc50db59b57370b09aad19fc595b12b75341908716a0faf13ebedf0c437da0 SHA512 363dce64af8dded1115473d5268f69a0a4a391a0825a1f0811d8f490ec6181118b6f34af5934ffcd02a5ac9459faee1aef3ff4a2e06b0291bae473173dba99cf DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360 +DIST chuck-1.5.3.2.tgz 22275903 BLAKE2B e59145cc0e1f347168cbeabcd9208768559bd6caef3fdc4de6a1adf93d696f425a4ae3e0a70a59db7346e4ea5ad01c374e16b2d94e3d47cef376fd6ac2bbabe0 SHA512 9a853b192c01f3eab40a2d368a372950eb377a713820628cef1bb7fdd5e71221940274ce6ad8e726cf0ecc0e24919451a70d751871d0166855619c6409020fb2 EBUILD chuck-1.4.1.1.ebuild 1856 BLAKE2B 3ac1450b0a819d7d2c4a7e3daf0f3eec0b24bf5671813ccaac0b31792c8091898a60c39354037f0840c0d988b4cfd1eb5ee172074a66ab354d030db576523f1e SHA512 3c7edb4e92c43fb7ebe9d2ff8fa105423e5b7e62839cedecd8ab8e20408726628b8611627ce97e211387f44a5eda7e0519842c53592f09825108567f34b61c12 +EBUILD chuck-1.5.3.2.ebuild 1855 BLAKE2B 0cd25e5032ce928c1bff8969d383a14722275667ed03b10c57c70726b57347263ade552ac558a4699af82bf812f19928e2d1aa5d32fe67bfd2c24b01b2f432e6 SHA512 1e0faac1cc0ba109609fdc27c14bd40e18e92797e7d764104fbf66bccaf1265590aa4b14873a7811b18ce9923c0a16cd0cf78e68de7c6fca3c9e31f2f5f26684 MISC metadata.xml 968 BLAKE2B 5f7c72834133fedc3ffb54f563dc80552668484628029f8d205444cd69f89f91081ed6a71aae4d542dae09bcfc729ad88c6701df450313275e6d1c1f522fd7a6 SHA512 c548e0d3c701497e696626f46c010aea9a90bb1b52bd5f2e1ebe0f4189b171dc21c0848b90a6a23cc44ae2ba5e98d8671529fe6b14c957ad73202191c2915c0f diff --git a/media-sound/chuck/chuck-1.5.3.2.ebuild b/media-sound/chuck/chuck-1.5.3.2.ebuild new file mode 100644 index 000000000000..70115f4d5785 --- /dev/null +++ b/media-sound/chuck/chuck-1.5.3.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language" +HOMEPAGE="http://chuck.cs.princeton.edu/" +SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa jack examples" +REQUIRED_USE="|| ( alsa jack )" + +RDEPEND="app-eselect/eselect-chuck + media-libs/libsndfile + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack )" +DEPEND="${RDEPEND} + app-alternatives/yacc + app-alternatives/lex" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch + "${FILESDIR}"/${PN}-1.5.3.2-makefile.patch +) + +compile_backend() { + backend=$1 + pushd "${S}/src" &>/dev/null || die + einfo "Compiling against ${backend}" + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend} + mv chuck{,-${backend}} || die + emake clean + popd &>/dev/null || die +} + +src_compile() { + # when compile with athlon or athlon-xp flags + # chuck crashes on removing a shred with a double free or corruption + # it happens in Chuck_VM_Stack::shutdown() on the line + # SAFE_DELETE_ARRAY( stack ); + replace-cpu-flags athlon athlon-xp i686 + + use jack && compile_backend jack + use alsa && compile_backend alsa +} + +src_install() { + use jack && dobin src/chuck-jack + use alsa && dobin src/chuck-alsa + + dodoc AUTHORS DEVELOPERS QUICKSTART README.md THANKS VERSIONS + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Chuck now can use multiple audio engines, so you can specify" + elog "the preferred audio engine with chuck-{jack,alsa}" + elog "Or you can use 'eselect chuck' to set the audio engine" + fi + eselect chuck update --if-unset +} diff --git a/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch b/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch index 0f608f579953..12f0091fd04c 100644 --- a/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch +++ b/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch @@ -145,4 +145,3 @@ #endif -Only in chuck-1.4.0.0/src/core: util_hid.cpp.orig diff --git a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch index 98147cf9a81f..b5dc2f994386 100644 --- a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch +++ b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch @@ -1,5 +1,3 @@ -diff --git a/src/core/makefile.x/makefile.alsa b/src/core/makefile.x/makefile.alsa -index 5694257..577dd91 100644 --- a/src/core/makefile.x/makefile.alsa +++ b/src/core/makefile.x/makefile.alsa @@ -1,4 +1,4 @@ @@ -8,8 +6,6 @@ index 5694257..577dd91 100644 +CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread -diff --git a/src/core/makefile.x/makefile.jack b/src/core/makefile.x/makefile.jack -index 86b2511..442708b 100644 --- a/src/core/makefile.x/makefile.jack +++ b/src/core/makefile.x/makefile.jack @@ -1,4 +1,4 @@ @@ -18,8 +14,6 @@ index 86b2511..442708b 100644 +CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread -diff --git a/src/makefile b/src/makefile -index f52f0c2..310991a 100644 --- a/src/makefile +++ b/src/makefile @@ -76,11 +76,11 @@ CK_VERSION=1.4.1.1 diff --git a/media-sound/chuck/files/chuck-1.5.3.2-makefile.patch b/media-sound/chuck/files/chuck-1.5.3.2-makefile.patch new file mode 100644 index 000000000000..3a4e041bb8a5 --- /dev/null +++ b/media-sound/chuck/files/chuck-1.5.3.2-makefile.patch @@ -0,0 +1,32 @@ +--- a/src/makefile ++++ b/src/makefile +@@ -90,15 +90,15 @@ win32: + + ########################### COMPILATION TOOLS ################################# + # lexer +-LEX=flex ++LEX?=flex + # parser +-YACC=bison ++YACC?=bison + # c compiler +-CC=gcc ++CC?=gcc + # c++ compiler +-CXX=g++ ++CXX?=g++ + # linker +-LD=$(CXX) ++LD?=$(CXX) + + + ############################# COMPILER FLAGS ################################## +@@ -113,8 +113,6 @@ endif + # enable chuck debug macros? + ifneq ($(CHUCK_DEBUG),) + CFLAGS+= -g -D__CHUCK_DEBUG__ +-else +-CFLAGS+= -O3 + endif + + # use 64-bit audio samples? diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest index f99d196d27bd..3e0305e8306b 100644 --- a/media-sound/elisa/Manifest +++ b/media-sound/elisa/Manifest @@ -1,7 +1,5 @@ -DIST elisa-24.05.2.tar.xz 2083008 BLAKE2B d20314651bb4b1ac3e51826c2153f4496fdfaf23ac6662b17f56d9efedf6e9cf310120865865301367d3e3feacf9e7144de85ab5613001a6b438e96128cd3018 SHA512 873f93d8301dabce0352902186ffb4b49db41c20da24f9b0df45d7613e66dc17f1d653c28eb8cd3c3eb549a671d03159eff15cfd5a3ccffd4ba587c0e163b4a7 DIST elisa-24.08.1.tar.xz 1908872 BLAKE2B 60e2748b4f9a0382f80511623bea1ec265a795d9374b2dbf13de0fc3d5775ef6cda5ffc3d198d4504f312cc9ef4a43d96c1fb97d033d1e6fb632a90a17f45651 SHA512 e64f46f3856407b834463fca991c0a27767a4a5cc8eefc234d7250610135c6e022def7dfe540042d1fd38cd42300b54e8ee3fae5baaa66ef738caf73b70816f1 DIST elisa-24.08.2.tar.xz 1908988 BLAKE2B 5141cdccbfcc3e874f6edb06622bd4ab43e5aee8c72c3f8a470974d5a0b825a8357330dab6ee8605221fb949d85c086bd04f17c8a745bbfb421eb5ace66bd188 SHA512 848463b4a23a77fc125fb38f6101403ddafd93bf7268b6c48f0da9ca42b3007358077439fe8f523b5cfdf82e49527be8ba15edd69d2a4e987b17bc726988f518 -EBUILD elisa-24.05.2.ebuild 1451 BLAKE2B 44a9e75af91109710305f66053fef23bb91ee3925449ad683162270b4ac6a1c2bd68b0156e7ec2295cab841e77535746a99a404a3e6930bacd5ae076b355b2f9 SHA512 064812e66d014f78b845f0e42af90ccd29719cb893001b4d942ea13fc3b8d593b59ea2fe43f272988f8db8e711b5ed3a56655509b11a598b8c514c217df60086 EBUILD elisa-24.08.1.ebuild 1383 BLAKE2B 72dc75aef9df06948894bdfacdaa0ffc28180f29aed23b186dd0be501c17c6df06beb16776b69d81766168074e79d832ab0c9a901afa64b2bd13257d0ad673aa SHA512 6277a71fa6426f47047f055d9e24d62042918039af23acacfdd5e8480d5d7238e224ad1f198ada2ba5f0a8bb3483ff6c28a8a788d8dfb7681a31b17089230be9 EBUILD elisa-24.08.2.ebuild 1385 BLAKE2B 67179ef5431322201c8f6abf228cfaa11cbdb6579513898508d6876eb9aa256f80e1ef197c6c8143ac4c2e9589a81fc178f1792926bda1d139e4baff5c5ade68 SHA512 cfa8c53f5cde12c31422ada2256997f0662ba8beb455f65d680b849f8a6f6b2c894c1d26726ae215d18ffbd58e6def552f2a99772bb33ea5194e07b425ba305f MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751 diff --git a/media-sound/elisa/elisa-24.05.2.ebuild b/media-sound/elisa/elisa-24.05.2.ebuild deleted file mode 100644 index cd0482cd0b48..000000000000 --- a/media-sound/elisa/elisa-24.05.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit ecm gear.kde.org - -DESCRIPTION="Simple music player by KDE" -HOMEPAGE="https://apps.kde.org/elisa/" - -LICENSE="LGPL-3+" -SLOT="6" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" -IUSE="+mpris vlc" - -RESTRICT="test" - -DEPEND=" - >=dev-libs/kirigami-addons-0.11.76:6 - >=dev-qt/qtbase-${QTMIN}:6[gui,sql,widgets] - >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - >=dev-qt/qtmultimedia-${QTMIN}:6 - >=kde-frameworks/kcolorscheme-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib] - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/kitemviews-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - mpris? ( - >=dev-qt/qtbase-${QTMIN}:6[dbus] - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - ) - vlc? ( media-video/vlc:= ) - !vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:6 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qt5compat-${QTMIN}:6[qml] -" -BDEPEND="sys-devel/gettext" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package mpris KF6DBusAddons) - $(cmake_use_find_package vlc LIBVLC) - ) - - ecm_src_configure -} diff --git a/media-sound/kasts/Manifest b/media-sound/kasts/Manifest index d955e42b5be1..e555831af90e 100644 --- a/media-sound/kasts/Manifest +++ b/media-sound/kasts/Manifest @@ -1,7 +1,5 @@ -DIST kasts-24.05.2.tar.xz 608992 BLAKE2B ca871f8c06cd9bc757476105585bc7e2c044dc91335c38769c38717f5b299322837619f41b5708f59e943b62a9a6db2b1d0e36b3076546a3398c78e4d13521d3 SHA512 38c974601c8ef91da0bf1c4a4ab4120b028a39198d4651100002e32fa6ec9790acf5028615496680d1282cfcbd6c190988b79be3378ba78172433dacba3cff8d DIST kasts-24.08.1.tar.xz 619004 BLAKE2B 17b7fd2fdb6402b04680b18421116f1113f11f099b7d0ca4306f122b2ffe81c3953ac86cd371f609a64be4555fafebc6b77cbc18fcc3e2cf07c899c3b5b781d7 SHA512 01dbce271ab5e84504b407029fbb160e8437f9f2aca7f4b3ebd7d5edcb8cb7c976c76f2d1d8d6d8533251a2f125d6d10653a9a509f77afd02d5b5fab8006b62a DIST kasts-24.08.2.tar.xz 619072 BLAKE2B 55054dde813fc27a425bda9feeb3c1d09cbfaba7a579a76bd39d03869ac39eba11c6bf5aae3382198fb4e289a3d2f73bc1fac6092fac8c2dcdf17e7101b01c71 SHA512 f89421b500f7adcccabce1ee0f1a1aa7c1b3e532cd036cabbe3c00848e16fc0ae786555b42939fe16684346ccb9947944f966560f230a1aa85685f3a9c507083 -EBUILD kasts-24.05.2-r1.ebuild 1285 BLAKE2B 4349598ea7a2f997bd319831abc7d09b53718f77bd4a9b80ba47ccff774a0a9e3bb42a67102794b36dc3d99bb2a047f2819f7a22a105b6d5cc9207fd10ee73d4 SHA512 ff2f0d854d984f2ff033e731293029387d6c86028f8b0f697b542460e0c5465eed6654b6567d64473b9dd569b03037a196ba94def21ea3b99ae603a63e44e84f EBUILD kasts-24.08.1.ebuild 1285 BLAKE2B b2d774a6481b2db0f76d6c92769798c8d75fab57a8157ef29e91c80bce14436896fd74ec231b0b0a9586a67ad63e5401f3baed53d914ec5a4f742b9c80018748 SHA512 45dec9d26feb22ef22b576a21c9aa6100e16fb641ae078bc2127abddd0a9a01b6502259add5ee73e7407885a0466058dd8da47b2d1aec8236094affbad023290 EBUILD kasts-24.08.2.ebuild 1287 BLAKE2B bc909b49d127766b09699afc782699599dca68a0e7291f07456b49e10637e72f47bb78b342092a1c03a448b211d1ecf38ce72a089d02694bc02fe5f7d3c33d4f SHA512 aed30b1f38b4d87372ac8cc957a49a673f056d6d42bfa8967ee127923e71bed82ae8897af20f78f116359731d4fd8bae14bb00d5d1d86c900134577a8edd2412 MISC metadata.xml 461 BLAKE2B f69d730a1f4e042650158f9819d07209c9d98492076400efebc152aa60950bd512bce5f8fabbd0a1bded16af201a03db57a56ef5c708662d7e8b058c2f0aa194 SHA512 4ac8027c4d3068ba151104708b13c3cbf21617da83e32d7a471421e9007d31ae5122335072bc99c7c2e4e2981e8ce1812e0b4dbf168f6d8adfeb6d079e68793f diff --git a/media-sound/kasts/kasts-24.05.2-r1.ebuild b/media-sound/kasts/kasts-24.05.2-r1.ebuild deleted file mode 100644 index 853b0cbd9a3d..000000000000 --- a/media-sound/kasts/kasts-24.05.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=6.3.0 -QTMIN=6.6.2 -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 ~ppc64 ~riscv ~x86" -IUSE="gstreamer vlc" - -DEPEND=" - dev-libs/kirigami-addons:6 - >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtmultimedia-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=kde-frameworks/breeze-icons-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/syndication-${KFMIN}:6 - >=kde-frameworks/threadweaver-${KFMIN}:6 - media-libs/taglib:= - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-good:1.0 - ) - vlc? ( media-video/vlc:= ) -" -RDEPEND="${DEPEND}" -BDEPEND="gstreamer? ( virtual/pkgconfig )" - -src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLE_PLAYER=OFF - -DBUILD_GSTREAMER_BACKEND=$(usex gstreamer) - $(cmake_use_find_package vlc LIBVLC) - ) - ecm_src_configure -} diff --git a/media-sound/krecorder/Manifest b/media-sound/krecorder/Manifest index 1e856c355bdc..54ee55da16b6 100644 --- a/media-sound/krecorder/Manifest +++ b/media-sound/krecorder/Manifest @@ -1,7 +1,5 @@ -DIST krecorder-24.05.2.tar.xz 166792 BLAKE2B 50c64c8b7e3936457cf9bd47b20427376fb413c816a14756601919b711e5f813ee53b97bd9559ae54fb4ca3f6f05ed144ead092bb30ddfa7774ccd2ebc6d9eb3 SHA512 e5110464b5881c894c46a94a03dec7ad1a375025db4922566994368669de7cf608cd2eb6cdde1565292c0e50ee1ccce55517daed4601c924f5b8ebef49507942 DIST krecorder-24.08.1.tar.xz 168232 BLAKE2B 7f4ff927a177d3623c33047718ddf06fa368adb1db6b9393d38e64e4d09a9d2eca317d50a12c5ecaa5b62ee91f26cd9a85d1d21b7d12806b61af6d39b7c79618 SHA512 0ab7b9c658afe868c3a1bc2d85c8a38eddbf4313012fe45298b0b5e006fdc4b343b8405f721dcf4d4306822250736085fbae8828adca63031eedd960bfa6c9ed DIST krecorder-24.08.2.tar.xz 168304 BLAKE2B aa7317afd58bcd3ca2d8ffbb5abc9396a89ce16f998bf1ba311086589c6996207852d1926971672ad3a8052302ff03add665bde8b173e649b6f7ee2c5110aefb SHA512 cce2ec2db99bdbbb0dde8f765904b19ec7b9fe0f51abfab1d0951595f340ab737da86dcdc9d71ddb649bb044e1efc9210c8932298a3339bf50c1d8a5cc1affb2 -EBUILD krecorder-24.05.2.ebuild 747 BLAKE2B 974647fce6fdb4e9f2097c62a00431bbe6d24d71585f71b2fcfa3c16552785116c59dad063027f1e042b146adaf8078f17cec0ff3f46718a47ada0d57cfdf697 SHA512 46e2b8e7c4b0639a2adae1d8c582a4434e4a211b7bfd2a9042e0ce8b1cedc7ae6e564fccf561ad011e7425375f768265c4bceb60f9db1be03de562933b7c3799 EBUILD krecorder-24.08.1.ebuild 747 BLAKE2B e3524360477f4d5f7ef8c3351f22f274a7ca204fe0239a6da8a02e2f63405520f740211d8b23839f3f889cafcb92d848eab34d618c9546a98a4ab322d21d0b9a SHA512 3621e77b205539110409fd04ad38ab76b84554f460cd1c21405fadb74aabf5ddcd0a588c23be70b72742cb6457e9a6cb271ddf5df8e9ca00cb03b86d07c658b5 EBUILD krecorder-24.08.2.ebuild 749 BLAKE2B 82a092969933ae25e48aa8f3959cea2f34ffe02c30b923171cff44859bc836ae05c6ee9ccd6c4030799278678a31037c65814a726bed1634e2f01faab7b57dc6 SHA512 1dc6f30746844dcf6c53cee923c798444277788edc77cf0bd37edd8d84fb62a4cb6cb641a94ca4e3cbe64ac235cc0e4e5dd4274b15ec00a39a126e06f39c6eb8 MISC metadata.xml 729 BLAKE2B 5afa1d385a0f5183b46590e95ef8e99b94d235a4720379222d8bbe43ff86e067d6d0d8580767ec31a0e80c38627535540ccb20c27ee09a4066ed268378f25272 SHA512 82df50c08faa64aa436b674336648887d13f77c2d6417a5ddf3c9f75b77ac705d2181dbbdc4bed0bb5d35276f3616f2e339ab48b7d4e3e2234515f245ce8c3f2 diff --git a/media-sound/krecorder/krecorder-24.05.2.ebuild b/media-sound/krecorder/krecorder-24.05.2.ebuild deleted file mode 100644 index 65debd1dfb8c..000000000000 --- a/media-sound/krecorder/krecorder-24.05.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_CATEGORY="utilities" -KFMIN=6.3.0 -QTMIN=6.6.2 -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:6 - >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtmultimedia-${QTMIN}:6[qml] - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 -" -RDEPEND="${DEPEND} - >=dev-qt/qtsvg-${QTMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 -" -BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:6" diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest index 2e1960d8a749..395449e806d8 100644 --- a/media-sound/sonic-visualiser/Manifest +++ b/media-sound/sonic-visualiser/Manifest @@ -1,5 +1,8 @@ -AUX serd.patch 492 BLAKE2B e71252663b5df4a8ebbe0fb55d7dd96e66925db96dcd0b1baa629e3387a0f2d17e8dd2a4958207e63500b52a0bccd24984a1f617a7c248fd27ad6e4166d781a5 SHA512 ed8847eb8c5594e994e8b62505fa022f6fb419898563b244ca3d0d2120ebfc6904f80a080b085ebdc0c47842c11ef347e0f426c29c46d3c36730dc02ba5b650b -AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238 +AUX serd.patch 367 BLAKE2B a3af7d390f81810208d79be2b1ecfcc7307333c8f13796fb18556eb5b91149d60a7db92b7136e40c777f0592933d64aefe324dab7123dc19fc7ed915d5f10987 SHA512 fceaa53cf26f41b48bb86164f85c152f05a276cb4c9b3d546e600f4b253d73089c4ca70fb9ac48a7cc9a66b87764c17e79799d50fc495ef980be6c9fe7ea5433 +AUX sonic-visualiser-4.3-meson.build.patch 4264 BLAKE2B 37b5d64198c785d4b971fa83c787583c4cefcceeec42d1d81f0f8f65e60660369c651d47335eceaa9114dc7242aa4a1741f92d20257f115bcf84384d2c3ebae5 SHA512 c5e67eb0c4056a76560270a484eee24a0bf6efbbc8e673b7a9acd2ab619c84931b728ea43b2653f0e1df4b9b1cfe0f1be454e5303b7f04e0d0abde8bb42c0bb7 +AUX sonic-visualiser-5.0.1-meson.build.patch 4556 BLAKE2B 7a9ed3ba375c3bd5767f63547ac1174eff9fe978892de7fa0cabcc3aeb46d88fa5a97964ae14da71d49d5da514cbc7dea3124e40c3b95463f2698aec48b134ba SHA512 3b2624fd4c2f0a44a7aa652bac51d30efdd17232f29780332f74ab7ea1707d44cb57a95933fbfaea36e071ab1ad795e466e16bfd5c410861181aaccf9f8501a0 DIST sonic-visualiser-4.5.tar.gz 6652200 BLAKE2B a5e39a755e991663390370c06ce5d54b2ff9422081f8b9046097645f1f747972d270233a0d4fe05d4e6adde5239ca6d2d0210a8a67d9ef6ede60089471ce6452 SHA512 eca7f7b2a56a4c70f38c8fafdd20d5c0e773dc1a99a75189998dd1f50ae777df4999e1a4b3431f9202edfb8ce2686d05cf6448493c263c52ab5f068169a7385d +DIST sonic-visualiser-5.0.1.tar.gz 6583441 BLAKE2B 8c3b87aaae14d2ec3284c75b7a4c7a977bd54ede14a6c8c6d8a4f1bd679d051c6abc12045003940537d2ce86f20c33103fee6a90b56947b17f917e7deff7faad SHA512 eb58403b3d680bbe9b6b30a2ee1899db71f245d6b7b153caa04953268bff1bb52da069d63d2e062ebb14e01a4474214de6770e389b6d611990db7fab8fd6ecc6 EBUILD sonic-visualiser-4.5.ebuild 1682 BLAKE2B 5b7b6c61571fbcab561d7bc43900fbd241d7ee3d128c85df3c9a0a95b9b5aba87aa61b0819d77b8e51a80eb6e3f22fd8a8d8c6b11b8e0289dc5327480376f84f SHA512 ef6f2a581bda1142361de337ac8f52a4987fb8b1f33edad8611dfbcf8771d62139c48e6f60a0d4d689aea260d37068de57abfc82fc0081a7857d981d9406a2bc +EBUILD sonic-visualiser-5.0.1.ebuild 1684 BLAKE2B 1368e34256110ed6e43624e58175a444e6d88815351c32435f9a2c8a4c80eb1ae8a1378f407562dace3a3800c407bdd2fdc42ee0a618fb40d8647cc8deb8ccd6 SHA512 4aa8c0ba314a188c746a5d86e56db97f083890d523294adf5969d827ccd2a0b7fb5ca9d9ed81c3b8d389182ef55d6065ae3ed2c39858df8ab758e46bafed6e02 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7 diff --git a/media-sound/sonic-visualiser/files/serd.patch b/media-sound/sonic-visualiser/files/serd.patch index c7b6f179a686..d2b20b409da3 100644 --- a/media-sound/sonic-visualiser/files/serd.patch +++ b/media-sound/sonic-visualiser/files/serd.patch @@ -3,12 +3,6 @@ From: Chris Cannam <cannam@all-day-breakfast.com> Date: Fri, 29 Jul 2022 13:31:37 +0100 Subject: [PATCH] Fix build failure ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 59a635f..35fc470 100644 --- a/meson.build +++ b/meson.build @@ -138,6 +138,7 @@ if system == 'linux' diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch index d92c07d587f7..1abea0fdadce 100644 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch +++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch @@ -1,5 +1,3 @@ -diff --git a/meson.build b/meson.build -index d1771e1..b18a5b6 100644 --- a/meson.build +++ b/meson.build @@ -90,17 +90,7 @@ if system == 'linux' @@ -166,9 +164,6 @@ index d1771e1..b18a5b6 100644 ] elif system == 'darwin' -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..e0da4fb --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,8 @@ diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-5.0.1-meson.build.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-5.0.1-meson.build.patch new file mode 100644 index 000000000000..5646dc07075e --- /dev/null +++ b/media-sound/sonic-visualiser/files/sonic-visualiser-5.0.1-meson.build.patch @@ -0,0 +1,177 @@ +--- a/meson.build ++++ b/meson.build +@@ -119,22 +119,8 @@ if system == 'linux' + serd_dep = dependency('serd-0', version: '>= 0.5') + capnp_dep = dependency('capnp', version: '>= 0.6') + lrdf_dep = dependency('lrdf', version: '>= 0.2') +- oggz_dep = dependency('oggz', version: '>= 1.0.0') +- fishsound_dep = dependency('fishsound', version: '>= 1.0.0') +- mad_dep = dependency('mad', version: '>= 0.15.0') +- id3tag_dep = dependency('id3tag', version: '>= 0.15.0') +- opus_dep = dependency('opusfile') +- opusenc_dep = dependency('opusenc', required: false) +- if not opusenc_dep.found() +- opusenc_dep = dependency('libopusenc', required: false) +- endif +- lo_dep = dependency('liblo') +- jack_dep = dependency('jack', version: '>= 0.100') +- libpulse_dep = dependency('libpulse', version: '>= 0.9') + alsa_dep = dependency('alsa') + +- portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false) +- + feature_dependencies = [ + vamphostsdk_dep, + bzip2_dep, +@@ -146,16 +132,6 @@ if system == 'linux' + serd_dep, + capnp_dep, + lrdf_dep, +- oggz_dep, +- fishsound_dep, +- mad_dep, +- id3tag_dep, +- opus_dep, +- opusenc_dep, +- lo_dep, +- portaudio_dep, +- jack_dep, +- libpulse_dep, + alsa_dep, + ] + +@@ -178,34 +154,104 @@ if system == 'linux' + '-DHAVE_SERD', + '-DHAVE_CAPNP', + '-DHAVE_LRDF', +- '-DHAVE_OGGZ', +- '-DHAVE_FISHSOUND', +- '-DHAVE_MAD', +- '-DHAVE_ID3TAG', +- '-DHAVE_OPUS', +- '-DHAVE_LIBLO', +- '-DHAVE_JACK', '-DDYNAMIC_JACK', +- '-DHAVE_LIBPULSE', + '-D__LINUX_ALSASEQ__', + '-D__LINUX_ALSA__' # for RtMidi + ] + +- if portaudio_dep.found() ++ enable_id3tag = get_option('id3tag') ++ if enable_id3tag ++ id3tag_dep = dependency('id3tag', version: '>= 0.15.0') ++ feature_dependencies += [ ++ id3tag_dep, ++ ] + feature_defines += [ +- '-DHAVE_PORTAUDIO', ++ '-DHAVE_ID3TAG', + ] + endif + +- if not opusenc_dep.found() ++ enable_jack = get_option('jack') ++ if enable_jack ++ jack_dep = dependency('jack', version: '>= 0.100') ++ feature_dependencies += [ ++ jack_dep, ++ ] + feature_defines += [ +- '-DHAVE_OPUS_READ_ONLY' ++ '-DHAVE_JACK', ++ '-DDYNAMIC_JACK', ++ ] ++ endif ++ ++ enable_mad = get_option('mad') ++ if enable_mad ++ mad_dep = dependency('mad', version: '>= 0.15.0') ++ feature_dependencies += [ ++ mad_dep, ++ ] ++ feature_defines += [ ++ '-DHAVE_MAD', ++ ] ++ ++ svcore_moc_args = [ ++ '-DHAVE_MAD' ++ ] ++ endif ++ ++ enable_ogg = get_option('ogg') ++ if enable_ogg ++ oggz_dep = dependency('oggz', version: '>= 1.0.0') ++ fishsound_dep = dependency('fishsound', version: '>= 1.0.0') ++ feature_dependencies += [ ++ oggz_dep, ++ fishsound_dep, ++ ] ++ feature_defines += [ ++ '-DHAVE_OGGZ', ++ '-DHAVE_FISHSOUND', ++ ] ++ endif ++ ++ enable_opus = get_option('opus') ++ if enable_opus ++ opus_dep = dependency('opusfile') ++ opusenc_dep = dependency('libopusenc') ++ feature_dependencies += [ ++ opus_dep, opusenc_dep, ++ ] ++ feature_defines += [ ++ '-DHAVE_OPUS', ++ ] ++ endif ++ ++ enable_osc = get_option('osc') ++ if enable_osc ++ lo_dep = dependency('liblo') ++ feature_dependencies += [ ++ lo_dep, ++ ] ++ feature_defines += [ ++ '-DHAVE_LIBLO', ++ ] ++ endif ++ ++ enable_portaudio = get_option('portaudio') ++ if enable_portaudio ++ portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false) ++ feature_dependencies += [ ++ portaudio_dep, ++ ] ++ endif ++ ++ enable_pulseaudio = get_option('pulseaudio') ++ if enable_pulseaudio ++ libpulse_dep = dependency('libpulse', version: '>= 0.9') ++ feature_dependencies += [ ++ libpulse_dep, ++ ] ++ feature_defines += [ ++ '-DHAVE_LIBPULSE', + ] + endif + +- svcore_moc_args = [ +- '-DHAVE_MAD' +- ] +- + elif system == 'darwin' + + svdeps_dir = meson.current_source_dir() / 'sv-dependency-builds/osx' +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,3 +3,11 @@ option('no_qt', + value: 'false', + description: 'Build only the small utilities that do not use Qt.') + ++option('id3tag', type: 'boolean', value: false) ++option('jack', type: 'boolean', value: false) ++option('mad', type: 'boolean', value: false) ++option('ogg', type: 'boolean', value: false) ++option('opus', type: 'boolean', value: false) ++option('osc', type: 'boolean', value: false) ++option('portaudio', type: 'boolean', value: false) ++option('pulseaudio', type: 'boolean', value: false) diff --git a/media-sound/sonic-visualiser/sonic-visualiser-5.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1.ebuild new file mode 100644 index 000000000000..3e8e85f984e8 --- /dev/null +++ b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +DESCRIPTION="Music audio files viewer and analiser" +HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser" +SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2866/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test" + +BDEPEND=" + dev-qt/qttest:5 + virtual/pkgconfig +" +RDEPEND=" + app-arch/bzip2 + dev-libs/capnproto:= + dev-libs/serd + dev-libs/sord + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/alsa-lib + media-libs/dssi + media-libs/ladspa-sdk + media-libs/liblrdf + media-libs/libsamplerate + media-libs/libsndfile + media-libs/rubberband + media-libs/speex + media-libs/vamp-plugin-sdk + sci-libs/fftw:3.0= + id3tag? ( media-libs/libid3tag:= ) + jack? ( virtual/jack ) + mad? ( media-libs/libmad ) + ogg? ( + media-libs/libfishsound + media-libs/liboggz + ) + opus? ( + media-libs/libopusenc + media-libs/opusfile + ) + osc? ( media-libs/liblo ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-libs/libpulse ) +" +DEPEND="${RDEPEND}" + +# tests fail without mp3 support +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( jack pulseaudio portaudio ) + test? ( id3tag mad ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.1-meson.build.patch" +) + +src_configure() { + local emesonargs=( + $(meson_use id3tag) + $(meson_use jack) + $(meson_use mad) + $(meson_use ogg) + $(meson_use opus) + $(meson_use osc) + $(meson_use portaudio) + $(meson_use pulseaudio) + ) + meson_src_configure +} |