From 77526e7efa64cb62f7246fc05ab948878118ad5d Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Thu, 26 Dec 2024 02:40:40 -0500 Subject: [PATCH] media-sound/yoshimi: add binding := to fltk & fix build with 1.4 1.4.x seems to have dropped some transitive includes, and this needs to include what it uses. := due to new soname Have not tried wayland (new in fltk-1.4), but given the build fix revealed that it uses some X-specific bits, odds are it'll be broken without fltk[X(+)] and so added that as well. Signed-off-by: Ionen Wolkens --- .../yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch | 15 +++++++++++++++ ...i-2.3.3.1.ebuild => yoshimi-2.3.3.1-r1.ebuild} | 6 +++++- ...i-2.3.3.2.ebuild => yoshimi-2.3.3.2-r1.ebuild} | 6 +++++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch rename media-sound/yoshimi/{yoshimi-2.3.3.1.ebuild => yoshimi-2.3.3.1-r1.ebuild} (91%) rename media-sound/yoshimi/{yoshimi-2.3.3.2.ebuild => yoshimi-2.3.3.2-r1.ebuild} (91%) diff --git a/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch new file mode 100644 index 0000000000000..e3266ce7af7a1 --- /dev/null +++ b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch @@ -0,0 +1,15 @@ +MiscGui.cpp:1434:18: error: 'fl_display' was not declared ... + +Other files are using x.H, but that header is deprecated and +the correct one is platform.H. fl_display is X-specific, so +this likely cannot work without fltk[X] at the moment. +--- a/UI/MiscGui.cpp ++++ b/UI/MiscGui.cpp +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #include + #include diff --git a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild similarity index 91% rename from media-sound/yoshimi/yoshimi-2.3.3.1.ebuild rename to media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild index d52b5bb9ab3d4..d25e3732e7d99 100644 --- a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild +++ b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild @@ -27,13 +27,17 @@ DEPEND=" sys-libs/zlib virtual/jack x11-libs/cairo[X] - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[X(+),opengl] lv2? ( media-libs/lv2 ) " RDEPEND="${DEPEND}" DOCS=( ../Changelog ../README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + src_prepare() { cmake_src_prepare sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die diff --git a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild similarity index 91% rename from media-sound/yoshimi/yoshimi-2.3.3.2.ebuild rename to media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild index 42acb9b39317f..67ffcae931196 100644 --- a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild +++ b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild @@ -27,13 +27,17 @@ DEPEND=" sys-libs/zlib virtual/jack x11-libs/cairo[X] - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[X(+),opengl] lv2? ( media-libs/lv2 ) " RDEPEND="${DEPEND}" DOCS=( ../Changelog ../README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + src_prepare() { cmake_src_prepare sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die