7 files changed, 16 insertions, 24 deletions
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index c61a887e6cc0..ae11cb1cd7b8 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index d33793a28ca3..b28875f0cf9f 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,10 +1,10 @@
-AUX calf-0.90.1-desktop.patch 1207 BLAKE2B f4af4c5a7a366bb204d0317fb7b6cf47b1cc31859392d360cd4acb46e89e98044bef6bd61d017dcb11ea8c6b264b908ffc0039ddc32c01c4a2ab12f7dc70a981 SHA512 e48183918f1ea2f12d59236a2b62ae68a6e66946e67d7ea8a84b8b1232b93556af222a8536a5fa0347e13af46566582a796b8f357799d53fc4ee987a1ed147ba
-AUX calf-0.90.1-htmldir.patch 3997 BLAKE2B 657248c76dfb82f39e8f6589c485e2993122b4d26c7b4c223191e3e97c8b36e723efcbbfbf324dc0bc72eee2da4a1cb23e1095ce9b638bf2485e3dade00b65be SHA512 ecace91bfdb2599ac98d7bc5e6b441c6bcedaab20c928177c74f5bb8810416ab6035f6b0efa6962bfd2d85969c902eaf2a640bc77efd97501f0b08e878b14c48
-AUX calf-0.90.1-no-automagic.patch 1268 BLAKE2B 1a6a7038a9beb9bdbe370c37c1283dfbbec21e378e063fb87aeb49b993a75b6ff16f9b7f0f94e8bb5e0ccdb524f786ae3679b9dc497e73ec3fd4f84d196f6e98 SHA512 ed96d843b6733bbe89c3fda2d21e1cb6b7e812471df73bf2ccbc96af8153cd7fd20d52047ab53693382894ac77c7ab70017d923e4f148c3079766536ae5dab6f
-AUX calf-0.90.3-clang-lerp_table_lookup_float_mask.patch 2113 BLAKE2B 1535459a82b14ba1da3c9454886a9f8f418553aa15e8aed6f32b86cb62d10a48726e5c4e4be60edbff0d0b7dee9d59d1c5ad109489e6fdc0dbbf1c088d2e6761 SHA512 cff8f754db8bbe35f71c9f5b371a3551b58afff67a8dc5b4a688aac00c06a19fd72d269f0e7cf1503c09fcbc7288b477e8033e95b0cfba4ed9edb5bb5835112b
+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-9999-fix-build-with-lld.patch 1188 BLAKE2B 42a1317404fdff5bbe68bf3b1860e548931a3bf776520c9e4a83284cf73c417f773bed56d3dd028ab211ca51f989a81ca953a4158d16a94db2d3c9c57787e611 SHA512 8ac4b5f8501cf4a1cfcde4225fc15b79229b315781a5f99ddfd585c623222797845de0568dfdd036890ccce85dfdaa03045418c149fcdd7a17e6c995aeaad968
+AUX calf-9999-fix-build-with-lld.patch 1118 BLAKE2B 1c07d044da4d969f01263c01851c87624d005e52189f5ddc8e232f36a77f3b438a302450fb87109634fe7347ebb161268f48847bf3d336edb0171a78e81e6d2b SHA512 c282f83bd2d87c67ed7fac536ae671e46c317b9c7753e9ad30138ea44025226501f1dcbfd85f4f716d05f0e0fdc7465d44b373f99ec14522eaa95240ceb1b703
 DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
 EBUILD calf-0.90.3-r2.ebuild 2218 BLAKE2B 178586e59c7317de09b8218d6b11d884ebefb34605cce89dbb2059417f4dd96c05344fe3e125326041735eaddc41d610ca965a546040f6e56da3f89719bdc5e1 SHA512 a914053b3e59a4bb6c63d578dd66935ac69ae6ee91ee6d12d4a9c5783dfed88f4228448e419e5a204b1ed6f7336f9cd9de02728be140f62c04d5a3a60bd78067
 EBUILD calf-9999.ebuild 2070 BLAKE2B 1cbe41f893300b6c48f7b7c36937e15f64d6583ef02e425431bad9f076b7effacc0d72024e902f240ad901f7b325811823f0f9a0b2c72abca9b31c97ee431e64 SHA512 26cc76d208f3c2cfa887d1bc8c0dad9826207971ee94067838529122cedd753dee87b11ab7c1379976bbf2468c72bd920613db10898bf48f9771ef8f7aa08fe8
diff --git a/media-plugins/calf/files/calf-0.90.1-desktop.patch b/media-plugins/calf/files/calf-0.90.1-desktop.patch
index 93fc125e0110..47b269d92ee6 100644
--- a/media-plugins/calf/files/calf-0.90.1-desktop.patch
+++ b/media-plugins/calf/files/calf-0.90.1-desktop.patch
@@ -5,8 +5,8 @@
  *      /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
+--- a/calf.desktop.in
++++ b/calf.desktop.in
 @@ -3,7 +3,6 @@
  Name[pl]=Zestaw wtyczek Calf
  Name[ru]=Набор эффектов и инструментов Calf для JACK
diff --git a/media-plugins/calf/files/calf-0.90.1-htmldir.patch b/media-plugins/calf/files/calf-0.90.1-htmldir.patch
index 83481b112885..a6c4b2c7ffff 100644
--- a/media-plugins/calf/files/calf-0.90.1-htmldir.patch
+++ b/media-plugins/calf/files/calf-0.90.1-htmldir.patch
@@ -1,7 +1,7 @@
 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
+--- a/configure.ac
++++ b/configure.ac
 @@ -227,7 +227,7 @@
  
  # Other defines
@@ -11,8 +11,8 @@ Make PKGDOCDIR configurable for distributions.
  
  ############################################################################################
  
---- a/Makefile.am	2018-07-08 12:35:56.000000000 +0200
-+++ b/Makefile.am	2019-03-10 20:55:12.448824164 +0100
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -25,29 +25,29 @@
  	rm -rf autom4te.cache
  
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
index ef336851c7b3..e9b9756338d8 100644
--- a/media-plugins/calf/files/calf-0.90.1-no-automagic.patch
+++ b/media-plugins/calf/files/calf-0.90.1-no-automagic.patch
@@ -2,8 +2,8 @@ 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
+--- a/configure.ac
++++ b/configure.ac
 @@ -150,13 +150,35 @@
    [set_enable_sse="no"])
  AC_MSG_RESULT($set_enable_sse)
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
index d868fb8e1f33..3ab8dfa1c840 100644
--- 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
@@ -3,12 +3,6 @@ From: Krzysztof Foltman <wdev@foltman.com>
 Date: Fri, 2 Aug 2019 20:55:50 +0100
 Subject: [PATCH] Compatibility: A possible fix for the clang++-8 issue.
 
----
- src/calf/fixed_point.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/calf/fixed_point.h b/src/calf/fixed_point.h
-index 7dbf5c9bc..63bfce167 100644
 --- a/src/calf/fixed_point.h
 +++ b/src/calf/fixed_point.h
 @@ -215,7 +215,7 @@ template<class T, int FracBits> class fixed_point {
diff --git a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
index 91e353e10da6..a33e8dc70503 100644
--- a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
+++ b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
@@ -12,16 +12,14 @@ Signed-off-by: Violet Purcell <vimproved@inventati.org>
 
 rebased
 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6f11628b..0e775bef 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -53,7 +53,7 @@ libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp
  if USE_DEBUG
- libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
+ libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
  else
--libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
-+libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
+-libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
++libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
  endif
  endif