commit: 6e2858caef34b12617e9131d041129aba164fcb1 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Sep 21 07:45:17 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sat Sep 21 07:45:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e2858ca
games-emulation/RetroArch: fix gcc 14 builds Closes: https://bugs.gentoo.org/932471 Closes: https://bugs.gentoo.org/936962 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> ...-1.16.0.3.ebuild => RetroArch-1.16.0.3-r1.ebuild} | 20 ++++++++++++++++---- .../files/RetroArch-1.16.0.3-int-conversion.patch | 13 +++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/games-emulation/RetroArch/RetroArch-1.16.0.3.ebuild b/games-emulation/RetroArch/RetroArch-1.16.0.3-r1.ebuild similarity index 94% rename from games-emulation/RetroArch/RetroArch-1.16.0.3.ebuild rename to games-emulation/RetroArch/RetroArch-1.16.0.3-r1.ebuild index c621d30dc..2dcc7cfa5 100644 --- a/games-emulation/RetroArch/RetroArch-1.16.0.3.ebuild +++ b/games-emulation/RetroArch/RetroArch-1.16.0.3-r1.ebuild @@ -52,12 +52,15 @@ RDEPEND=" libass? ( media-libs/libass:0= ) libusb? ( virtual/libusb:1= ) openal? ( media-libs/openal:0= ) - opengl? ( media-libs/mesa:0=[gles2(+)?] ) + opengl? ( media-libs/libglvnd ) osmesa? ( media-libs/mesa:0=[osmesa?] ) pulseaudio? ( media-libs/libpulse:0= ) sdl? ( >=media-libs/libsdl-1.2.10:0=[joystick] ) sdl2? ( media-libs/libsdl2:0=[joystick] ) - truetype? ( media-libs/freetype:2= ) + truetype? ( + media-libs/fontconfig + media-libs/freetype:2 + ) udev? ( virtual/udev:0= X? ( x11-drivers/xf86-input-evdev:0= ) ) @@ -65,8 +68,12 @@ RDEPEND=" v4l2? ( media-libs/libv4l:0= ) wayland? ( media-libs/mesa:0=[wayland?] ) X? ( - x11-base/xorg-server:0= - >=x11-libs/libxkbcommon-0.4.0:0= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXxf86vm + x11-libs/libxcb:= + x11-libs/libxkbcommon ) xinerama? ( x11-libs/libXinerama:0= ) xv? ( x11-libs/libXv:0= ) @@ -77,6 +84,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + # bug #936962 + "${FILESDIR}/${P}-int-conversion.patch" +) + src_configure() { if use cg; then append-ldflags -L"${EPREFIX}/"opt/nvidia-cg-toolkit/$(get_libdir) diff --git a/games-emulation/RetroArch/files/RetroArch-1.16.0.3-int-conversion.patch b/games-emulation/RetroArch/files/RetroArch-1.16.0.3-int-conversion.patch new file mode 100644 index 000000000..95c03cdeb --- /dev/null +++ b/games-emulation/RetroArch/files/RetroArch-1.16.0.3-int-conversion.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/936962 +https://github.com/libretro/RetroArch/commit/4ce7dd6fd5b6be4cb9049e7f58dda04051f877f7 +--- a/gfx/drivers_context/wayland_ctx.c ++++ b/gfx/drivers_context/wayland_ctx.c +@@ -407,7 +407,7 @@ static bool gfx_ctx_wl_set_video_mode(void *data, + goto error; + } + +- if (!egl_create_surface(&wl->egl, (EGLNativeWindowType)wl->win)) ++ if (!egl_create_surface(&wl->egl, (void*)wl->win)) + goto error; + egl_set_swap_interval(&wl->egl, wl->egl.interval); + #endif
