diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2020-05-09 20:09:10 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:43:44 -0500 |
| commit | 1947fd014be0f46668937d4b296bea4fbfdeb08f (patch) | |
| tree | 30a789aa16c5d4a317a696aebdfd27c817452e4e /games/mupen64plus | |
| parent | 46ad2f0f4b35fabe1ed655eff4865c4021571386 (diff) | |
games/mupen64plus: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/mupen64plus')
| -rw-r--r-- | games/mupen64plus/fix_multiple_definition_errors.patch | 11 | ||||
| -rw-r--r-- | games/mupen64plus/mupen64plus.SlackBuild | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/games/mupen64plus/fix_multiple_definition_errors.patch b/games/mupen64plus/fix_multiple_definition_errors.patch new file mode 100644 index 0000000000000..5fa3372ab11d4 --- /dev/null +++ b/games/mupen64plus/fix_multiple_definition_errors.patch @@ -0,0 +1,11 @@ +diff -Naur mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h +--- mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h 2015-04-27 00:42:49.000000000 +0200 ++++ mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h 2020-05-08 19:04:37.956818550 +0200 +@@ -27,7 +27,6 @@ + + struct work_struct; + +-struct work_struct *work; + typedef void (*work_func_t)(struct work_struct *work); + struct work_struct { + work_func_t func; diff --git a/games/mupen64plus/mupen64plus.SlackBuild b/games/mupen64plus/mupen64plus.SlackBuild index 58e16242cd284..645a362fb8a7d 100644 --- a/games/mupen64plus/mupen64plus.SlackBuild +++ b/games/mupen64plus/mupen64plus.SlackBuild @@ -51,6 +51,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# https://github.com/mupen64plus/mupen64plus-core/issues/712#issuecomment-588871449 +patch -p1 < $CWD/fix_multiple_definition_errors.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./m64p_build.sh V=1 |