Skip to content

Commit

Permalink
games-emulation/retroarch: Update 1.6.9 contains improvements:
Browse files Browse the repository at this point in the history
Contains FPU patches, credits to Walter Hüttenmeyer
Updates USE flag conditions for arm, credits to Walter Hüttenmeyer
Updates build.patch, fixes #85
Fetches tarballs again, no git dependency on non live ebuilds
Drops unused USE flags.
  • Loading branch information
stefan-gr committed Nov 28, 2017
1 parent cd08e12 commit 3b542fd
Show file tree
Hide file tree
Showing 23 changed files with 116 additions and 605 deletions.
2 changes: 1 addition & 1 deletion eclass/libretro.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if [[ ! ${PV} = 9999 ]] && [[ ! ${PN} = retroarch ]] && [[ ! ${PN} = ppsspp-libr
fi

# Workaround for ebuilds needing submodules
if [[ ${PN} = retroarch ]] || [[ ${PN} = ppsspp-libretro ]] || [[ ${PN} = psp1-libretro ]] || [[ ${PN} = citra-libretro ]] && [[ ! ${PV} = 9999 ]]; then
if [[ ${PN} = ppsspp-libretro ]] || [[ ${PN} = psp1-libretro ]] || [[ ${PN} = citra-libretro ]] && [[ ! ${PV} = 9999 ]]; then
inherit git-r3

SRC_URI=""
Expand Down
1 change: 1 addition & 0 deletions games-emulation/retroarch/Manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DIST retroarch-1.6.9.tar.gz 19000981 SHA256 66dde69fde9d286e3d8f6c4a5e4b947e9030044415e75b419883b454e05d78b4 SHA512 974e08d22ed9742fa25f9bd850e387958d983bf82eca5cc27f8a7df63cc51f3b115c395236ee59e359a2e8e7265ea572cab77ed24720984cbf34caebfcf8ac74 WHIRLPOOL ebf69ca2ab84b14546abb9ca791226db9380d2e0cd7c86646ca1384feec7fcdc491a4c506503b251d457087eb90cfd436bfeeaf4df19f1b3f8839a6c53bed810
21 changes: 0 additions & 21 deletions games-emulation/retroarch/files/retroarch-1.4.1-build.patch

This file was deleted.

13 changes: 0 additions & 13 deletions games-emulation/retroarch/files/retroarch-1.4.1-python.patch

This file was deleted.

21 changes: 0 additions & 21 deletions games-emulation/retroarch/files/retroarch-1.5.0-build.patch

This file was deleted.

13 changes: 0 additions & 13 deletions games-emulation/retroarch/files/retroarch-1.5.0-python.patch

This file was deleted.

21 changes: 0 additions & 21 deletions games-emulation/retroarch/files/retroarch-1.6.4-build.patch

This file was deleted.

139 changes: 0 additions & 139 deletions games-emulation/retroarch/files/retroarch-1.6.4-menu_setting.patch

This file was deleted.

13 changes: 0 additions & 13 deletions games-emulation/retroarch/files/retroarch-1.6.4-python.patch

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions games-emulation/retroarch/files/retroarch-1.6.7-python.patch

This file was deleted.

35 changes: 35 additions & 0 deletions games-emulation/retroarch/files/retroarch-1.6.9-custom_fpu.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
--- retroarch-9999/qb/config.libs.sh 2017-10-08 14:42:40.465717207 +0200
+++ retroarch-9999-patched/qb/config.libs.sh 2017-10-08 14:46:09.285485229 +0200
@@ -62,12 +62,6 @@
fi
fi

-if [ "$HAVE_NEON" = "yes" ]; then
- CFLAGS="$CFLAGS -mfpu=neon -marm"
- CXXFLAGS="$CXXFLAGS -mfpu=neon -marm"
- ASFLAGS="$ASFLAGS -mfpu=neon"
-fi
-
if [ "$HAVE_7ZIP" = "yes" ]; then
add_include_dirs ./deps/7zip/
fi
@@ -90,9 +84,16 @@
fi

if [ "$HAVE_NEON" = "yes" ]; then
- CFLAGS="$CFLAGS -mfpu=neon -marm"
- CXXFLAGS="$CXXFLAGS -mfpu=neon -marm"
- ASFLAGS="$ASFLAGS -mfpu=neon"
+ cust_fpu="$(echo ${CFLAGS} | grep -o "mfpu\=.[^ ]*" | sed 's/mfpu=//')"
+ if [ "x$cust_fpu" != "x" ]; then
+ CFLAGS="$CFLAGS -mfpu=$cust_fpu -marm"
+ CXXFLAGS="$CXXFLAGS -mfpu=$cust_fpu -marm"
+ ASFLAGS="$ASFLAGS -mfpu=$cust_fpu"
+ else
+ CFLAGS="$CFLAGS -mfpu=neon -marm"
+ CXXFLAGS="$CXXFLAGS -mfpu=neon -marm"
+ ASFLAGS="$ASFLAGS -mfpu=neon"
+ fi
fi

if [ "$HAVE_FLOATHARD" = "yes" ]; then
22 changes: 11 additions & 11 deletions games-emulation/retroarch/files/retroarch-9999-build.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
diff -U 3 -H -d -r -N a/qb/qb.params.sh b/qb/qb.params.sh
--- a/qb/qb.params.sh 2015-11-19 13:56:31.000000000 +0100
+++ b/qb/qb.params.sh 2015-11-19 13:59:57.405766759 +0100
@@ -48,7 +48,7 @@
opt_exists() # $opt is returned if exists in OPTS
{ opt=$(echo "$1" | tr '[a-z]' '[A-Z]')
for OPT in $OPTS; do [ "$opt" = "$OPT" ] && return; done
- echo "Unknown option $2"; exit 1
+ echo "Unknown option $2"
diff -U 3 -dHrN -- qb.orig/qb.params.sh qb/qb.params.sh
--- qb.orig/qb.params.sh 2017-11-28 19:31:09.000000000 +0100
+++ qb/qb.params.sh 2017-11-28 19:38:44.612303119 +0100
@@ -69,7 +69,7 @@
err="$2"
eval "set -- $OPTS"
for OPT do [ "$opt" = "$OPT" ] && return; done
- die 1 "Unknown option $err"
+ echo "Unknown option $err"
}

parse_input() # Parse stuff :V
@@ -76,7 +76,7 @@
@@ -102,7 +102,7 @@
eval "$opt=\"$val\""
;;
-h|--help) print_help; exit 0;;
- *) echo "Unknown option $1"; exit 1;;
- *) die 1 "Unknown option $1";;
+ *) echo "Unknown option $1";;
esac
shift
Expand Down
Loading

0 comments on commit 3b542fd

Please sign in to comment.