summaryrefslogtreecommitdiff
path: root/media-plugins/calf
diff options
context:
space:
mode:
Diffstat (limited to 'media-plugins/calf')
-rw-r--r--media-plugins/calf/Manifest6
-rw-r--r--media-plugins/calf/calf-9999.ebuild4
-rw-r--r--media-plugins/calf/files/calf-9999-fix-build-with-lld.patch22
-rw-r--r--media-plugins/calf/files/calf-9999-htmldir.patch64
-rw-r--r--media-plugins/calf/files/calf-9999-no-automagic.patch39
5 files changed, 113 insertions, 22 deletions
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index ee54af963284..52ff30d9eb5b 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -5,8 +5,10 @@ AUX calf-0.90.3-clang-lerp_table_lookup_float_mask.patch 1927 BLAKE2B 7344ec38ad
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-desktop.patch 323 BLAKE2B bd74a6fba17d52f916f9b4e1e903437f32825f4e7893dc041f1e32cd7c0670f9a23aba712e0d1a9a020ff346ea2242d0092be68bbac7e9905756bc7a029782a7 SHA512 68ace8a867d6c1b17546140528b712ea7f77485efb19e3b9511f32dd04b86dcca30266e34e5e01270145210aa2efc40042dc863dc37ffe0023a66a60501be054
-AUX calf-9999-fix-build-with-lld.patch 1118 BLAKE2B 1c07d044da4d969f01263c01851c87624d005e52189f5ddc8e232f36a77f3b438a302450fb87109634fe7347ebb161268f48847bf3d336edb0171a78e81e6d2b SHA512 c282f83bd2d87c67ed7fac536ae671e46c317b9c7753e9ad30138ea44025226501f1dcbfd85f4f716d05f0e0fdc7465d44b373f99ec14522eaa95240ceb1b703
+AUX calf-9999-fix-build-with-lld.patch 570 BLAKE2B 32e9c744d8169362b1f75576de0b48639acffb64aa961faec711f8193da77c4056e5a48ef3350a759ae84c1a7ad0afc1bbe2950d1feb173430dea0f6c286a80d SHA512 a6b201a3adbe733f259f2425d2b5e09ac39615b55ef27d517dd4dc5a816566d707f48f8511218e1ce479bf669893fd9b0895e1b1841ddebb305de0908cfc80c4
+AUX calf-9999-htmldir.patch 3821 BLAKE2B 0d5ad77c861526fdc6040109c30f377c29982d51f3e1f49241867551a0cae38d4cdaa94f774d6c4c42c0f4de3c558ec97354f801d9725f2d053a320d2a054b00 SHA512 f252a1d076ebd6cb07dd00d87f1b92952e2364a18b86e0cb2beb847893f94096ba7f42fbb8753e3ef3679715a9628242a2c516aa272c6c4e5abe29b145815933
+AUX calf-9999-no-automagic.patch 1147 BLAKE2B bafd05909cd39c5c2516f5f061ce24951dc39104b9d055175a51532202ac838bdbd34002b65545792122eceddbf10e5efe8228774e69f8f7aaf1dad448e140bc SHA512 9fa0c4ae502a36d8838fc8adee950d169dc8b92756e51bb0f59a3dca12abdc816591eaf7d25634cfb2291b203c8804d1296862e4d694f8ad0f4c481194817e15
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 2068 BLAKE2B 964917bb85a8771a8e0bcd8dc2ed008f750b066b6d1068b2691769295dbb3044772f4b7c950c0bc10c72d22a93f92d95ed91d3fd37461e31a5fa75a734864bc2 SHA512 48f2c29082207d9d01c949fa67829b4d26dbfe77cf0e3040144f71cd915eefc4f4880570c48b685edd16f6c7556c46301fd1087cd523a57e8e42d46a3bd75d9a
+EBUILD calf-9999.ebuild 2064 BLAKE2B 8ed9e6b003d6a902c09cd15564e0f7a2043a1ec4264f9821b62f0f9f14bdb15a9fc20af37ba432d4ea58ec9c52da79ad4694e016a133348fed1a0c2d89aacaf3 SHA512 531fc5b088da1f505c7ab858132a445cce98452f5e4af61d691b9a951418ccdf6f0aeef7c4eb970b677c7831fb9c672ee21017c2b46c2135ce77eb1afc912acb
MISC metadata.xml 501 BLAKE2B 652333b064998e6eb587ed88e4a4077a40f4af372a013315b525592b1941f7dcc970abef652458745a44b3ec4855d90baba4b20f55c7f965fe8aa0a94e2012e4 SHA512 4cd55fe0e520bc564b09d9734c56ce104fd20c82c18cc2f862d7e09793eea9590a08879902a0ac915b43f4fc8bd583a338027b1b8a55b6a34639cd78f5a68ffb
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index dc7c686ac1e9..4c7268ed03a8 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.90.1-no-automagic.patch"
- "${FILESDIR}/${PN}-0.90.1-htmldir.patch"
+ "${FILESDIR}/${PN}-9999-no-automagic.patch"
+ "${FILESDIR}/${PN}-9999-htmldir.patch"
"${FILESDIR}/${PN}-9999-desktop.patch"
"${FILESDIR}/${PN}-9999-fix-build-with-lld.patch"
)
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 a33e8dc70503..563fde6589fc 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
@@ -1,25 +1,11 @@
-From: Violet Purcell <vimproved@inventati.org>
-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 <vimproved@inventati.org>
-
-rebased
-
--- 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 $(pkglibdir) -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
else
--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
+-libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static
++libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static
endif
+ if HAVE_LD_NODELETE
diff --git a/media-plugins/calf/files/calf-9999-htmldir.patch b/media-plugins/calf/files/calf-9999-htmldir.patch
new file mode 100644
index 000000000000..4b6c77d42f83
--- /dev/null
+++ b/media-plugins/calf/files/calf-9999-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-9999-no-automagic.patch b/media-plugins/calf/files/calf-9999-no-automagic.patch
new file mode 100644
index 000000000000..87fa8a7a18e3
--- /dev/null
+++ b/media-plugins/calf/files/calf-9999-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 03:02:08 +0000