diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /media-plugins/calf/files | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'media-plugins/calf/files')
-rw-r--r-- | media-plugins/calf/files/calf-0.0.60-cpp14.patch | 67 | ||||
-rw-r--r-- | media-plugins/calf/files/calf-0.90.1-desktop.patch | 24 | ||||
-rw-r--r-- | media-plugins/calf/files/calf-0.90.1-htmldir.patch | 66 | ||||
-rw-r--r-- | media-plugins/calf/files/calf-0.90.1-no-automagic.patch | 43 |
4 files changed, 133 insertions, 67 deletions
diff --git a/media-plugins/calf/files/calf-0.0.60-cpp14.patch b/media-plugins/calf/files/calf-0.0.60-cpp14.patch deleted file mode 100644 index a04043c8abca..000000000000 --- a/media-plugins/calf/files/calf-0.0.60-cpp14.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix building with C++14 (default in GCC 6). Changes types (mostly float into -double). Add necessary casts. -See also: https://bugs.gentoo.org/show_bug.cgi?id=594116 - ---- a/src/analyzer.cpp -+++ b/src/analyzer.cpp -@@ -470,13 +470,13 @@ - lastoutL = fft_outL[_iter]; - //pumping up actual signal an erase surrounding - // sounds -- fft_outL[_iter] = 0.25f * std::max(n * 0.6f * \ -+ fft_outL[_iter] = 0.25 * std::max(n * 0.6 * \ - fabs(fft_outL[_iter]) - var1L , 1e-20); - if(_mode == 3 or _mode == 4) { - // do the same with R channel if needed - lastoutR = fft_outR[_iter]; -- fft_outR[_iter] = 0.25f * std::max(n * \ -- 0.6f * fabs(fft_outR[_iter]) - var1R , 1e-20); -+ fft_outR[_iter] = 0.25 * std::max(n * \ -+ 0.6 * fabs(fft_outR[_iter]) - var1R , 1e-20); - } - break; - } ---- a/src/jack_client.cpp -+++ b/src/jack_client.cpp -@@ -226,7 +226,7 @@ - map<string, int>::const_iterator p = port_to_plugin.find((*k) + cnlen + 1); - if (p != port_to_plugin.end()) - { -- run_before.insert(make_pair<int, int>(p->second, i)); -+ run_before.insert(make_pair<int, int>((int)p->second, (int)i)); - } - } - jack_free(conns); ---- a/src/modules_dist.cpp -+++ b/src/modules_dist.cpp -@@ -794,8 +794,8 @@ - lfo2.advance(1); - - // dot -- rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2); -- input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2); -+ rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2.0); -+ input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2.0); - - float values[] = {inL, inR, outs[0][i], outs[1][i]}; - meters.process(values); ---- a/src/modules_limit.cpp -+++ b/src/modules_limit.cpp -@@ -429,7 +429,7 @@ - } - - // write multiband coefficient to buffer -- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0); -+ buffer[pos] = std::min((double)*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0); - - // step forward in multiband buffer - pos = (pos + channels) % buffer_size; -@@ -811,7 +811,7 @@ - } - - // write multiband coefficient to buffer -- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0); -+ buffer[pos] = std::min((double)*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0); - - // step forward in multiband buffer - pos = (pos + channels) % buffer_size; diff --git a/media-plugins/calf/files/calf-0.90.1-desktop.patch b/media-plugins/calf/files/calf-0.90.1-desktop.patch new file mode 100644 index 000000000000..93fc125e0110 --- /dev/null +++ b/media-plugins/calf/files/calf-0.90.1-desktop.patch @@ -0,0 +1,24 @@ + * 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 2018-07-08 12:35:56.000000000 +0200 ++++ b/calf.desktop.in 2019-03-10 20:19:01.251946945 +0100 +@@ -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 new file mode 100644 index 000000000000..83481b112885 --- /dev/null +++ b/media-plugins/calf/files/calf-0.90.1-htmldir.patch @@ -0,0 +1,66 @@ +Make PKGDOCDIR configurable for distributions. + +--- a/configure.ac 2018-07-08 12:35:56.000000000 +0200 ++++ b/configure.ac 2019-03-10 20:11:45.053432800 +0100 +@@ -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 2018-07-08 12:35:56.000000000 +0200 ++++ b/Makefile.am 2019-03-10 20:55:12.448824164 +0100 +@@ -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 new file mode 100644 index 000000000000..ef336851c7b3 --- /dev/null +++ b/media-plugins/calf/files/calf-0.90.1-no-automagic.patch @@ -0,0 +1,43 @@ +Fix gtk+ and jack automagic detection. + +https://github.com/calf-studio-gear/calf/issues/166 + +--- a/configure.ac 2018-07-08 12:35:56.000000000 +0200 ++++ b/configure.ac 2019-03-10 19:22:05.578887471 +0100 +@@ -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 |