From 8d15338a15ba8c63754000b8c1293619c906a7d8 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Sun, 8 Jun 2025 10:14:11 +0300 Subject: [PATCH] games-emulation/RetroArch: drop USE osmesa media-libs/mesa dropped it. Signed-off-by: Viorel Munteanu --- .../RetroArch/RetroArch-1.19.1.ebuild | 5 +- .../RetroArch/RetroArch-1.20.0.ebuild | 5 +- .../RetroArch/RetroArch-1.21.0.ebuild | 111 +++++++++--------- games-emulation/RetroArch/metadata.xml | 1 - 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/games-emulation/RetroArch/RetroArch-1.19.1.ebuild b/games-emulation/RetroArch/RetroArch-1.19.1.ebuild index b7fa0223c2..b8e75247e4 100644 --- a/games-emulation/RetroArch/RetroArch-1.19.1.ebuild +++ b/games-emulation/RetroArch/RetroArch-1.19.1.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl osmesa oss +ozone pulseaudio +rgui sdl +truetype +threads udev v4l2 videocore vulkan wayland X xinerama xmb xv zlib" +IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl oss +ozone pulseaudio +rgui sdl +truetype +threads udev v4l2 videocore vulkan wayland X xinerama xmb xv zlib" REQUIRED_USE=" || ( opengl sdl vulkan dispmanx ) @@ -50,7 +50,6 @@ RDEPEND=" libusb? ( virtual/libusb:1= ) openal? ( media-libs/openal:0= ) opengl? ( media-libs/libglvnd ) - osmesa? ( media-libs/mesa:0=[osmesa?] ) pulseaudio? ( media-libs/libpulse ) sdl? ( media-libs/libsdl2[joystick] ) truetype? ( @@ -113,6 +112,7 @@ src_configure() { --disable-qt \ --disable-sdl \ --disable-vg \ + --disable-osmesa \ $(use_enable 7zip) \ $(use_enable alsa) \ $(use_enable cheevos) \ @@ -134,7 +134,6 @@ src_configure() { $(use_enable network networking) \ $(use_enable openal al) \ $(use_enable opengl) \ - $(use_enable osmesa) \ $(use_enable oss) \ $(use_enable ozone) \ $(use_enable pulseaudio pulse) \ diff --git a/games-emulation/RetroArch/RetroArch-1.20.0.ebuild b/games-emulation/RetroArch/RetroArch-1.20.0.ebuild index dbd48d858c..5bb38b9505 100644 --- a/games-emulation/RetroArch/RetroArch-1.20.0.ebuild +++ b/games-emulation/RetroArch/RetroArch-1.20.0.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl osmesa oss +ozone pipewire pulseaudio +rgui sdl +truetype +threads udev v4l2 videocore vulkan wayland X xinerama xmb xv zlib" +IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl oss +ozone pipewire pulseaudio +rgui sdl +truetype +threads udev v4l2 videocore vulkan wayland X xinerama xmb xv zlib" REQUIRED_USE=" || ( opengl sdl vulkan dispmanx ) @@ -51,7 +51,6 @@ RDEPEND=" libusb? ( virtual/libusb:1= ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd ) - osmesa? ( media-libs/mesa:0=[osmesa?] ) pulseaudio? ( media-libs/libpulse ) pipewire? ( media-video/pipewire:= ) sdl? ( media-libs/libsdl2[joystick] ) @@ -110,6 +109,7 @@ src_configure() { --disable-qt \ --disable-sdl \ --disable-vg \ + --disable-osmesa \ $(use_enable 7zip) \ $(use_enable alsa) \ $(use_enable cheevos) \ @@ -131,7 +131,6 @@ src_configure() { $(use_enable network networking) \ $(use_enable openal al) \ $(use_enable opengl) \ - $(use_enable osmesa) \ $(use_enable oss) \ $(use_enable ozone) \ $(use_enable pulseaudio pulse) \ diff --git a/games-emulation/RetroArch/RetroArch-1.21.0.ebuild b/games-emulation/RetroArch/RetroArch-1.21.0.ebuild index 9fe6148ab4..9c2b8c2783 100644 --- a/games-emulation/RetroArch/RetroArch-1.21.0.ebuild +++ b/games-emulation/RetroArch/RetroArch-1.21.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs xdg +inherit edo flag-o-matic toolchain-funcs xdg DESCRIPTION="RetroArch is a frontend for emulators, game engines and media players" HOMEPAGE="https://www.retroarch.com" @@ -14,7 +14,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl osmesa oss +ozone pipewire pulseaudio +rgui sdl +truetype +threads udev v4l2 videocore vulkan wayland X xinerama xmb xv zlib" +IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl oss +ozone pipewire pulseaudio +rgui sdl +truetype +threads udev v4l2 videocore vulkan wayland X xinerama xmb xv zlib" REQUIRED_USE=" || ( opengl sdl vulkan dispmanx ) @@ -51,7 +51,6 @@ RDEPEND=" libusb? ( virtual/libusb:1= ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd ) - osmesa? ( media-libs/mesa:0=[osmesa?] ) pulseaudio? ( media-libs/libpulse ) pipewire? ( media-video/pipewire:= ) sdl? ( media-libs/libsdl2[joystick] ) @@ -101,63 +100,67 @@ src_configure() { || die '"sed" failed.' fi + tc-export CC CXX + # Note that OpenVG support is hard-disabled. (See ${RDEPEND} above.) - CC="$(tc-getCC)" CXX="$(tc-getCXX)" ./configure \ - --prefix="${EPREFIX}/usr" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --enable-dynamic \ - --disable-builtinzlib \ - --disable-qt \ - --disable-sdl \ - --disable-vg \ - $(use_enable 7zip) \ - $(use_enable alsa) \ - $(use_enable cheevos) \ - $(use_enable cg) \ - $(use_enable cpu_flags_arm_neon neon) \ - $(use_enable cpu_flags_arm_vfp floathard) \ - $(use_enable cpu_flags_x86_sse2 sse) \ - $(use_enable dispmanx) \ - $(use_enable egl) \ - $(use_enable ffmpeg) \ - $(use_enable gles2 opengles) \ - $(use_enable gles3 opengles3) \ - $(use_enable hid) \ - $(use_enable jack) \ - $(use_enable kms) \ - $(use_enable libass ssa) \ - $(use_enable libusb) \ - $(use_enable materialui) \ - $(use_enable network networking) \ - $(use_enable openal al) \ - $(use_enable opengl) \ - $(use_enable osmesa) \ - $(use_enable oss) \ - $(use_enable ozone) \ - $(use_enable pulseaudio pulse) \ - $(use_enable pipewire) \ - $(use_enable rgui) \ - $(use_enable sdl sdl2) \ - $(use_enable threads) \ - $(use_enable truetype freetype) \ - $(use_enable udev) \ - $(use_enable v4l2) \ - $(use_enable videocore) \ - $(use_enable vulkan) \ - $(use_enable wayland) \ - $(use_enable X x11) \ - $(use_enable xinerama) \ - $(use_enable xmb) \ - $(use_enable xv xvideo) \ - $(use_enable zlib) \ - || die + local myconf=( + --prefix="${EPREFIX}/usr" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --enable-dynamic + --disable-builtinzlib + --disable-qt + --disable-sdl + --disable-vg + --disable-osmesa + $(use_enable 7zip) + $(use_enable alsa) + $(use_enable cheevos) + $(use_enable cg) + $(use_enable cpu_flags_arm_neon neon) + $(use_enable cpu_flags_arm_vfp floathard) + $(use_enable cpu_flags_x86_sse2 sse) + $(use_enable dispmanx) + $(use_enable egl) + $(use_enable ffmpeg) + $(use_enable gles2 opengles) + $(use_enable gles3 opengles3) + $(use_enable hid) + $(use_enable jack) + $(use_enable kms) + $(use_enable libass ssa) + $(use_enable libusb) + $(use_enable materialui) + $(use_enable network networking) + $(use_enable openal al) + $(use_enable opengl) + $(use_enable oss) + $(use_enable ozone) + $(use_enable pulseaudio pulse) + $(use_enable pipewire) + $(use_enable rgui) + $(use_enable sdl sdl2) + $(use_enable threads) + $(use_enable truetype freetype) + $(use_enable udev) + $(use_enable v4l2) + $(use_enable videocore) + $(use_enable vulkan) + $(use_enable wayland) + $(use_enable X x11) + $(use_enable xinerama) + $(use_enable xmb) + $(use_enable xv xvideo) + $(use_enable zlib) + ) + + edo ./configure "${myconf[@]}" } src_compile() { emake V=1 $(usex debug "DEBUG=1" "") if use filters; then - emake CC="$(tc-getCC)" $(usex debug "build=debug" "build=release") -C gfx/video_filters/ - emake CC="$(tc-getCC)" $(usex debug "build=debug" "build=release") -C libretro-common/audio/dsp_filters/ + emake $(usex debug "build=debug" "build=release") -C gfx/video_filters/ + emake $(usex debug "build=debug" "build=release") -C libretro-common/audio/dsp_filters/ fi } diff --git a/games-emulation/RetroArch/metadata.xml b/games-emulation/RetroArch/metadata.xml index bbe136b6f7..a34f8b459a 100644 --- a/games-emulation/RetroArch/metadata.xml +++ b/games-emulation/RetroArch/metadata.xml @@ -26,7 +26,6 @@ Networking features (recommended) OpenAL support OpenGL 2.0 support - Off-screen Mesa rendering OSS support Ozone menu PulseAudio support