From 494168b06b81a32b889c3cb1f721f925d0a6824f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 8 Dec 2024 02:07:29 +0000 Subject: gentoo auto-resync : 08:12:2024 - 02:07:28 --- media-plugins/Manifest.gz | Bin 42737 -> 42731 bytes media-plugins/audacious-plugins/Manifest | 2 - .../audacious-plugins-4.4.1.ebuild | 204 --------------------- media-plugins/calf/Manifest | 16 +- media-plugins/calf/calf-0.90.3-r2.ebuild | 85 --------- media-plugins/calf/calf-0.90.4.ebuild | 4 +- media-plugins/calf/calf-9999.ebuild | 4 +- media-plugins/calf/files/calf-0.9.4-htmldir.patch | 64 ------- .../calf/files/calf-0.9.4-no-automagic.patch | 39 ---- media-plugins/calf/files/calf-0.90.1-desktop.patch | 24 --- media-plugins/calf/files/calf-0.90.1-htmldir.patch | 66 ------- .../calf/files/calf-0.90.1-no-automagic.patch | 43 ----- ...0.90.3-clang-lerp_table_lookup_float_mask.patch | 39 ---- .../files/calf-0.90.3-fix-build-with-lld.patch | 26 --- .../files/calf-0.90.3-replace-std-bind2nd.patch | 32 ---- media-plugins/calf/files/calf-0.90.4-htmldir.patch | 64 +++++++ .../calf/files/calf-0.90.4-no-automagic.patch | 39 ++++ 17 files changed, 111 insertions(+), 640 deletions(-) delete mode 100644 media-plugins/audacious-plugins/audacious-plugins-4.4.1.ebuild delete mode 100644 media-plugins/calf/calf-0.90.3-r2.ebuild delete mode 100644 media-plugins/calf/files/calf-0.9.4-htmldir.patch delete mode 100644 media-plugins/calf/files/calf-0.9.4-no-automagic.patch delete mode 100644 media-plugins/calf/files/calf-0.90.1-desktop.patch delete mode 100644 media-plugins/calf/files/calf-0.90.1-htmldir.patch delete mode 100644 media-plugins/calf/files/calf-0.90.1-no-automagic.patch delete mode 100644 media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch delete mode 100644 media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch delete mode 100644 media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch create mode 100644 media-plugins/calf/files/calf-0.90.4-htmldir.patch create mode 100644 media-plugins/calf/files/calf-0.90.4-no-automagic.patch (limited to 'media-plugins') diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz index 5377bf314b3a..ec8f1b9c4701 100644 Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest index b1e674be0fc9..3a8421bbef92 100644 --- a/media-plugins/audacious-plugins/Manifest +++ b/media-plugins/audacious-plugins/Manifest @@ -1,5 +1,3 @@ -DIST audacious-plugins-4.4.1.tar.bz2 1815238 BLAKE2B 4ffa61818eeb01a34697c576b30832c7e4719c715080fec2b0d08f09ccce2ff9a8f95b6ce7af63ca5bf68de5c320258ef62716bb6819fd76cf7406546a0bf8c7 SHA512 0c97b4c1ba635b53f416680de57b6b5921b8f0afcefa713129475c006585d53581e8f693f89e705284383ce2f3f6c3e01def8bce9ba1371a18bee7e007884389 DIST audacious-plugins-4.4.2.tar.bz2 1816431 BLAKE2B e25b8558f3238bcfa076b6aa192f33365da478dc6c1a9500ac36be8a7dd0a51265b5d951098247c1dd8532b2d9cc87cf4705f1226c917659bffb0b1d0a1a3bd2 SHA512 d7951b779a0d2d56efc2372125a4565cb2054bd64d7f1e25dfa7bb0042e7df0b6a40d776910b444fda61ba79aeb7bb010316ec1353a877f89f2bc8f1a3e9b342 -EBUILD audacious-plugins-4.4.1.ebuild 4744 BLAKE2B 662c87e2d972ac24d7c2fc206f705bb91ca52d77cd12a957ce9a6137c9ae5f56a5dbef128a9f8b79cceae0d94bab3d7bb577ed12deba6365cfc30d6aa98713a2 SHA512 85a5ec92fddfe8402ef953e96a8b1dd1019000f93f8c931a95cc09d279c26cdba0fe984e210b4f8e8cbbc1a2937c56332a39989947a9b97e8d1aa626d5346d28 EBUILD audacious-plugins-4.4.2.ebuild 4744 BLAKE2B 662c87e2d972ac24d7c2fc206f705bb91ca52d77cd12a957ce9a6137c9ae5f56a5dbef128a9f8b79cceae0d94bab3d7bb577ed12deba6365cfc30d6aa98713a2 SHA512 85a5ec92fddfe8402ef953e96a8b1dd1019000f93f8c931a95cc09d279c26cdba0fe984e210b4f8e8cbbc1a2937c56332a39989947a9b97e8d1aa626d5346d28 MISC metadata.xml 1085 BLAKE2B 9d584b77159110462bd480591a083a50cc34d1a073a6c36f5ba8be4d4881b716866b5e5ac08136446a6411da68cfe5070ff8fb6f0ea60bd3b21e7080a5d710a2 SHA512 92c68aae01a847fc7d71cfeb25a97bc9fa517acae77f7c1e9e1df677ca15762e6ee3b7486022a8b9db6fc0fddef7a9b9851b957a26fe18a3485bce8a92c26462 diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.4.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.4.1.ebuild deleted file mode 100644 index c88da2b9e6c9..000000000000 --- a/media-plugins/audacious-plugins/audacious-plugins-4.4.1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Lightweight and versatile audio player" -HOMEPAGE="https://audacious-media-player.org/" -SRC_URI="https://distfiles.audacious-media-player.org/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE=" - aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme gtk http jack - lame libnotify libsamplerate lirc mms modplug mp3 opengl openmpt opus - pipewire pulseaudio qt6 scrobbler sdl sid sndfile soxr speedpitch - streamtuner vorbis wavpack X -" - -REQUIRED_USE=" - ampache? ( http ) - streamtuner? ( http ) -" - -# The following plugins REQUIRE a GUI build of audacious, because non-GUI -# builds do NOT install the libaudgui library & headers. -# Plugins without a configure option: -# alarm -# albumart -# delete-files -# ladspa -# playlist-manager -# search-tool -# skins -# vtx -# Plugins with a configure option: -# glspectrum -# gtkui -# hotkey -# notify -# statusicon -BDEPEND=" - dev-util/gdbus-codegen - virtual/pkgconfig -" -DEPEND=" - app-arch/unzip - dev-libs/glib:2 - dev-libs/libxml2:2 - ~media-sound/audacious-${PV}[gtk=,qt6=] - sys-libs/zlib - >=x11-libs/gdk-pixbuf-2.26:2 - aac? ( >=media-libs/faad2-2.7 ) - alsa? ( >=media-libs/alsa-lib-1.0.16 ) - ampache? ( =media-libs/ampache_browser-1*:= ) - bs2b? ( >=media-libs/libbs2b-3.0.0 ) - cdda? ( - >=dev-libs/libcdio-0.70:= - dev-libs/libcdio-paranoia:= - >=media-libs/libcddb-1.2.1 - ) - cue? ( media-libs/libcue:= ) - ffmpeg? ( >=media-video/ffmpeg-0.7.3:= ) - flac? ( - >=media-libs/flac-1.2.1-r1:= - >=media-libs/libvorbis-1.0 - ) - fluidsynth? ( >=media-sound/fluidsynth-1.0.6:= ) - gtk? ( - >=dev-libs/json-glib-1.0 - x11-libs/cairo - >=x11-libs/gtk+-3.22:3 - x11-libs/pango - X? ( - opengl? ( virtual/opengl ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - ) - ) - http? ( >=net-libs/neon-0.27 ) - jack? ( - >=media-libs/bio2jack-0.4 - virtual/jack - ) - lame? ( media-sound/lame ) - libnotify? ( >=x11-libs/libnotify-0.7 ) - libsamplerate? ( media-libs/libsamplerate:= ) - lirc? ( app-misc/lirc ) - mms? ( >=media-libs/libmms-0.3 ) - modplug? ( media-libs/libmodplug ) - mp3? ( media-sound/mpg123-base ) - openmpt? ( >=media-libs/libopenmpt-0.2 ) - opus? ( >=media-libs/opusfile-0.4 ) - pipewire? ( >=media-video/pipewire-0.3.26:= ) - pulseaudio? ( >=media-libs/libpulse-0.9.5 ) - qt6? ( - dev-qt/qtbase:6[gui,opengl?,widgets] - dev-qt/qtmultimedia:6 - X? ( - dev-qt/qtbase:6=[X] - x11-libs/libX11 - ) - ) - scrobbler? ( >=net-misc/curl-7.9.7 ) - sdl? ( >=media-libs/libsdl2-2.0[sound] ) - sid? ( >=media-libs/libsidplayfp-2.0 ) - sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) - soxr? ( media-libs/soxr ) - speedpitch? ( media-libs/libsamplerate:= ) - streamtuner? ( dev-qt/qtbase:6[network] ) - vorbis? ( - >=media-libs/libogg-1.1.3 - >=media-libs/libvorbis-1.2.0 - ) - wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" -} - -src_prepare() { - default - if ! use X; then - sed -i -e "s/dependency('x11',.*)/disabler()/" meson.build || die - fi -} - -src_configure() { - local emesonargs=( - # GUI toolkits - $(meson_use gtk) - -Dgtk2=false - $(meson_use qt6 qt) - -Dqt5=false - - # container plugins - $(meson_use cue cue) - - # transport plugins - $(meson_use mms mms) - $(meson_use http neon) - - # input plugins - $(meson_use aac aac) - -Dadplug=false - $(meson_use fluidsynth amidiplug) - $(meson_use cdda cdaudio) - $(meson_use gme console) - $(meson_use ffmpeg ffaudio) - $(meson_use flac flac) - $(meson_use modplug modplug) - $(meson_use mp3 mpg123) - $(meson_use openmpt openmpt) - $(meson_use opus opus) - $(meson_use sid sid) - $(meson_use sndfile sndfile) - $(meson_use vorbis vorbis) - $(meson_use wavpack wavpack) - - # output plugins - $(meson_use alsa alsa) - -Dcoreaudio=false - # filewriter - $(meson_use flac filewriter-flac) - $(meson_use lame filewriter-mp3) - $(meson_use vorbis filewriter-ogg) - $(meson_use jack jack) - -Doss=false - $(meson_use pipewire pipewire) - $(meson_use pulseaudio pulse) - $(meson_use qt6 qtaudio) - $(meson_use sdl sdlout) - -Dsndio=false - - # general plugins - $(meson_use ampache ampache) - $(meson_use X aosd) - $(meson_use X hotkey) - $(meson_use lirc lirc) - -Dmac-media-keys=false - -Dmpris2=true - $(meson_use libnotify notify) - $(meson_use scrobbler scrobbler2) - -Dsongchange=true - $(meson_use streamtuner streamtuner) - - # effect plugins - $(meson_use bs2b bs2b) - $(meson_use libsamplerate resample) - $(meson_use soxr soxr) - $(meson_use speedpitch speedpitch) - - # visualization plugins - $(meson_use opengl gl-spectrum) - -Dvumeter=true - ) - - meson_src_configure -} diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest index 2e8a5077ebab..cb85cf2b0bd9 100644 --- a/media-plugins/calf/Manifest +++ b/media-plugins/calf/Manifest @@ -1,15 +1,7 @@ -AUX calf-0.9.4-htmldir.patch 3821 BLAKE2B 0d5ad77c861526fdc6040109c30f377c29982d51f3e1f49241867551a0cae38d4cdaa94f774d6c4c42c0f4de3c558ec97354f801d9725f2d053a320d2a054b00 SHA512 f252a1d076ebd6cb07dd00d87f1b92952e2364a18b86e0cb2beb847893f94096ba7f42fbb8753e3ef3679715a9628242a2c516aa272c6c4e5abe29b145815933 -AUX calf-0.9.4-no-automagic.patch 1147 BLAKE2B bafd05909cd39c5c2516f5f061ce24951dc39104b9d055175a51532202ac838bdbd34002b65545792122eceddbf10e5efe8228774e69f8f7aaf1dad448e140bc SHA512 9fa0c4ae502a36d8838fc8adee950d169dc8b92756e51bb0f59a3dca12abdc816591eaf7d25634cfb2291b203c8804d1296862e4d694f8ad0f4c481194817e15 -AUX calf-0.90.1-desktop.patch 1135 BLAKE2B 1793206f8d6d1c0c8817148041737794d71ef4f952ca00bf75acc0f6d97068c665fb668b8d469bf621c3d37502f31582cd56a02f7b7c98fe13c14529e7cd6eca SHA512 9232ec384434aa0e4f22b4809e9e75f36be9991cad51fdd3037088d1c4018253424cfabf35890c3fee8b8e6eaae7447956a8a3f0025bd99e4279bd9a13bc07d9 -AUX calf-0.90.1-htmldir.patch 3853 BLAKE2B cd131098dad2c7d4e2a3f888dd38221c30353432a432213ea2c521585d117c11b54266804787993d653da0146c9ad7ed2cf1b0e364026bad20176dd303aaadbf SHA512 6f99604858a92d4f2169ba9b63dc3090242348d291c44b46e5218f9f39fd5f57e662225b94612db195419ef3f39d83d3c22f46ab9f8274201f881d98cc4f3e26 -AUX calf-0.90.1-no-automagic.patch 1196 BLAKE2B 4625d2bc44936a48fa35c3f6ffdc9a6abd90ca461ad7f5348841ac890e9919de87375da1304617af19db2727ad6df2fdd2717cd1679b3ae556e07d01e9eb0080 SHA512 02d82a6649fe0c37c8e29906c7f598b236261a8cfeb34ccba70f27d64df0fa6676ad66a65898e50ca95c4c75b3326f2f654655d045f0b2648b4ac840f838476a -AUX calf-0.90.3-clang-lerp_table_lookup_float_mask.patch 1927 BLAKE2B 7344ec38ad376ecaeed1c62c09d0f16b8690439d7121e51c0673c7929e45dbc82cb1e9f57a9fc1d86b14c01b59524d9aa11d6adbe7511b3eac4a7573936ddd02 SHA512 e53eaa58219a6245a404c424ce801ceb8e918389849168ae7b885978a1d233d27d14e7ef04d85889f2842d96c54b59ee6d61226bc89d6aa96be87365e1bd3fc3 -AUX calf-0.90.3-fix-build-with-lld.patch 1108 BLAKE2B 6b0d5c5c7b48c788c78141474ad7ea51ee918d4e43c9a3e434ff9fc85d08c0be89b269361fe3c95002d8ba80fc722d3c9e7abaf91191e09430ff49550b4e1466 SHA512 bd34719dac409bee20a5ed8af80066bd08691a086b1720ebd170d498f53eb9463ee09f1c9fedf6794919bea14914697791a6e9fa0da92861e782a258cf74f74c -AUX calf-0.90.3-replace-std-bind2nd.patch 1222 BLAKE2B f14eba2affa8a15217e6afa980c8000ae2b13f6c232b9bd4e5c60ef0492c1fd450d91d2def85f4b1cd6a59d8bd47c5263ab64c7bdb91a906d0131d2ec0243cc3 SHA512 07a136c8bbeb8b2c03d87c9fca7c209a371a895c3a0e34d35ffd68e82f656a7953b8a60c3b2e4a4767315d0c9becf4bdef5daf05924d86311e0027ee076d84c6 AUX calf-0.90.4-desktop.patch 745 BLAKE2B 7682e373e226958b244509f6f9b36bbb4674b4c3f112e946c6c81eb052969581c8b81fdf6f61f437694e5e93b568d42cce7c47995a627471e2c1b4f6edaf9f20 SHA512 798c9f18b71fdbc677059f9c58a79a8ca5a2297186a9dccae5b908ad6e605748203373f63ce18b67f04ed521c4a8ba85cbadc7c5afd184b9009c44e318f79188 -DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7 +AUX calf-0.90.4-htmldir.patch 3821 BLAKE2B 0d5ad77c861526fdc6040109c30f377c29982d51f3e1f49241867551a0cae38d4cdaa94f774d6c4c42c0f4de3c558ec97354f801d9725f2d053a320d2a054b00 SHA512 f252a1d076ebd6cb07dd00d87f1b92952e2364a18b86e0cb2beb847893f94096ba7f42fbb8753e3ef3679715a9628242a2c516aa272c6c4e5abe29b145815933 +AUX calf-0.90.4-no-automagic.patch 1147 BLAKE2B bafd05909cd39c5c2516f5f061ce24951dc39104b9d055175a51532202ac838bdbd34002b65545792122eceddbf10e5efe8228774e69f8f7aaf1dad448e140bc SHA512 9fa0c4ae502a36d8838fc8adee950d169dc8b92756e51bb0f59a3dca12abdc816591eaf7d25634cfb2291b203c8804d1296862e4d694f8ad0f4c481194817e15 DIST calf-0.90.4.tar.gz 16119716 BLAKE2B 555a813c6e8d58ea67db349957d2673e614448e17a3e5e934106fa445d7a6c19bc739b2487a883c5e709ac8dd5f429363e3bea09d72c1ca23a5755ca3b765479 SHA512 666d699d989a588bfe9d1e92f6b221a30541c26874d5941f54c2b2f216d2a59d628f1579d1e789e4a40d07d06f43a31055ce67885abb25c032643aa5f75797cd -EBUILD calf-0.90.3-r2.ebuild 2218 BLAKE2B 178586e59c7317de09b8218d6b11d884ebefb34605cce89dbb2059417f4dd96c05344fe3e125326041735eaddc41d610ca965a546040f6e56da3f89719bdc5e1 SHA512 a914053b3e59a4bb6c63d578dd66935ac69ae6ee91ee6d12d4a9c5783dfed88f4228448e419e5a204b1ed6f7336f9cd9de02728be140f62c04d5a3a60bd78067 -EBUILD calf-0.90.4.ebuild 2040 BLAKE2B 4abed5396f2a7e3944c5166d3038e1de274c9d5636f9a4ae62f96d69b818121eaaf3f2030374b616bea622ab8a7fff8cba280b34e4bdcf976a08f3e9d5633ae8 SHA512 a2e4093daa68a6a5aa316864b0747777010255132e3620cdc061be56c4dca463b9a858ba33ae3707a3310c29ef1bdd9cf43f5ef962a7ac55b3c8382970f55179 -EBUILD calf-9999.ebuild 2042 BLAKE2B 1935b249ee50f01d7eb64dc129cf7a64e31ec843e9f5b12987c47a7e4fe1acc241d55cbf7bb0a4d1b78d11cbcf94d537629d03484b68640c2cd21cdde46452c5 SHA512 3981d55909e43964c3005f52d636ee4fac8ed956c2e84956d83dd006e66e97c29bf9a060b461f872e0078cbb5a69e0211a184b184cbf911de0f0e0bcf3bfaa6a +EBUILD calf-0.90.4.ebuild 2042 BLAKE2B 1fa2df7bb388e2d75b2752b64b4c40767fd3d24b5f09c13707cdd989723ce7b7bcbef3a701f550b66a7ae5de98752681c14b1673383ac39c8bb05ae0b818f789 SHA512 5e2c39ea899c75df42ac87e5143bafda1edc640ebd375858fae2967e7f5fdadfedfc76c54224b29722c563c157032a5043c1d08b493134a2770365355667fba2 +EBUILD calf-9999.ebuild 2044 BLAKE2B 60684c3e2508917b4382b897c6a1215b61e5faac3b1a29450fc9f4d2b9557ddb4255d62b07a6b842b8dedc8dceca38cc2fca030688735407f814c6ccb3f77ca7 SHA512 f4a06d3c5e14dc2339faaa5b09627b632b1d83f8c6da04a0be71ec8f19e5df745f514ca666d59f431c674842945719a292fed9fdd3b1c4c0cc1c5641281c251e MISC metadata.xml 501 BLAKE2B 652333b064998e6eb587ed88e4a4077a40f4af372a013315b525592b1941f7dcc970abef652458745a44b3ec4855d90baba4b20f55c7f965fe8aa0a94e2012e4 SHA512 4cd55fe0e520bc564b09d9734c56ce104fd20c82c18cc2f862d7e09793eea9590a08879902a0ac915b43f4fc8bd583a338027b1b8a55b6a34639cd78f5a68ffb diff --git a/media-plugins/calf/calf-0.90.3-r2.ebuild b/media-plugins/calf/calf-0.90.3-r2.ebuild deleted file mode 100644 index 1c0266945303..000000000000 --- a/media-plugins/calf/calf-0.90.3-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs xdg - -DESCRIPTION="A set of open source instruments and effects for digital audio workstations" -HOMEPAGE="https://calf-studio-gear.org/" - -if [[ "${PV}" = "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git" -else - SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs" - -REQUIRED_USE="jack? ( gtk )" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0 - dev-libs/expat - dev-libs/glib:2 - media-sound/fluidsynth:= - gtk? ( - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/pango - ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - lv2? ( media-libs/lv2 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.90.1-no-automagic.patch" - "${FILESDIR}/${PN}-0.90.1-htmldir.patch" - "${FILESDIR}/${PN}-0.90.1-desktop.patch" - "${FILESDIR}/${PN}-0.90.3-fix-build-with-lld.patch" - "${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch" - "${FILESDIR}/${PN}-0.90.3-clang-lerp_table_lookup_float_mask.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Upstream append -ffast-math by default, however since libtool links C++ - # shared libs with -nostdlib, this causes symbol resolution error for - # __powidn2 when using compiler-rt. Disable fast math on compiler-rt until - # a better fix is found. - [[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math" - - local myeconfargs=( - --prefix="${EPREFIX}"/usr - --without-obsolete-check - $(use_enable experimental) - $(use_enable gtk gui) - $(use_enable jack) - $(use_with lash) - $(use_with lv2 lv2) - $(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") - $(use_enable static-libs static) - $(use_enable cpu_flags_x86_sse sse) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - mv "${ED}"/usr/share/bash-completion/completions/calf \ - "${ED}"/usr/share/bash-completion/completions/calfjackhost -} diff --git a/media-plugins/calf/calf-0.90.4.ebuild b/media-plugins/calf/calf-0.90.4.ebuild index 20e61d91459d..40087f6e07c6 100644 --- a/media-plugins/calf/calf-0.90.4.ebuild +++ b/media-plugins/calf/calf-0.90.4.ebuild @@ -43,8 +43,8 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-0.9.4-no-automagic.patch" - "${FILESDIR}/${PN}-0.9.4-htmldir.patch" + "${FILESDIR}/${PN}-0.90.4-no-automagic.patch" + "${FILESDIR}/${PN}-0.90.4-htmldir.patch" "${FILESDIR}/${PN}-0.90.4-desktop.patch" ) diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild index 05e605bd370c..7afb6c757c68 100644 --- a/media-plugins/calf/calf-9999.ebuild +++ b/media-plugins/calf/calf-9999.ebuild @@ -43,8 +43,8 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-0.9.4-no-automagic.patch" - "${FILESDIR}/${PN}-0.9.4-htmldir.patch" + "${FILESDIR}/${PN}-0.90.4-no-automagic.patch" + "${FILESDIR}/${PN}-0.90.4-htmldir.patch" "${FILESDIR}/${PN}-0.90.4-desktop.patch" ) diff --git a/media-plugins/calf/files/calf-0.9.4-htmldir.patch b/media-plugins/calf/files/calf-0.9.4-htmldir.patch deleted file mode 100644 index 4b6c77d42f83..000000000000 --- a/media-plugins/calf/files/calf-0.9.4-htmldir.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,29 +25,29 @@ clean-local: - rm -rf autom4te.cache - - install-data-local: -- install -d -m 755 $(DESTDIR)$(docdir) -- install -d -m 755 $(DESTDIR)$(docdir)/images -- install -d -m 755 $(DESTDIR)$(docdir)/images/icons -- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto -- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded -- install -d -m 755 $(DESTDIR)$(docdir)/scripts -+ install -d -m 755 $(DESTDIR)$(htmldir) -+ install -d -m 755 $(DESTDIR)$(htmldir)/images -+ install -d -m 755 $(DESTDIR)$(htmldir)/images/icons -+ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto -+ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded -+ install -d -m 755 $(DESTDIR)$(htmldir)/scripts - install -d -m 755 $(DESTDIR)$(pkgdatadir)/sf2 -- install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir) -- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/ -- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(docdir)/images/ -- install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/ -- install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(docdir)/images/icons/ -- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/ -- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(htmldir) -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(htmldir)/images/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(htmldir)/images/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(htmldir)/images/icons/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(htmldir)/scripts/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(htmldir)/scripts/ - install -c -m 644 $(top_srcdir)/sf2/*.sf2 $(DESTDIR)$(pkgdatadir)/sf2/ - - uninstall-local: -- rm -f $(DESTDIR)$(docdir)/*.html -- rm -f $(DESTDIR)$(docdir)/images/*.png -- rm -f $(DESTDIR)$(docdir)/images/*.jpg -- rm -f $(DESTDIR)$(docdir)/images/icons/*.png -- rm -f $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/* -- rm -f $(DESTDIR)$(docdir)/scripts/*.css -- rm -f $(DESTDIR)$(docdir)/scripts/*.js -+ rm -f $(DESTDIR)$(htmldir)/*.html -+ rm -f $(DESTDIR)$(htmldir)/images/*.png -+ rm -f $(DESTDIR)$(htmldir)/images/*.jpg -+ rm -f $(DESTDIR)$(htmldir)/images/icons/*.png -+ rm -f $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/* -+ rm -f $(DESTDIR)$(htmldir)/scripts/*.css -+ rm -f $(DESTDIR)$(htmldir)/scripts/*.js - rm -f $(DESTDIR)$(pkgdatadir)/sf2/*.sf2 -- rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images/icons $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(docdir)/images/prettyPhoto $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) $(DESTDIR)$(pkgdatadir)/sf2 || true -+ rmdir $(DESTDIR)$(htmldir)/scripts $(DESTDIR)$(htmldir)/images/icons $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(htmldir)/images/prettyPhoto $(DESTDIR)$(htmldir)/images $(DESTDIR)$(htmldir) $(DESTDIR)$(pkgdatadir)/sf2 || true ---- a/configure.ac -+++ b/configure.ac -@@ -253,7 +253,7 @@ fi - - # Other defines - AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)]) --AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory]) -+AC_DEFINE_UNQUOTED(PKGDOCDIR,"$htmldir",[Calf documentation directory]) - - - ############################################################################################ diff --git a/media-plugins/calf/files/calf-0.9.4-no-automagic.patch b/media-plugins/calf/files/calf-0.9.4-no-automagic.patch deleted file mode 100644 index 87fa8a7a18e3..000000000000 --- a/media-plugins/calf/files/calf-0.9.4-no-automagic.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -172,13 +172,35 @@ LDFLAGS="$save_LDFLAGS" - - AM_CONDITIONAL(HAVE_LD_NODELETE, test "$linker_supports_nodelete" = "yes") - -+AC_MSG_CHECKING([whether to enable GUI]) -+AC_ARG_ENABLE(gui, -+ AS_HELP_STRING([--enable-gui],[enable graphical user interface]), -+ [set_enable_gui=$enableval], -+ [set_enable_gui=yes]) -+AC_MSG_RESULT($set_enable_gui) -+ -+AC_MSG_CHECKING([whether to enable JACK]) -+AC_ARG_ENABLE(jack, -+ AS_HELP_STRING([--enable-jack],[enable support for JACK]), -+ [set_enable_jack=$enableval], -+ [set_enable_jack=yes]) -+AC_MSG_RESULT($set_enable_jack) -+ - ############################################################################################ - # Compute status shell variables - --if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then -+if test "x$set_enable_gui" = "xno"; then -+ GUI_ENABLED="no (disabled by user choice)" -+fi -+ -+if test "$JACK_FOUND" = "yes"; then - JACK_ENABLED="yes" - fi - -+if test "x$set_enable_jack" = "xno"; then -+ JACK_ENABLED="no (disabled by user choice)" -+fi -+ - if test "$GUI_ENABLED" = "yes" -a "$LV2_ENABLED" = "yes"; then - LV2_GUI_ENABLED="yes" - fi diff --git a/media-plugins/calf/files/calf-0.90.1-desktop.patch b/media-plugins/calf/files/calf-0.90.1-desktop.patch deleted file mode 100644 index 47b269d92ee6..000000000000 --- a/media-plugins/calf/files/calf-0.90.1-desktop.patch +++ /dev/null @@ -1,24 +0,0 @@ - * QA Notice: This package installs one or more .desktop files that do not - * pass validation. - * - * /usr/share/applications/calf.desktop: error: value "0.90.1" for key "Version" in group "Desktop Entry" is not a known version - * /usr/share/applications/calf.desktop: warning: value "Application;AudioVideo;Audio;GNOME" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application" - - ---- a/calf.desktop.in -+++ b/calf.desktop.in -@@ -3,7 +3,6 @@ - Name[pl]=Zestaw wtyczek Calf - Name[ru]=Набор эффектов и инструментов Calf для JACK - Name[fr]=Ensemble de greffons Calf pour JACK --Version=@VERSION@ - Comment=Process and produce sounds using a set of plugins with JACK interface - Comment[pl]=Przetwarzaj i generuj dźwięk używając zestawu wtyczek zgodnych z JACK - Comment[ru]=Обработка и создание музыки при помощи эффектов и инструментов через JACK -@@ -11,5 +10,5 @@ - Exec=calfjackhost - Terminal=false - Type=Application --Categories=Application;AudioVideo;Audio;GNOME -+Categories=AudioVideo;Audio;GNOME - Icon=calf diff --git a/media-plugins/calf/files/calf-0.90.1-htmldir.patch b/media-plugins/calf/files/calf-0.90.1-htmldir.patch deleted file mode 100644 index a6c4b2c7ffff..000000000000 --- a/media-plugins/calf/files/calf-0.90.1-htmldir.patch +++ /dev/null @@ -1,66 +0,0 @@ -Make PKGDOCDIR configurable for distributions. - ---- a/configure.ac -+++ b/configure.ac -@@ -227,7 +227,7 @@ - - # Other defines - AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)]) --AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory]) -+AC_DEFINE_UNQUOTED(PKGDOCDIR,"$htmldir",[Calf documentation directory]) - - ############################################################################################ - ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,29 +25,29 @@ - rm -rf autom4te.cache - - install-data-local: -- install -d -m 755 $(DESTDIR)$(docdir) -- install -d -m 755 $(DESTDIR)$(docdir)/images -- install -d -m 755 $(DESTDIR)$(docdir)/images/icons -- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto -- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded -- install -d -m 755 $(DESTDIR)$(docdir)/scripts -+ install -d -m 755 $(DESTDIR)$(htmldir) -+ install -d -m 755 $(DESTDIR)$(htmldir)/images -+ install -d -m 755 $(DESTDIR)$(htmldir)/images/icons -+ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto -+ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded -+ install -d -m 755 $(DESTDIR)$(htmldir)/scripts - install -d -m 755 $(DESTDIR)$(pkgdatadir)/sf2 -- install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir) -- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/ -- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(docdir)/images/ -- install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/ -- install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(docdir)/images/icons/ -- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/ -- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(htmldir) -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(htmldir)/images/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(htmldir)/images/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(htmldir)/images/icons/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(htmldir)/scripts/ -+ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(htmldir)/scripts/ - install -c -m 644 $(top_srcdir)/sf2/*.sf2 $(DESTDIR)$(pkgdatadir)/sf2/ - - uninstall-local: -- rm -f $(DESTDIR)$(docdir)/*.html -- rm -f $(DESTDIR)$(docdir)/images/*.png -- rm -f $(DESTDIR)$(docdir)/images/*.jpg -- rm -f $(DESTDIR)$(docdir)/images/icons/*.png -- rm -f $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/* -- rm -f $(DESTDIR)$(docdir)/scripts/*.css -- rm -f $(DESTDIR)$(docdir)/scripts/*.js -+ rm -f $(DESTDIR)$(htmldir)/*.html -+ rm -f $(DESTDIR)$(htmldir)/images/*.png -+ rm -f $(DESTDIR)$(htmldir)/images/*.jpg -+ rm -f $(DESTDIR)$(htmldir)/images/icons/*.png -+ rm -f $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/* -+ rm -f $(DESTDIR)$(htmldir)/scripts/*.css -+ rm -f $(DESTDIR)$(htmldir)/scripts/*.js - rm -f $(DESTDIR)$(pkgdatadir)/sf2/*.sf2 -- rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images/icons $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(docdir)/images/prettyPhoto $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) $(DESTDIR)$(pkgdatadir)/sf2 || true -+ rmdir $(DESTDIR)$(htmldir)/scripts $(DESTDIR)$(htmldir)/images/icons $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(htmldir)/images/prettyPhoto $(DESTDIR)$(htmldir)/images $(DESTDIR)$(htmldir) $(DESTDIR)$(pkgdatadir)/sf2 || true diff --git a/media-plugins/calf/files/calf-0.90.1-no-automagic.patch b/media-plugins/calf/files/calf-0.90.1-no-automagic.patch deleted file mode 100644 index e9b9756338d8..000000000000 --- a/media-plugins/calf/files/calf-0.90.1-no-automagic.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix gtk+ and jack automagic detection. - -https://github.com/calf-studio-gear/calf/issues/166 - ---- a/configure.ac -+++ b/configure.ac -@@ -150,13 +150,35 @@ - [set_enable_sse="no"]) - AC_MSG_RESULT($set_enable_sse) - -+AC_MSG_CHECKING([whether to enable GUI]) -+AC_ARG_ENABLE(gui, -+ AS_HELP_STRING([--enable-gui],[enable graphical user interface]), -+ [set_enable_gui=$enableval], -+ [set_enable_gui=yes]) -+AC_MSG_RESULT($set_enable_gui) -+ -+AC_MSG_CHECKING([whether to enable JACK]) -+AC_ARG_ENABLE(jack, -+ AS_HELP_STRING([--enable-jack],[enable support for JACK]), -+ [set_enable_jack=$enableval], -+ [set_enable_jack=yes]) -+AC_MSG_RESULT($set_enable_jack) -+ - ############################################################################################ - # Compute status shell variables - --if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then -+if test "x$set_enable_gui" = "xno"; then -+ GUI_ENABLED="no (disabled by user choice)" -+fi -+ -+if test "$JACK_FOUND" = "yes"; then - JACK_ENABLED="yes" - fi - -+if test "x$set_enable_jack" = "xno"; then -+ JACK_ENABLED="no (disabled by user choice)" -+fi -+ - if test "$GUI_ENABLED" = "yes" -a "$LV2_ENABLED" = "yes"; then - LV2_GUI_ENABLED="yes" - fi diff --git a/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch b/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch deleted file mode 100644 index 3ab8dfa1c840..000000000000 --- a/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bfb857445e72230659493d3491970e3cb3c7eb9a Mon Sep 17 00:00:00 2001 -From: Krzysztof Foltman -Date: Fri, 2 Aug 2019 20:55:50 +0100 -Subject: [PATCH] Compatibility: A possible fix for the clang++-8 issue. - ---- a/src/calf/fixed_point.h -+++ b/src/calf/fixed_point.h -@@ -215,7 +215,7 @@ template class fixed_point { - } - - template -- inline U lerp_table_lookup_int(U data[(1U<(data[pos], data[pos+1]); - } -@@ -223,19 +223,19 @@ template class fixed_point { - /// Untested... I've started it to get a sin/cos readout for rotaryorgan, but decided to use table-less solution instead - /// Do not assume it works, because it most probably doesn't - template -- inline U lerp_table_lookup_int_shift(U data[(1U<(data[pos], data[pos+1]); - } - - template -- inline U lerp_table_lookup_float(U data[(1U< -- inline U lerp_table_lookup_float_mask(U data[(1U< -Date: Thu, 21 Sep 2023 19:08:39 -0400 -Subject: [PATCH] Fix build with LLD - -LLVM's LLD handles the -retain-symbols-file option (used by --export-symbols-regex in libtool) differently from GNU ld, causing -undefined references during link. This commit removes the --export-symbols-regex option from libcalf_la_LDFLAGS since by default -libtool exports all symbols anyway, so it should not be necessary. - -Signed-off-by: Violet Purcell ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -42,7 +42,7 @@ libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS) - if USE_DEBUG - calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static - else --calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor" -+calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static - endif - - if USE_LV2_GUI --- -2.42.0 - diff --git a/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch b/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch deleted file mode 100644 index 5ba16efcfb1b..000000000000 --- a/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch +++ /dev/null @@ -1,32 +0,0 @@ -From https://github.com/calf-studio-gear/calf/pull/331/commits/849a0b589fb86cb4b9869738b270fd24859bd23b Mon Sep 17 00:00:00 2001 -From: Violet Purcell -Date: Thu, 21 Sep 2023 18:16:35 -0400 -Subject: [PATCH] Replace use of std::bind2nd with std::bind - -std::bind2nd was deprecated in C++11 and removed in C++17. Remove usage -of it and replace with std::bind. - -Signed-off-by: Violet Purcell ---- a/src/calf/orfanidis_eq.h -+++ b/src/calf/orfanidis_eq.h -@@ -748,7 +748,7 @@ private: - std::vector v = landen(k, tol); - - std::transform(v.begin(), v.end(), v.begin(), -- bind2nd(std::plus(), 1.0)); -+ bind(std::plus(), 1.0, std::placeholders::_1)); - - K = std::accumulate(v.begin(), v.end(), - 1, std::multiplies()) * M_PI/2.0; -@@ -764,7 +764,7 @@ private: - std::vector vp = landen(kp, tol); - - std::transform(vp.begin(), vp.end(), vp.begin(), -- bind2nd(std::plus(), 1.0)); -+ bind(std::plus(), 1.0, std::placeholders::_1)); - - Kprime = std::accumulate(vp.begin(), vp.end(), - 1.0, std::multiplies()) * M_PI/2.0; --- -2.42.0 - diff --git a/media-plugins/calf/files/calf-0.90.4-htmldir.patch b/media-plugins/calf/files/calf-0.90.4-htmldir.patch new file mode 100644 index 000000000000..4b6c77d42f83 --- /dev/null +++ b/media-plugins/calf/files/calf-0.90.4-htmldir.patch @@ -0,0 +1,64 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -25,29 +25,29 @@ clean-local: + rm -rf autom4te.cache + + install-data-local: +- install -d -m 755 $(DESTDIR)$(docdir) +- install -d -m 755 $(DESTDIR)$(docdir)/images +- install -d -m 755 $(DESTDIR)$(docdir)/images/icons +- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto +- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded +- install -d -m 755 $(DESTDIR)$(docdir)/scripts ++ install -d -m 755 $(DESTDIR)$(htmldir) ++ install -d -m 755 $(DESTDIR)$(htmldir)/images ++ install -d -m 755 $(DESTDIR)$(htmldir)/images/icons ++ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto ++ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded ++ install -d -m 755 $(DESTDIR)$(htmldir)/scripts + install -d -m 755 $(DESTDIR)$(pkgdatadir)/sf2 +- install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir) +- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/ +- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(docdir)/images/ +- install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/ +- install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(docdir)/images/icons/ +- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/ +- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/ ++ install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(htmldir) ++ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(htmldir)/images/ ++ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(htmldir)/images/ ++ install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/ ++ install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(htmldir)/images/icons/ ++ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(htmldir)/scripts/ ++ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(htmldir)/scripts/ + install -c -m 644 $(top_srcdir)/sf2/*.sf2 $(DESTDIR)$(pkgdatadir)/sf2/ + + uninstall-local: +- rm -f $(DESTDIR)$(docdir)/*.html +- rm -f $(DESTDIR)$(docdir)/images/*.png +- rm -f $(DESTDIR)$(docdir)/images/*.jpg +- rm -f $(DESTDIR)$(docdir)/images/icons/*.png +- rm -f $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/* +- rm -f $(DESTDIR)$(docdir)/scripts/*.css +- rm -f $(DESTDIR)$(docdir)/scripts/*.js ++ rm -f $(DESTDIR)$(htmldir)/*.html ++ rm -f $(DESTDIR)$(htmldir)/images/*.png ++ rm -f $(DESTDIR)$(htmldir)/images/*.jpg ++ rm -f $(DESTDIR)$(htmldir)/images/icons/*.png ++ rm -f $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/* ++ rm -f $(DESTDIR)$(htmldir)/scripts/*.css ++ rm -f $(DESTDIR)$(htmldir)/scripts/*.js + rm -f $(DESTDIR)$(pkgdatadir)/sf2/*.sf2 +- rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images/icons $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(docdir)/images/prettyPhoto $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) $(DESTDIR)$(pkgdatadir)/sf2 || true ++ rmdir $(DESTDIR)$(htmldir)/scripts $(DESTDIR)$(htmldir)/images/icons $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(htmldir)/images/prettyPhoto $(DESTDIR)$(htmldir)/images $(DESTDIR)$(htmldir) $(DESTDIR)$(pkgdatadir)/sf2 || true +--- a/configure.ac ++++ b/configure.ac +@@ -253,7 +253,7 @@ fi + + # Other defines + AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)]) +-AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory]) ++AC_DEFINE_UNQUOTED(PKGDOCDIR,"$htmldir",[Calf documentation directory]) + + + ############################################################################################ diff --git a/media-plugins/calf/files/calf-0.90.4-no-automagic.patch b/media-plugins/calf/files/calf-0.90.4-no-automagic.patch new file mode 100644 index 000000000000..87fa8a7a18e3 --- /dev/null +++ b/media-plugins/calf/files/calf-0.90.4-no-automagic.patch @@ -0,0 +1,39 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -172,13 +172,35 @@ LDFLAGS="$save_LDFLAGS" + + AM_CONDITIONAL(HAVE_LD_NODELETE, test "$linker_supports_nodelete" = "yes") + ++AC_MSG_CHECKING([whether to enable GUI]) ++AC_ARG_ENABLE(gui, ++ AS_HELP_STRING([--enable-gui],[enable graphical user interface]), ++ [set_enable_gui=$enableval], ++ [set_enable_gui=yes]) ++AC_MSG_RESULT($set_enable_gui) ++ ++AC_MSG_CHECKING([whether to enable JACK]) ++AC_ARG_ENABLE(jack, ++ AS_HELP_STRING([--enable-jack],[enable support for JACK]), ++ [set_enable_jack=$enableval], ++ [set_enable_jack=yes]) ++AC_MSG_RESULT($set_enable_jack) ++ + ############################################################################################ + # Compute status shell variables + +-if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then ++if test "x$set_enable_gui" = "xno"; then ++ GUI_ENABLED="no (disabled by user choice)" ++fi ++ ++if test "$JACK_FOUND" = "yes"; then + JACK_ENABLED="yes" + fi + ++if test "x$set_enable_jack" = "xno"; then ++ JACK_ENABLED="no (disabled by user choice)" ++fi ++ + if test "$GUI_ENABLED" = "yes" -a "$LV2_ENABLED" = "yes"; then + LV2_GUI_ENABLED="yes" + fi -- cgit v1.2.3