From a920225af8e805c58cbea60aa6414196cad98530 Mon Sep 17 00:00:00 2001 From: Hunter Sezen Date: Fri, 17 May 2019 22:54:36 +0700 Subject: games/RetroArch: Updated for version 1.7.7. Signed-off-by: Willy Sudiarto Raharjo --- games/RetroArch/README | 6 +- games/RetroArch/RetroArch.SlackBuild | 21 +++---- games/RetroArch/RetroArch.info | 6 +- games/RetroArch/gles.patch | 32 ++++++++++ games/RetroArch/menu.patch | 111 ----------------------------------- 5 files changed, 46 insertions(+), 130 deletions(-) create mode 100644 games/RetroArch/gles.patch delete mode 100644 games/RetroArch/menu.patch (limited to 'games/RetroArch') diff --git a/games/RetroArch/README b/games/RetroArch/README index 59c3408f14..6cbff20788 100644 --- a/games/RetroArch/README +++ b/games/RetroArch/README @@ -23,9 +23,9 @@ Optional dependencies: miniupnpc nvidia-cg-toolkit OpenAL python3 qt5 SDL2 vulkan-sdk wayland-egl wayland-protocols -Note: Wayland support requires both wayland-egl and wayland-protocols to -be installed. Instead of installing wayland-egl mesa can be rebuilt with -Wayland support, using the following configure parameters. +Note: RetroArch can optionally use wayland-protocols during the build if +it is installed. Instead of installing wayland-egl mesa can be rebuilt +with Wayland support, using the following configure parameters. --with-egl-platforms=x11,drm,wayland diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild index 0c4881c530..788f4e04c4 100644 --- a/games/RetroArch/RetroArch.SlackBuild +++ b/games/RetroArch/RetroArch.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=RetroArch -VERSION=${VERSION:-1.7.6} +VERSION=${VERSION:-1.7.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -85,7 +85,7 @@ else RELEASE=release fi -[ "${DISCORD:-0}" = 0 ] && lib="${lib} --disable-discord" +[ "${DISCORD:-no}" = no ] && lib="${lib} --disable-discord" if [ "${GLES:-0}" != 0 ]; then lib="${lib} --enable-opengles" @@ -93,19 +93,14 @@ elif [ "${GLES3:-0}" != 0 ]; then lib="${lib} --enable-opengles --enable-opengles3" fi +pkg-config --exists caca && lib="${lib} --enable-caca" pkg-config --exists flac && lib="${lib} --disable-builtinflac" pkg-config --exists libsixel && lib="${lib} --enable-sixel" [ -d /usr/include/mbedtls ] && lib="${lib} --disable-builtinmbedtls" [ -d /usr/include/miniupnpc ] && lib="${lib} --disable-builtinminiupnpc" -if [ "${PYTHON:-0}" != 0 ]; then - lib="${lib} --enable-python" - # Needed for python3 in the 14.1 SBo branch. - if ! pkg-config --exists python3 && pkg-config --exists python-3.5; then - sed -i 's/python3/python-3.5/' qb/config.libs.sh - fi -fi +[ "${PYTHON:-no}" != no ] && lib="${lib} --enable-python" [ "${MENU:-yes}" != yes ] && lib="${lib} --disable-menu" [ "${PULSE:-yes}" != yes ] && lib="${lib} --disable-pulse" @@ -134,10 +129,10 @@ sed -e "s|# audio_filter_dir =|audio_filter_dir = ${filter_dir}/audio|" \ -e "$SED_CORE;$SED_INFO;$SED_MENU" \ -i retroarch.cfg -# Fix --disable-menu (Again). -# https://github.com/libretro/RetroArch/commit/762151758d0704394699fe3462ad0505e2cf4070 -# https://github.com/libretro/RetroArch/pull/8170 -patch -p1 < $CWD/menu.patch +# Fix --enable-opengles and --enable-opengles3 +# https://github.com/libretro/RetroArch/pull/8749 +# https://github.com/libretro/RetroArch/commit/1a3f16ded122bf3928aeb9beb71b594bf24ce01a +patch -p1 < $CWD/gles.patch # Set $lib to a portable array eval "set -- $lib" diff --git a/games/RetroArch/RetroArch.info b/games/RetroArch/RetroArch.info index 9d01355eec..cce1d3b25b 100644 --- a/games/RetroArch/RetroArch.info +++ b/games/RetroArch/RetroArch.info @@ -1,8 +1,8 @@ PRGNAM="RetroArch" -VERSION="1.7.6" +VERSION="1.7.7" HOMEPAGE="https://www.libretro.com/" -DOWNLOAD="https://github.com/libretro/RetroArch/releases/download/v1.7.6/RetroArch-1.7.6.tar.xz" -MD5SUM="1c241b2d3908a794137c538457d9175a" +DOWNLOAD="https://github.com/libretro/RetroArch/releases/download/v1.7.7/RetroArch-1.7.7.tar.xz" +MD5SUM="a8516a7a15502c85c371f83c104aa1c6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/RetroArch/gles.patch b/games/RetroArch/gles.patch new file mode 100644 index 0000000000..f893439500 --- /dev/null +++ b/games/RetroArch/gles.patch @@ -0,0 +1,32 @@ +From 1a3f16ded122bf3928aeb9beb71b594bf24ce01a Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 10 May 2019 14:47:36 -0700 +Subject: [PATCH] Fix --enable-opengles and --enable-opengles3 (#8749) + +* qb: Fix OpenGLES build. + +The gl core video driver requires at least OpenGLES 3 and +OpenGL 1 is not compatible with OpenGLES 2 or 3. +--- + qb/config.libs.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/qb/config.libs.sh b/qb/config.libs.sh +index 17eb7ccf20..510386e44c 100644 +--- a/qb/config.libs.sh ++++ b/qb/config.libs.sh +@@ -351,6 +351,14 @@ fi + if [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES3" = 'no' ]; then + die : 'Notice: OpenGL and OpenGLES3 are disabled. Disabling HAVE_OPENGL_CORE.' + HAVE_OPENGL_CORE='no' ++elif [ "$HAVE_OPENGLES" != 'no' ] && [ "$HAVE_OPENGLES3" != 'yes' ]; then ++ die : 'Notice: OpenGLES2 is enabled. Disabling the OpenGL core driver.' ++ HAVE_OPENGL_CORE='no' ++fi ++ ++if [ "$HAVE_OPENGLES" != 'no' ] || [ "$HAVE_OPENGLES3" != 'no' ]; then ++ die : 'Notice: OpenGLES is enabled. Disabling the OpenGL1 driver.' ++ HAVE_OPENGL1='no' + fi + + if [ "$HAVE_ZLIB" = 'no' ]; then diff --git a/games/RetroArch/menu.patch b/games/RetroArch/menu.patch deleted file mode 100644 index 65a341539e..0000000000 --- a/games/RetroArch/menu.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 762151758d0704394699fe3462ad0505e2cf4070 Mon Sep 17 00:00:00 2001 -From: orbea -Date: Mon, 4 Feb 2019 08:20:34 -0800 -Subject: [PATCH] Fix --disable-menu (Again). - ---- - command.c | 1 + - config.def.h | 7 +++---- - configuration.c | 3 +++ - driver.c | 1 + - managers/cheat_manager.c | 1 + - managers/core_option_manager.h | 2 ++ - 6 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/command.c b/command.c -index fb617da1a2..4958167f00 100644 ---- a/command.c -+++ b/command.c -@@ -91,6 +91,7 @@ - #include "ui/ui_companion_driver.h" - #include "tasks/task_content.h" - #include "tasks/tasks_internal.h" -+#include "gfx/video_driver.h" - #include "list_special.h" - - #include "core.h" -diff --git a/config.def.h b/config.def.h -index 1515ab3fa9..ce2f85c97b 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -372,8 +372,9 @@ static unsigned menu_shader_pipeline = 1; - static unsigned menu_shader_pipeline = 2; - #endif - --static bool show_advanced_settings = false; --static unsigned rgui_color_theme = RGUI_THEME_CLASSIC_GREEN; -+static bool show_advanced_settings = false; -+static unsigned rgui_color_theme = RGUI_THEME_CLASSIC_GREEN; -+static unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT; - - #else - static bool default_block_config_read = false; -@@ -754,8 +755,6 @@ static const unsigned menu_timedate_style = 5; - - static const bool xmb_vertical_thumbnails = false; - --static unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT; -- - #ifdef IOS - static const bool ui_companion_start_on_boot = false; - #else -diff --git a/configuration.c b/configuration.c -index ac3d2d7502..0cc7860cd2 100644 ---- a/configuration.c -+++ b/configuration.c -@@ -34,6 +34,7 @@ - - #include "file_path_special.h" - #include "audio/audio_driver.h" -+#include "gfx/video_driver.h" - #include "input/input_driver.h" - #include "configuration.h" - #include "content.h" -@@ -1661,8 +1662,10 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings, - SETTING_UINT("dpi_override_value", &settings->uints.menu_dpi_override_value, true, menu_dpi_override_value, false); - SETTING_UINT("menu_thumbnails", &settings->uints.menu_thumbnails, true, menu_thumbnails_default, false); - SETTING_UINT("menu_timedate_style", &settings->uints.menu_timedate_style, true, menu_timedate_style, false); -+#ifdef HAVE_RGUI - SETTING_UINT("rgui_menu_color_theme", &settings->uints.menu_rgui_color_theme, true, rgui_color_theme, false); - SETTING_UINT("rgui_thumbnail_downscaler", &settings->uints.menu_rgui_thumbnail_downscaler, true, rgui_thumbnail_downscaler, false); -+#endif - #ifdef HAVE_LIBNX - SETTING_UINT("split_joycon_p1", &settings->uints.input_split_joycon[0], true, 0, false); - SETTING_UINT("split_joycon_p2", &settings->uints.input_split_joycon[1], true, 0, false); -diff --git a/driver.c b/driver.c -index 5881d1a63f..f788e59882 100644 ---- a/driver.c -+++ b/driver.c -@@ -32,6 +32,7 @@ - - #include "audio/audio_driver.h" - #include "camera/camera_driver.h" -+#include "gfx/video_driver.h" - #include "record/record_driver.h" - #include "location/location_driver.h" - #include "wifi/wifi_driver.h" -diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c -index a3277a4be5..cfd69f3619 100644 ---- a/managers/cheat_manager.c -+++ b/managers/cheat_manager.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/managers/core_option_manager.h b/managers/core_option_manager.h -index a7e2744d39..60dbe0fa4b 100644 ---- a/managers/core_option_manager.h -+++ b/managers/core_option_manager.h -@@ -23,6 +23,8 @@ - #include - #include - -+#include "../gfx/video_driver.h" -+ - RETRO_BEGIN_DECLS - - struct core_option -- cgit v1.2.3