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 <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2024-12-26 02:40:40 -05:00
parent 89e3b5173c
commit 77526e7efa
3 changed files with 25 additions and 2 deletions

View File

@@ -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 <FL/Fl.H>
#include <FL/fl_draw.H>
+#include <FL/platform.H>
#include <cairo.h>
#include <cairo-xlib.h>

View File

@@ -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

View File

@@ -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