commit: 5f79fc9c718df957e1cdba1af5be51fa6536c460 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Aug 29 13:45:18 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Aug 29 13:47:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f79fc9c
app-emulation/fuse: remove svgalib backend Remove svgalib backend. Update HOMEPAGE. Fix gtk dependencies. Fix build issue with joystick. Closes: https://bugs.gentoo.org/962069 Closes: https://bugs.gentoo.org/958016 Closes: https://bugs.gentoo.org/921615 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> .../fuse/files/fuse-1.6.0-fix-joystick.patch | 14 ++++++++++++ .../{fuse-1.6.0-r2.ebuild => fuse-1.6.0-r3.ebuild} | 25 ++++++++++++++-------- app-emulation/fuse/metadata.xml | 1 - 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app-emulation/fuse/files/fuse-1.6.0-fix-joystick.patch b/app-emulation/fuse/files/fuse-1.6.0-fix-joystick.patch new file mode 100644 index 000000000000..f6bc2f65cce3 --- /dev/null +++ b/app-emulation/fuse/files/fuse-1.6.0-fix-joystick.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/921615 + +Add missing include + +--- a/ui/uijoystick.c ++++ b/ui/uijoystick.c +@@ -38,6 +38,7 @@ + + #include "input.h" + #include "uijoystick.h" ++#include "peripherals/joystick.h" + + #if defined USE_JOYSTICK && defined HAVE_JSW_H + diff --git a/app-emulation/fuse/fuse-1.6.0-r2.ebuild b/app-emulation/fuse/fuse-1.6.0-r3.ebuild similarity index 87% rename from app-emulation/fuse/fuse-1.6.0-r2.ebuild rename to app-emulation/fuse/fuse-1.6.0-r3.ebuild index 79239545fcad..f19a6979f777 100644 --- a/app-emulation/fuse/fuse-1.6.0-r2.ebuild +++ b/app-emulation/fuse/fuse-1.6.0-r3.ebuild @@ -6,13 +6,13 @@ EAPI=8 inherit autotools flag-o-matic xdg DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall" -HOMEPAGE="http://fuse-emulator.sourceforge.net"; +HOMEPAGE="https://fuse-emulator.sourceforge.net"; SRC_URI="https://downloads.sourceforge.net/fuse-emulator/${P}.tar.gz"; LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~riscv ~x86" -IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png pulseaudio +xml +zlib" +IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl gpm joystick memlimit png pulseaudio +xml +zlib" # TODO: # - allow using sdl audio driver without using for the UI @@ -21,7 +21,7 @@ IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm # At most one audio driver and at most one UI back-end can be enabled at a time REQUIRED_USE="?? ( alsa ao backend-sdl pulseaudio ) - ?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga ) + ?? ( backend-X backend-fbcon backend-gtk3 backend-sdl ) png? ( zlib )" RDEPEND=" @@ -29,15 +29,23 @@ RDEPEND=" dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) - backend-X? ( x11-libs/libX11 x11-libs/libXext ) - backend-gtk3? ( x11-libs/gtk+:3 ) + backend-X? ( + x11-libs/libX11 + x11-libs/libXext + ) + backend-gtk3? ( + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + ) backend-sdl? ( media-libs/libsdl[joystick,sound] ) - backend-svga? ( media-libs/svgalib ) gpm? ( backend-fbcon? ( sys-libs/gpm ) ) joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-libs/libpulse ) - xml? ( dev-libs/libxml2:2= ) + xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} backend-fbcon? ( virtual/linux-sources )" @@ -48,6 +56,7 @@ DOCS=( AUTHORS ChangeLog README THANKS ) PATCHES=( "${FILESDIR}"/remove-local-prefix.patch + "${FILESDIR}"/${P}-fix-joystick.patch ) _fuse_audio_driver() { @@ -97,8 +106,6 @@ src_configure() { myconf+=("--with-gtk") elif use backend-sdl; then myconf+=("--with-sdl") - elif use backend-svga; then - myconf+=("--with-svgalib") else myconf+=("--with-null-ui") fi diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml index deaf5134e3e3..70075f32f3fb 100644 --- a/app-emulation/fuse/metadata.xml +++ b/app-emulation/fuse/metadata.xml @@ -9,7 +9,6 @@ <flag name="backend-fbcon">Use framebuffer rendering backend</flag> <flag name="backend-gtk3">Use Gtk+ rendering backend</flag> <flag name="backend-sdl">Use SDL rendering backend</flag> - <flag name="backend-svga">Use svgalib rendering backend</flag> <flag name="backend-X">Use X11 rendering backend</flag> <flag name="memlimit">Add compile-time memory usage limiting</flag> </use>
