commit: 4299f7f9747b701a437eca72581ba9a58a21c5fc Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sat Dec 7 13:58:44 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 13:58:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4299f7f9
media-plugins/calf: dropped obsolete 0.90.3-r2 + renamed some patches Bug: https://bugs.gentoo.org/945950 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-plugins/calf/Manifest | 1 - 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.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 -------- ...9.4-htmldir.patch => calf-0.90.4-htmldir.patch} | 0 ...omagic.patch => calf-0.90.4-no-automagic.patch} | 0 12 files changed, 4 insertions(+), 320 deletions(-) diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest index 08affd7f272d..d10ad322fb62 100644 --- a/media-plugins/calf/Manifest +++ b/media-plugins/calf/Manifest @@ -1,2 +1 @@ -DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7 DIST calf-0.90.4.tar.gz 16119716 BLAKE2B 555a813c6e8d58ea67db349957d2673e614448e17a3e5e934106fa445d7a6c19bc739b2487a883c5e709ac8dd5f429363e3bea09d72c1ca23a5755ca3b765479 SHA512 666d699d989a588bfe9d1e92f6b221a30541c26874d5941f54c2b2f216d2a59d628f1579d1e789e4a40d07d06f43a31055ce67885abb25c032643aa5f75797cd 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.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 <[email protected]> -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 T, int FracBits> class fixed_point { - } - - template<class U, int UseBits> -- inline U lerp_table_lookup_int(U data[(1U<<IntBits)+1]) const { -+ inline U lerp_table_lookup_int(U *data) const { - unsigned int pos = uipart(); - return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]); - } -@@ -223,19 +223,19 @@ template<class T, int FracBits> 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<class U, int UseBits> -- inline U lerp_table_lookup_int_shift(U data[(1U<<IntBits)+1], unsigned int shift) { -+ inline U lerp_table_lookup_int_shift(U *data, unsigned int shift) { - unsigned int pos = (uipart() + shift) & ((1ULL << IntBits) - 1); - return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]); - } - - template<class U> -- inline U lerp_table_lookup_float(U data[(1U<<IntBits)+1]) const { -+ inline U lerp_table_lookup_float(U *data) const { - unsigned int pos = uipart(); - return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double(); - } - - template<class U> -- inline U lerp_table_lookup_float_mask(U data[(1U<<IntBits)+1], unsigned int mask) const { -+ inline U lerp_table_lookup_float_mask(U *data, unsigned int mask) const { - unsigned int pos = ui64part() & mask; - // printf("full = %lld pos = %d + %f\n", value, pos, fpart_as_double()); - return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double(); diff --git a/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch b/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch deleted file mode 100644 index 451f1baff9e5..000000000000 --- a/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch +++ /dev/null @@ -1,26 +0,0 @@ -From https://github.com/calf-studio-gear/calf/pull/332/commits/bdaaa92dd82e2425e4683b9d496370c5880e3b3e Mon Sep 17 00:00:00 2001 -From: Violet Purcell <[email protected]> -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 <[email protected]> ---- 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 <[email protected]> -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 <[email protected]> ---- a/src/calf/orfanidis_eq.h -+++ b/src/calf/orfanidis_eq.h -@@ -748,7 +748,7 @@ private: - std::vector<eq_double_t> v = landen(k, tol); - - std::transform(v.begin(), v.end(), v.begin(), -- bind2nd(std::plus<eq_double_t>(), 1.0)); -+ bind(std::plus<eq_double_t>(), 1.0, std::placeholders::_1)); - - K = std::accumulate(v.begin(), v.end(), - 1, std::multiplies<eq_double_t>()) * M_PI/2.0; -@@ -764,7 +764,7 @@ private: - std::vector<eq_double_t> vp = landen(kp, tol); - - std::transform(vp.begin(), vp.end(), vp.begin(), -- bind2nd(std::plus<eq_double_t>(), 1.0)); -+ bind(std::plus<eq_double_t>(), 1.0, std::placeholders::_1)); - - Kprime = std::accumulate(vp.begin(), vp.end(), - 1.0, std::multiplies<eq_double_t>()) * M_PI/2.0; --- -2.42.0 - diff --git a/media-plugins/calf/files/calf-0.9.4-htmldir.patch b/media-plugins/calf/files/calf-0.90.4-htmldir.patch similarity index 100% rename from media-plugins/calf/files/calf-0.9.4-htmldir.patch rename to media-plugins/calf/files/calf-0.90.4-htmldir.patch diff --git a/media-plugins/calf/files/calf-0.9.4-no-automagic.patch b/media-plugins/calf/files/calf-0.90.4-no-automagic.patch similarity index 100% rename from media-plugins/calf/files/calf-0.9.4-no-automagic.patch rename to media-plugins/calf/files/calf-0.90.4-no-automagic.patch
