commit: cd31b95b26cc70d44009193e7c2d3651270bfe40 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Thu Jul 10 07:43:48 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Jul 10 07:43:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd31b95b
media-plugins/calf: dropped obsolete 0.90.6-r1 Bug: https://bugs.gentoo.org/959792 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-plugins/calf/Manifest | 1 - media-plugins/calf/calf-0.90.6-r1.ebuild | 75 ----------- media-plugins/calf/files/calf-0.90.4-desktop.patch | 22 ---- media-plugins/calf/files/calf-0.90.4-htmldir.patch | 64 ---------- .../calf/files/calf-0.90.4-no-automagic.patch | 39 ------ .../calf/files/calf-0.90.6-gnuinstalldirs.patch | 139 --------------------- media-plugins/calf/files/calf-0.90.6-lv2gui.patch | 18 --- 7 files changed, 358 deletions(-) diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest index 549dda35943e..ed2409d3929f 100644 --- a/media-plugins/calf/Manifest +++ b/media-plugins/calf/Manifest @@ -1,2 +1 @@ -DIST calf-0.90.6.tar.gz 16119636 BLAKE2B b3eeb198d3df09880de2f053f838f8300c53a19440cbaff5d6fb75d7fbb37e47a6853b31d683f5caf181863cc4698c1d3fda24d277aab1e7867c2162f1279aab SHA512 60f794ba8333b7be92bede3051a416f67e1cca6334e182bf51664456286811eb84a63a5f13522af55540e46d5d01a2e7c85841284aeb3fbdf4875874cf44d182 DIST calf-0.90.7.tar.gz 16119531 BLAKE2B a9262be48c955901617aac1d1abafbe523eab5cdea6671aa87d6372eba70fedfe2e636e5f66b83cc1d9107de56ec34ed4feb1e4fbf1e1e880e005ed473b84c1d SHA512 a407566717ee31fd26e17ff1e6cd412ecf7a0abef58314c632ef08cc1d80f26e9243b363de82958eb3cc5754dc79af3a682782be0c2654f821bbbcaef9c58f3d diff --git a/media-plugins/calf/calf-0.90.6-r1.ebuild b/media-plugins/calf/calf-0.90.6-r1.ebuild deleted file mode 100644 index 38c3745ba431..000000000000 --- a/media-plugins/calf/calf-0.90.6-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic toolchain-funcs xdg - -DESCRIPTION="Set of open source instruments and effects for digital audio workstations" -HOMEPAGE="https://calf-studio-gear.org/"; - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"; -else - SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="cpu_flags_x86_sse experimental gui jack lash lv2" - -REQUIRED_USE="jack? ( gui )" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0 - dev-libs/expat - dev-libs/glib:2 - media-sound/fluidsynth:= - gui? ( - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/pango - ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - lv2? ( media-libs/lv2 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-gnuinstalldirs.patch" # in 0.90.7 - # pending upstream PRs: - "${FILESDIR}/${P}-desktop-file.patch" # bug 955628 - "${FILESDIR}/${P}-lv2gui.patch" # bug 954142 -) - -src_configure() { - # Upstream append -ffast-math by default, however since libtool links C++ - # shared libs with -nostdlib, this causes symbol resolution error for - # __powidn2 when using compiler-rt. Disable fast math on compiler-rt until - # a better fix is found. - [[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math" - - local mycmakeargs=( - -DWANT_GUI=$(usex gui) - -DWANT_JACK=$(usex jack) - -DWANT_LASH=$(usex lash) - -DWANT_LV2=$(usex lv2) - -DWANT_LV2_GUI=$(usex lv2) - -DWANT_SORDI=ON - -DWANT_EXPERIMENTAL=$(usex experimental) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - mv "${ED}"/usr/share/bash-completion/completions/calf \ - "${ED}"/usr/share/bash-completion/completions/calfjackhost || die "Failed to install bash completion" -} diff --git a/media-plugins/calf/files/calf-0.90.4-desktop.patch b/media-plugins/calf/files/calf-0.90.4-desktop.patch deleted file mode 100644 index 4a761162e476..000000000000 --- a/media-plugins/calf/files/calf-0.90.4-desktop.patch +++ /dev/null @@ -1,22 +0,0 @@ - * 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 -+++ b/calf.desktop.in -@@ -1,10 +1,9 @@ - [Desktop Entry] --Categories=Application;AudioVideo;Audio;GNOME -+Categories=AudioVideo;Audio;GNOME - Exec=calfjackhost - Icon=calf - Terminal=false - Type=Application --Version=@VERSION@ - - Name=Calf Plugin Pack for JACK - Name[fr]=Ensemble de greffons Calf pour JACK diff --git a/media-plugins/calf/files/calf-0.90.4-htmldir.patch b/media-plugins/calf/files/calf-0.90.4-htmldir.patch deleted file mode 100644 index 4b6c77d42f83..000000000000 --- a/media-plugins/calf/files/calf-0.90.4-htmldir.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- 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-0.90.4-no-automagic.patch b/media-plugins/calf/files/calf-0.90.4-no-automagic.patch deleted file mode 100644 index 87fa8a7a18e3..000000000000 --- a/media-plugins/calf/files/calf-0.90.4-no-automagic.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- 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 diff --git a/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch b/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch deleted file mode 100644 index 7b07c9c05cc5..000000000000 --- a/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 063812ffd37edb99e14f7a3d224fbf999a506252 Mon Sep 17 00:00:00 2001 -From: Johannes Lorenz <[email protected]> -Date: Fri, 2 May 2025 13:59:50 +0200 -Subject: [PATCH] Use GNUInstallDirs for flexible `bin`, `lib` and `doc` - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -210,21 +210,21 @@ add_subdirectory(icons) - - include(GNUInstallDirs) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/ -- DESTINATION share/doc/${PROJECT_NAME} FILES_MATCHING PATTERN "*.html") -+ DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.html") - install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/ -- DESTINATION share/doc/${PROJECT_NAME}/images FILES_MATCHING PATTERN "*.png") -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/images FILES_MATCHING PATTERN "*.png") - install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/ -- DESTINATION share/doc/${PROJECT_NAME}/images FILES_MATCHING PATTERN "*.jpg") -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/images FILES_MATCHING PATTERN "*.jpg") - install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/prettyPhoto/dark_rounded/ -- DESTINATION share/doc/${PROJECT_NAME}/images/prettyPhoto/dark_rounded) -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/images/prettyPhoto/dark_rounded) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/icons/ -- DESTINATION share/doc/${PROJECT_NAME}/images/icons) -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/images/icons) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts -- DESTINATION share/doc/${PROJECT_NAME} FILES_MATCHING PATTERN "*.css") -+ DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.css") - install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts/ -- DESTINATION share/doc/${PROJECT_NAME}/scripts FILES_MATCHING PATTERN "*.js") -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/scripts FILES_MATCHING PATTERN "*.js") - install(DIRECTORY ${CMAKE_SOURCE_DIR}/sf2/ -- DESTINATION share/${PROJECT_NAME}/sf2 FILES_MATCHING PATTERN "*.sf2") -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/sf2 FILES_MATCHING PATTERN "*.sf2") - install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}jackhost.1 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,6 +3,7 @@ - # - - include(CheckLinkerFlag) -+include(GNUInstallDirs) - - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -@@ -57,7 +58,7 @@ endif() - - - if(USE_LV2 AND USE_GUI) -- set(LV2DIR "${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2") -+ set(LV2DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2") - add_library(${PROJECT_NAME}lv2gui SHARED gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp) - target_include_directories(${PROJECT_NAME}lv2gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - check_linker_flag(CXX -Wl,-z,nodelete LINKER_SUPPORTS_NODELETE) -@@ -81,7 +82,7 @@ if(USE_GUI AND USE_JACK) - target_link_libraries(${PROJECT_NAME}jackhost PRIVATE Threads::Threads ${PROJECT_NAME}gui ${PROJECT_NAME} ${JACK_LIBRARIES} ${GTK_LIBRARIES} fluidsynth) - - set_target_properties(${PROJECT_NAME}jackhost PROPERTIES -- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" -+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}" - BUILD_WITH_INSTALL_RPATH TRUE - ) - endif() -@@ -109,59 +110,59 @@ if(USE_GUI) - install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}-gui.xml - DESTINATION share/${PROJECT_NAME}/) - if(USE_JACK) -- install(TARGETS ${PROJECT_NAME}jackhost DESTINATION bin) -+ install(TARGETS ${PROJECT_NAME}jackhost DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - endif() - - # Install libs --install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/${PROJECT_NAME}) -+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) - if(USE_GUI) -- install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION lib/${PROJECT_NAME}) -+ install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) - endif() - - if(USE_LV2) - # Create Lv2 install dir -- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2\")" -+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2\")" - RESULT_VARIABLE calfResult) - if(NOT ${calfResult} EQUAL 0) -- message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/") -+ message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/") - endif() - # Create symlinks from Lv2 install dir to libs - install(CODE "execute_process( \ - COMMAND \"${CMAKE_COMMAND}\" -E create_symlink \ -- \"${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}/lib${PROJECT_NAME}.so\" \ -- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so\" \ -+ \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/lib${PROJECT_NAME}.so\" \ -+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so\" \ - )" - RESULT_VARIABLE calfResult - ) - if(NOT ${calfResult} EQUAL 0) -- message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so") -+ message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so") - endif() - if(USE_GUI) - install(CODE "execute_process( \ - COMMAND \"${CMAKE_COMMAND}\" -E create_symlink \ -- \"${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}/lib${PROJECT_NAME}lv2gui.so\" \ -- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so\" \ -+ \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/lib${PROJECT_NAME}lv2gui.so\" \ -+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so\" \ - )" - RESULT_VARIABLE calfResult - ) - if(NOT ${calfResult} EQUAL 0) -- message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so") -+ message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so") - endif() - endif() - - # Remove previous .ttl files -- file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/lib/lv2/*.ttl") -+ file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/*.ttl") - foreach(ttl_file ${ttl_files}) - file(REMOVE "${ttl_file}") - endforeach() - - # Install new .ttl files -- install(CODE "execute_process(COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}makerdf\" -m ttl -p \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2\" -d \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")") -+ install(CODE "execute_process(COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}makerdf\" -m ttl -p \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2\" -d \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")") - - # Check files with "sordi" - if(USE_SORDI) -- file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/*.ttl") -+ file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/*.ttl") - foreach(ttl_file ${ttl_files}) - install( - CODE "execute_process(COMMAND \"${SORDI}\" -o turtle \"${ttl_file}\")" diff --git a/media-plugins/calf/files/calf-0.90.6-lv2gui.patch b/media-plugins/calf/files/calf-0.90.6-lv2gui.patch deleted file mode 100644 index 0a4b162213d0..000000000000 --- a/media-plugins/calf/files/calf-0.90.6-lv2gui.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: https://github.com/calf-studio-gear/calf/pull/384 - -From 4f6adaa9bea90bfceaca02334a1a9f1642016444 Mon Sep 17 00:00:00 2001 -From: Johannes Lorenz <[email protected]> -Date: Fri, 16 May 2025 20:54:44 +0200 -Subject: [PATCH] Fix #383: Only install lv2gui if Lv2 *and* GUI are set - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -121,7 +121,7 @@ endif() - - # Install libs - install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) --if(USE_GUI) -+if(USE_LV2 AND USE_GUI) - install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) - endif() -
