From b06ee4aee8c914c03e51ad792d06ad4156f78d86 Mon Sep 17 00:00:00 2001
From: Hunter Sezen <orbea@fredslev.dk>
Date: Sat, 1 Sep 2018 23:00:47 +0100
Subject: games/RetroArch: Updated for version 1.7.4.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 games/RetroArch/RetroArch.SlackBuild | 42 ++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'games/RetroArch/RetroArch.SlackBuild')

diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild
index 3c46c57a4e..34df41bebf 100644
--- a/games/RetroArch/RetroArch.SlackBuild
+++ b/games/RetroArch/RetroArch.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=RetroArch
-VERSION=${VERSION:-1.7.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.7.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -81,6 +81,8 @@ fi
 
 lib=
 
+[ "${DISCORD:-0}" = 0 ] && lib="${lib} --disable-discord"
+
 if [ "${GLES:-0}" != 0 ]; then
   lib="${lib} --enable-opengles"
 elif [ "${GLES3:-0}" != 0 ]; then
@@ -88,6 +90,7 @@ elif [ "${GLES3:-0}" != 0 ]; then
 fi
 
 pkg-config --exists flac && lib="${lib} --disable-builtinflac"
+pkg-config --exists libsixel && lib="${lib} --enable-sixel"
 
 [ -d /usr/include/miniupnpc ] && lib="${lib} --disable-builtinminiupnpc"
 
@@ -114,27 +117,30 @@ fi
 
 filter_dir="/usr/lib${LIBDIRSUFFIX}/retroarch/filters"
 
-# Set the default filter directories to be consistent with the installation.
+# Set the default 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
 
-# Qt: only check for pending events of the main thread
-# https://github.com/libretro/RetroArch/commit/c2ad8d47d382c7460bb54c8a7116573d95648f95
-# 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
+# Update libretro-common
+# https://github.com/libretro/RetroArch/commit/7c22f265b8928aca6e5706ab3a8bab2de0e24b8c
+# https://github.com/libretro/libretro-common/pull/84
+# https://github.com/libretro/RetroArch/issues/6889
+patch -p1 < $CWD/libretro.patch
+
+# Revert: sort config file variables
+# https://github.com/libretro/RetroArch/commit/62e89974afbb6628344fb084c50712bfab4419de
+# https://github.com/libretro/RetroArch/pull/6998
+# https://github.com/libretro/RetroArch/issues/7160
+patch -p1 < $CWD/etc.patch
+
+# revert #7156
+# https://github.com/libretro/RetroArch/commit/64459bda3a8add5c5e679b3fa4d1fd4cd7796233
+# https://github.com/libretro/RetroArch/commit/dd9db4140304c480745f7f344ff67041bdd2c9ad
+# https://github.com/libretro/RetroArch/pull/7162
+# https://github.com/libretro/RetroArch/pull/7163
+patch -p1 < $CWD/savestates.patch
 
 # Set $lib to a portable array
 eval "set -- $lib"
-- 
cgit v1.2.3-80-g2a13