diff options
Diffstat (limited to 'games')
| -rw-r--r-- | games/RetroArch/README | 3 | ||||
| -rw-r--r-- | games/RetroArch/RetroArch.SlackBuild | 14 | ||||
| -rw-r--r-- | games/RetroArch/RetroArch.info | 6 | ||||
| -rw-r--r-- | games/RetroArch/gles.patch | 32 |
4 files changed, 7 insertions, 48 deletions
diff --git a/games/RetroArch/README b/games/RetroArch/README index 794aaf0bbc..5524a5a8f6 100644 --- a/games/RetroArch/README +++ b/games/RetroArch/README @@ -30,9 +30,6 @@ 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 diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild index c2eb4c472e..f70ae13d88 100644 --- a/games/RetroArch/RetroArch.SlackBuild +++ b/games/RetroArch/RetroArch.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for RetroArch # Copyright 2016-2019 Hunter Sezen California, USA -# Copyright 2020 ilmich < ardutu at gmail dot com > +# Copyright 2020-2022 ilmich < ardutu at gmail dot com > # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,15 @@ # 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.10.0} +VERSION=${VERSION:-1.10.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -110,8 +111,6 @@ pkg-config --exists libsixel && lib="${lib} --enable-sixel" [ -d /usr/include/mbedtls ] && lib="${lib} --disable-builtinmbedtls" -[ "${PYTHON:-no}" != no ] && lib="${lib} --enable-python" - [ "${MENU:-yes}" != yes ] && lib="${lib} --disable-menu" [ "${PULSE:-yes}" != yes ] && lib="${lib} --disable-pulse" [ "${QT:-yes}" != yes ] && lib="${lib} --disable-qt" @@ -142,11 +141,6 @@ 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" diff --git a/games/RetroArch/RetroArch.info b/games/RetroArch/RetroArch.info index 59b2a8fa02..c05853d672 100644 --- a/games/RetroArch/RetroArch.info +++ b/games/RetroArch/RetroArch.info @@ -1,8 +1,8 @@ PRGNAM="RetroArch" -VERSION="1.10.0" +VERSION="1.10.3" HOMEPAGE="https://www.libretro.com/" -DOWNLOAD="https://github.com/libretro/RetroArch/archive/v1.10.0/RetroArch-1.10.0.tar.gz" -MD5SUM="12c1dc772d1ba740c0ff92e58be131ab" +DOWNLOAD="https://github.com/libretro/RetroArch/archive/v1.10.3/RetroArch-1.10.3.tar.gz" +MD5SUM="176eb74b9cdf7e6e8ac4cb481c28dc79" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 |