From 3b09e4eaf59ae0b52154c1bbeaa6e6c4f606c482 Mon Sep 17 00:00:00 2001 From: Hunter Sezen Date: Mon, 20 Aug 2018 14:41:32 +0100 Subject: games/RetroArch: Patched for upstream regression. Signed-off-by: David Spencer --- games/RetroArch/README | 10 +++++----- games/RetroArch/RetroArch.SlackBuild | 27 +++++++++++++++++++++------ games/RetroArch/calloc.patch.gz | Bin 0 -> 506 bytes games/RetroArch/no_content.patch.gz | Bin 0 -> 633 bytes 4 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 games/RetroArch/calloc.patch.gz create mode 100644 games/RetroArch/no_content.patch.gz (limited to 'games/RetroArch') diff --git a/games/RetroArch/README b/games/RetroArch/README index 1a6ebe122e..07a01d187c 100644 --- a/games/RetroArch/README +++ b/games/RetroArch/README @@ -19,17 +19,17 @@ RetroArch will require at least one of the libretro cores to play any games. To build debugging symbols for RetroArch use: - DEBUG=1 ./RetroArch.SlackBuild + DEBUG=yes ./RetroArch.SlackBuild If building debugging symbols asan can also be built: - DEBUG=1 ASAN=1 ./RetroArch.SlackBuild + DEBUG=yes ASAN=yes ./RetroArch.SlackBuild Optional dependencies: ffmpeg jack-audio-connection-kit libxkbcommon miniupnpc nvidia-cg-toolkit OpenAL python3 qt5 SDL2 vulkansdk wayland Python3 support for shaders will need to be enabled with: - PYTHON=1 ./RetroArch.SlackBuild + PYTHON=yes ./RetroArch.SlackBuild If pulseaudio is installed it can be disabled during the build with: PULSE=no ./RetroArch.SlackBuild @@ -45,9 +45,9 @@ using the following configure parameters. Retroarch optionally supports using OpenGL ES 2 and OpenGL ES 3 instead of OpenGL which will require video card and driver support. This can be done by building RetroArch with: - GLES=1 ./RetroArch.SlackBuild + GLES=yes ./RetroArch.SlackBuild or - GLES3=1 ./RetroArch.SlackBuild + GLES3=yes ./RetroArch.SlackBuild RetroArch optionally supports using Vulkan instead of OpenGL, this will require the vulkansdk from SBo and support for your video card and diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild index 50a6b51e60..3c46c57a4e 100644 --- a/games/RetroArch/RetroArch.SlackBuild +++ b/games/RetroArch/RetroArch.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=RetroArch VERSION=${VERSION:-1.7.3} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -105,14 +105,18 @@ fi # https://github.com/libretro/RetroArch/issues/3237 SED_CORE=; SED_INFO=; SED_MENU= if [ "${BUILDBOT:-0}" = 0 ]; then - SED_CORE="s|# libretro_directory =|libretro_directory = /usr/lib${LIBDIRSUFFIX}/libretro|" - SED_INFO="s|# libretro_info_path =|libretro_info_path = /usr/lib${LIBDIRSUFFIX}/libretro/info|" + libdir="/usr/lib${LIBDIRSUFFIX}/libretro" + infodir="${libdir}/info" + SED_CORE="s|# libretro_directory =|libretro_directory = $libdir|" + SED_INFO="s|# libretro_info_path =|libretro_info_path = $infodir|" SED_MENU='s|# menu_show_core_updater = true|menu_show_core_updater = false|' fi -# Set the config file default directories to be consistent with the installation. -sed -e "s|# audio_filter_dir =|audio_filter_dir = /usr/lib${LIBDIRSUFFIX}/retroarch/filters/audio|" \ - -e "s|# video_filter_dir =|video_filter_dir = /usr/lib${LIBDIRSUFFIX}/retroarch/filters/video|" \ +filter_dir="/usr/lib${LIBDIRSUFFIX}/retroarch/filters" + +# Set the default filter directories to be consistent with the installation. +sed -e "s|# audio_filter_dir =|audio_filter_dir = ${filter_dir}/audio|" \ + -e "s|# video_filter_dir =|video_filter_dir = ${filter_dir}/video|" \ -e "$SED_CORE;$SED_INFO;$SED_MENU" \ -i retroarch.cfg @@ -121,6 +125,17 @@ sed -e "s|# audio_filter_dir =|audio_filter_dir = /usr/lib${LIBDIRSUFFIX}/retroa # https://github.com/libretro/RetroArch/issues/6726 zcat $CWD/qt.patch.gz | patch -p1 +# Fix a calloc(0) which led to uninitialized data being used later on. +# https://github.com/libretro/RetroArch/commit/8cd8e7d3ae07aa772f0d8c09df7ee10290259c65 +# https://github.com/libretro/RetroArch/pull/6835 +zcat $CWD/calloc.patch.gz | patch -p1 + +# Fixed bug that let Retroarch proceed to retro_run without loading content +# https://github.com/libretro/RetroArch/commit/0e34c12d5c8ea2f861dc29df240c1dc68657d2cf +# https://github.com/libretro/RetroArch/pull/7090 +# https://github.com/libretro/RetroArch/issues/7082 +zcat $CWD/no_content.patch.gz | patch -p1 + # Set $lib to a portable array eval "set -- $lib" diff --git a/games/RetroArch/calloc.patch.gz b/games/RetroArch/calloc.patch.gz new file mode 100644 index 0000000000..cd2fd8abfb Binary files /dev/null and b/games/RetroArch/calloc.patch.gz differ diff --git a/games/RetroArch/no_content.patch.gz b/games/RetroArch/no_content.patch.gz new file mode 100644 index 0000000000..27dcc4f7bf Binary files /dev/null and b/games/RetroArch/no_content.patch.gz differ -- cgit v1.2.3