commit: 5d047cd3ff93a3c539a48237deaae5fc63a5df61
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 07:56:17 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 07:56:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d047cd3
media-plugins/calf/files: rebased live patch + scrubbed patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-plugins/calf/files/calf-0.90.1-desktop.patch | 4 ++--
media-plugins/calf/files/calf-0.90.1-htmldir.patch | 8 ++++----
media-plugins/calf/files/calf-0.90.1-no-automagic.patch | 4 ++--
.../files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch | 6 ------
media-plugins/calf/files/calf-9999-fix-build-with-lld.patch | 8 +++-----
5 files changed, 11 insertions(+), 19 deletions(-)
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 <[email protected]>
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 <[email protected]>
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
