4 files changed, 31 insertions, 72 deletions
diff --git a/games/RetroArch/README b/games/RetroArch/README
index 8107802733..5524a5a8f6 100644
--- a/games/RetroArch/README
+++ b/games/RetroArch/README
@@ -19,14 +19,7 @@ RetroArch will require at least one of the libretro cores to play any
 games.
 
 Optional dependencies:
-  ffmpeg jack libsixel libxkbcommon mbedtls miniupnpc nvidia-cg-toolkit
-  OpenAL python3 qt5 SDL2 vulkan-sdk wayland-egl wayland-protocols
-
-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
+  jack libsixel mbedtls nvidia-cg-toolkit
 
 To build debugging symbols for RetroArch use:
   DEBUG=yes ./RetroArch.SlackBuild
@@ -37,13 +30,10 @@ If building debugging symbols asan can also be built:
 Discord integration can be enabled with:
   DISCORD=yes
 
-Python3 support for shaders will need to be enabled with:
-  PYTHON=yes ./RetroArch.SlackBuild
-
 If pulseaudio is installed it can be disabled during the build with:
   PULSE=no ./RetroArch.SlackBuild
 
-The Qt5 frontend can be disabled with:
+The Qt frontend can be disabled with:
   QT=no ./RetroArch.SlackBuild
 
 The materialui menu driver can be disabled with:
@@ -71,12 +61,7 @@ done by building RetroArch with:
 or
   GLES3=yes ./RetroArch.SlackBuild
 
-RetroArch optionally supports using Vulkan instead of OpenGL, this will
-require the vulkan-sdk from SBo and support for your video card and
-driver.
-
 For additional notes, please see README.SLACKWARE.
 
-For more information on RetroArch or libretro please visit this site.
-
+For more information on RetroArch or libretro please visit:
   https://docs.libretro.com/
diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild
index b1514889e4..1960491d4a 100644
--- a/games/RetroArch/RetroArch.SlackBuild
+++ b/games/RetroArch/RetroArch.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for RetroArch
 
 # Copyright 2016-2019 Hunter Sezen California, USA
+# Copyright 2020-2024 ilmich < ardutu at gmail dot com >
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +22,18 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# 20220621 ilmich: Updated to 1.10.3, removed python flags (no more upstream support), removed merged opengles patch
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0,
+# by updating to v1.10.0 (old version won't build).
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=RetroArch
-VERSION=${VERSION:-1.7.7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.19.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,14 +72,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 lib=
 
@@ -98,9 +110,6 @@ 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"
-
-[ "${PYTHON:-no}" != no ] && lib="${lib} --enable-python"
 
 [ "${MENU:-yes}" != yes ] && lib="${lib} --disable-menu"
 [ "${PULSE:-yes}" != yes ] && lib="${lib} --disable-pulse"
@@ -132,14 +141,12 @@ sed -e "s|# audio_filter_dir =|audio_filter_dir = ${filter_dir}/audio|" \
 # Fix qt5 support with 14.2.
 sed -i 's/-fPIC/-fPIC -std=c++11/' qb/qb.moc.sh
 
-# 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"
 
+export CC=clang
+export CXX=clang++
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -148,7 +155,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-assets_dir=/usr/share/games \
-  --disable-update_assets \
   --build=$ARCH-slackware-linux \
   "$@"
 
@@ -191,4 +197,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/RetroArch/RetroArch.info b/games/RetroArch/RetroArch.info
index cce1d3b25b..776fe3c05d 100644
--- a/games/RetroArch/RetroArch.info
+++ b/games/RetroArch/RetroArch.info
@@ -1,10 +1,10 @@
 PRGNAM="RetroArch"
-VERSION="1.7.7"
+VERSION="1.19.1"
 HOMEPAGE="https://www.libretro.com/"
-DOWNLOAD="https://github.com/libretro/RetroArch/releases/download/v1.7.7/RetroArch-1.7.7.tar.xz"
-MD5SUM="a8516a7a15502c85c371f83c104aa1c6"
+DOWNLOAD="https://github.com/libretro/RetroArch/archive/v1.19.1/RetroArch-1.19.1.tar.gz"
+MD5SUM="d0f15c76b7905460686dce8ed51d58fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="ilmich"
+EMAIL="ardutu@gmail.com"
diff --git a/games/RetroArch/gles.patch b/games/RetroArch/gles.patch
deleted file mode 100644
index f893439500..0000000000
--- a/games/RetroArch/gles.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1a3f16ded122bf3928aeb9beb71b594bf24ce01a Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-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