Retroarch: bump to version 1.7.4 (#2985)

This commit is contained in:
kwyxz
2018-09-03 09:06:52 -07:00
committed by fbrosson
parent 3b94cf096f
commit 2ac16e9556
2 changed files with 54 additions and 5 deletions

View File

@@ -0,0 +1,48 @@
From a8b885b119c3824f4ca71e1b5cfa8869436705db Mon Sep 17 00:00:00 2001
From: Benjamin FRANCOIS <kwyxz@kwyxz.org>
Date: Sat, 1 Sep 2018 07:29:49 +0000
Subject: Added simple define to allow build on Haiku
diff --git a/deps/mbedtls/entropy_poll.c b/deps/mbedtls/entropy_poll.c
index a116e60..4a913aa 100644
--- a/deps/mbedtls/entropy_poll.c
+++ b/deps/mbedtls/entropy_poll.c
@@ -44,7 +44,7 @@
#if !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
#if !defined(unix) && !defined(__unix__) && !defined(__unix) && \
- !defined(__APPLE__) && !defined(_WIN32)
+ !defined(__APPLE__) && !defined(_WIN32) & !defined(__HAIKU__)
#error "Platform entropy sources only work on Unix and Windows, see MBEDTLS_NO_PLATFORM_ENTROPY in config.h"
#endif
diff --git a/deps/mbedtls/net_sockets.c b/deps/mbedtls/net_sockets.c
index 7877e94..5fdce10 100644
--- a/deps/mbedtls/net_sockets.c
+++ b/deps/mbedtls/net_sockets.c
@@ -32,7 +32,7 @@
#if defined(MBEDTLS_NET_C)
#if !defined(unix) && !defined(__unix__) && !defined(__unix) && \
- !defined(__APPLE__) && !defined(_WIN32)
+ !defined(__APPLE__) && !defined(_WIN32) & !defined(__HAIKU__)
#error "This module only works on Unix and Windows, see MBEDTLS_NET_C in config.h"
#endif
diff --git a/deps/mbedtls/timing.c b/deps/mbedtls/timing.c
index a7c7ff0..f620d09 100644
--- a/deps/mbedtls/timing.c
+++ b/deps/mbedtls/timing.c
@@ -39,7 +39,7 @@
#if !defined(MBEDTLS_TIMING_ALT)
#if !defined(unix) && !defined(__unix__) && !defined(__unix) && \
- !defined(__APPLE__) && !defined(_WIN32)
+ !defined(__APPLE__) && !defined(_WIN32) && !defined(__HAIKU__)
#error "This module only works on Unix and Windows, see MBEDTLS_TIMING_C in config.h"
#endif
--
2.16.4

View File

@@ -6,11 +6,12 @@ shaders, netplay, rewinding, next-frame response times, and more!"
HOMEPAGE="https://libretro.com/"
COPYRIGHT="2010-2018 The RetroArch Team"
LICENSE="GNU GPL v3"
REVISION="3"
REVISION="1"
SOURCE_URI="https://github.com/libretro/RetroArch/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="a60c2244609bb87cdb56dd8e1020c3be757569b5246141328804ebc5574327ea"
CHECKSUM_SHA256="1c095076e2a9d2ec4e501176b3963ea2a831c1e5f025bb25386491272f14de40"
SOURCE_FILENAME="retroarch-$portVersion.tar.gz"
SOURCE_DIR="RetroArch-$portVersion"
PATCHES="retroarch-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -32,7 +33,7 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
retroarch_assets
lib:libavcodec$secondaryArchSuffix >= 58
lib:libavcodec$secondaryArchSuffix
lib:libavdevice$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavresample$secondaryArchSuffix
@@ -46,7 +47,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libavcodec$secondaryArchSuffix >= 58
devel:libavcodec$secondaryArchSuffix
devel:libavdevice$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
devel:libavresample$secondaryArchSuffix
@@ -86,7 +87,7 @@ BUILD()
./configure --prefix="$prefix" --global-config-dir="$sysconfDir" \
--bindir="$appsDir" --datarootdir="$dataRootDir" \
--docdir="$docDir" --mandir="$manDir" \
--with-assets_dir="$dataDir"
--with-assets_dir="$dataDir" --disable-discord
make $jobArgs
}