media-plugins/calf: updated live ebuild patches

Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

4 files changed, 109 insertions, 20 deletions

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