diff --git a/games/retroarch/Makefile b/games/retroarch/Makefile index 7b64402b9cf5..f487334d4f3e 100644 --- a/games/retroarch/Makefile +++ b/games/retroarch/Makefile @@ -1,110 +1,108 @@ # Created by: Yuri Victorovich PORTNAME= RetroArch -PORTVERSION= 1.9.0 +PORTVERSION= 1.9.7 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= games emulators -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 618c83d4ca1b8144377747076e28ac962e492392.patch:-p1 - MAINTAINER= greg@unrelenting.technology COMMENT= Cross-platform entertainment system based on libretro API LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \ libdrm.so:graphics/libdrm \ - libass.so:multimedia/libass + libass.so:multimedia/libass \ + libfribidi.so:converters/fribidi \ + libfontconfig.so:x11-fonts/fontconfig BUILD_DEPENDS= vulkan-loader>0:graphics/vulkan-loader \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers RUN_DEPENDS= retroarch-assets<=0:games/retroarch-assets USES= compiler:c++11-lib gmake pkgconfig python:3.6+ shebangfix ssl OPTIONS_DEFINE= CACA FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11 DOCS -OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11 +OPTIONS_DEFAULT=FFMPEG OSS SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11 FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec WAYLAND_DESC= Wayland display support UDEV_DESC= udev device hotplug support QT_DESC= Qt based desktop-style GUI DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:tl} CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_ENABLE= caca FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE=ffmpeg OSS_CONFIGURE_ENABLE= oss JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ENABLE= alsa SDL_USES= sdl SDL_USE= SDL=sdl2 image2 SDL_CONFIGURE_ON= --disable-sdl --enable-sdl2 SDL_CONFIGURE_OFF= --disable-sdl --disable-sdl2 OPENGL_USES= gl OPENGL_USE= GL=gl,egl,gbm OPENGL_CONFIGURE_ENABLE=opengl OPENAL_USES= openal:soft OPENAL_CONFIGURE_ENABLE=al V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat V4L_CONFIGURE_ENABLE= v4l2 FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/linux/kd.h:graphics/svgalib WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_CONFIGURE_ENABLE= wayland UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libepoll-shim.so:devel/libepoll-shim UDEV_CFLAGS= -I${LOCALBASE}/include/libepoll-shim UDEV_LDFLAGS= -L${LOCALBASE}/lib -lepoll-shim UDEV_CONFIGURE_ENABLE= udev QT_USES= qt:5 QT_USE= QT=core,gui,widgets,concurrent,network QT_CONFIGURE_ENABLE= qt X11_USES= xorg X11_USE= XORG=x11,xcb,xext,xinerama,xv,xxf86vm,xrandr X11_CONFIGURE_ENABLE= x11 LDFLAGS_i386= -Wl,-znotext CONFIGURE_ARGS+=--enable-threads --disable-discord CONFIGURE_ENV+= MAN_DIR=${MANPREFIX}/man SHEBANG_FILES= libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py \ tools/cg2glsl.py tools/vulkan_loader_generator.py USE_GITHUB= yes GH_ACCOUNT= libretro SUB_FILES= pkg-message HAS_CONFIGURE= yes CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc post-patch: @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/camera/drivers/video4linux2.c \ ${WRKSRC}/libretro-common/libco/armeabi.c \ ${WRKSRC}/memory/wii/mem2_manager.c @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/camera/drivers/video4linux2.c post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch @${REINPLACE_CMD} \ -e 's|# libretro_directory =|libretro_directory = "${PREFIX}/lib/libretro"|' \ -e 's|# libretro_info_path =|libretro_info_path = "${PREFIX}/share/libretro/info"|' \ -e 's|# assets_directory =|assets_directory = "${PREFIX}/share/libretro/assets"|' \ -e 's|# video_shader_dir =|video_shader_dir = "${PREFIX}/share/libretro/shaders"|' \ -e 's|# video_filter_dir =|video_filter_dir = "${PREFIX}/lib/retroarch/filters/video"|' \ -e 's|# audio_filter_dir =|audio_filter_dir = "${PREFIX}/lib/retroarch/filters/audio"|' \ -e 's|# joypad_autoconfig_dir =|joypad_autoconfig_dir = "${PREFIX}/share/retroarch/autoconfig"|' \ -e 's|# menu_show_core_updater = true|menu_show_core_updater = false|' \ ${STAGEDIR}${PREFIX}/etc/retroarch.cfg .include diff --git a/games/retroarch/distinfo b/games/retroarch/distinfo index 05429524c993..7a71ce669c69 100644 --- a/games/retroarch/distinfo +++ b/games/retroarch/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1598401167 -SHA256 (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a -SIZE (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39152024 +TIMESTAMP = 1628839619 +SHA256 (libretro-RetroArch-v1.9.7_GH0.tar.gz) = a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e +SIZE (libretro-RetroArch-v1.9.7_GH0.tar.gz) = 40107807 SHA256 (618c83d4ca1b8144377747076e28ac962e492392.patch) = 965b73683058b887aa0ce96cd1186a61d1491d00fc0d3a96531aaa3a6eed45de SIZE (618c83d4ca1b8144377747076e28ac962e492392.patch) = 1573 diff --git a/games/retroarch/files/patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h b/games/retroarch/files/patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h deleted file mode 100644 index 585f918cf4a0..000000000000 --- a/games/retroarch/files/patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/KhronosGroup/glslang/issues/1869 - ---- deps/glslang/glslang/glslang/Include/PoolAlloc.h.orig 2020-03-21 22:21:53 UTC -+++ deps/glslang/glslang/glslang/Include/PoolAlloc.h -@@ -304,7 +304,6 @@ class pool_allocator { (public) - size_type max_size() const { return static_cast(-1) / sizeof(T); } - size_type max_size(int size) const { return static_cast(-1) / size; } - -- void setAllocator(TPoolAllocator* a) { allocator = *a; } - TPoolAllocator& getAllocator() const { return allocator; } - - protected: diff --git a/games/retroarch/files/patch-input_input__keymaps.c b/games/retroarch/files/patch-input_input__keymaps.c deleted file mode 100644 index d893b4878657..000000000000 --- a/games/retroarch/files/patch-input_input__keymaps.c +++ /dev/null @@ -1,13 +0,0 @@ ---- input/input_keymaps.c.orig 2020-08-07 22:06:53 UTC -+++ input/input_keymaps.c -@@ -50,10 +50,8 @@ - #include "SDL.h" - #endif - --#if defined(__linux__) || defined(__linux__) && defined(HAVE_WAYLAND) - #include - #include --#endif - - #ifdef HAVE_X11 - #include "input/include/xfree86_keycodes.h" diff --git a/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c b/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c deleted file mode 100644 index 231c91bafe51..000000000000 --- a/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libretro-common/net/net_ifinfo.c.orig 2020-08-07 22:06:53 UTC -+++ libretro-common/net/net_ifinfo.c -@@ -50,6 +50,8 @@ - #include - #endif - -+#include -+ - void net_ifinfo_free(net_ifinfo_t *list) - { - unsigned k; diff --git a/games/retroarch/pkg-plist b/games/retroarch/pkg-plist index c4405b3980b5..ef62ae1ee8fe 100644 --- a/games/retroarch/pkg-plist +++ b/games/retroarch/pkg-plist @@ -1,10 +1,10 @@ bin/retroarch bin/retroarch-cg2glsl etc/retroarch.cfg man/man6/retroarch-cg2glsl.6.gz man/man6/retroarch.6.gz share/applications/retroarch.desktop -share/metainfo/com.libretro.RetroArch.appdata.xml %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README.md +share/metainfo/com.libretro.RetroArch.appdata.xml share/pixmaps/retroarch.svg