From e47ea833723a123189c0b4fa0dd20e0060b2cddd Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 5 May 2015 14:13:32 -0400 Subject: [PATCH 1/5] logging fix for android --- libretro-buildbot-recipe.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 20183c63..bb5b8b16 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -232,7 +232,7 @@ build_libretro_generic_makefile() { cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} fi else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" @@ -281,7 +281,7 @@ build_libretro_generic_theos() { MESSAGE="$1 build successful [$jobid]" cp -v objs/obj/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -327,7 +327,7 @@ build_libretro_generic_jni() { buildbot_log "$MESSAGE" cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1-$a build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo BUILDBOT JOB: $MESSAGE @@ -374,7 +374,7 @@ build_libretro_bsnes_jni() { MESSAGE="$1 build successful [$jobid]" cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -422,7 +422,7 @@ build_libretro_generic_gl_makefile() { MESSAGE="$1 build successful [$jobid]" cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -483,7 +483,7 @@ build_libretro_bsnes() { cp -fv "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} fi else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -821,18 +821,18 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then cd android/phoenix rm bin/*.apk - $NDK clean - $NDK -j${JOBS} - ant clean + $NDK clean &> /tmp/buildbot.log + $NDK -j${JOBS} &>> /tmp/buildbot.log + ant clean &>> /tmp/buildbot.log android update project --path . --target android-21 android update project --path libs/googleplay --target android-21 android update project --path libs/appcompat --target android-21 - ant debug + ant debug &>> /tmp/buildbot.log if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE @@ -1180,7 +1180,7 @@ EOF cp -Rfv gfx/video_filters/*.dll windows/filters/video cp -Rfv gfx/video_filters/*.filt windows/filters/video else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE @@ -1294,7 +1294,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE @@ -1425,7 +1425,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE @@ -1575,7 +1575,7 @@ then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/buildbot.log | tail -n 1000` + ERROR=`cat /tmp/buildbot.log | tail -n 5000` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE From 3ec68d0eb3159f02cb2746d2e31fb62c6f623e7d Mon Sep 17 00:00:00 2001 From: Oggom Date: Tue, 12 May 2015 04:19:07 +0200 Subject: [PATCH 2/5] Info file updates --- dist/info/cap32_libretro.info | 5 +++-- dist/info/catsfc_libretro.info | 2 +- dist/info/dinothawr_libretro.info | 1 + dist/info/example | 28 ++++++++++++++-------------- dist/info/fb_alpha_libretro.info | 2 +- dist/info/fceumm_libretro.info | 2 +- dist/info/ffmpeg_libretro.info | 4 ++-- dist/info/mednafen_gba_libretro.info | 2 +- dist/info/mednafen_ngp_libretro.info | 2 +- dist/info/mednafen_psx_libretro.info | 2 +- dist/info/mupen64plus_libretro.info | 2 +- dist/info/pascal_pong_libretro.info | 1 + dist/info/pocketsnes_libretro.info | 4 ++-- 13 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dist/info/cap32_libretro.info b/dist/info/cap32_libretro.info index c34e4e90..7c347965 100644 --- a/dist/info/cap32_libretro.info +++ b/dist/info/cap32_libretro.info @@ -1,6 +1,7 @@ -display_name = "Amstrad CPC (CaPriCe32)" +display_name = "Amstrad CPC (Caprice32)" +authors = "Ulrich Doewich|dantoine" supported_extensions = "dsk|sna" -corename = "CaPriCe32" +corename = "Caprice32" manufacturer = "Amstrad" categories = "Emulator" systemname = "CPC" diff --git a/dist/info/catsfc_libretro.info b/dist/info/catsfc_libretro.info index e5664f26..c1c9e6bd 100644 --- a/dist/info/catsfc_libretro.info +++ b/dist/info/catsfc_libretro.info @@ -1,5 +1,5 @@ display_name = "SNES / Super Famicom (CATSFC)" -authors = "SNES9x Team|dking|BassAceGold|ShadauxCat|Nebuleon" +authors = "Snes9X Team|dking|BassAceGold|ShadauxCat|Nebuleon" supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc" corename = "CATSFC" manufacturer = "Nintendo" diff --git a/dist/info/dinothawr_libretro.info b/dist/info/dinothawr_libretro.info index f8b2eca1..2037f9eb 100644 --- a/dist/info/dinothawr_libretro.info +++ b/dist/info/dinothawr_libretro.info @@ -3,6 +3,7 @@ authors = "Themaister|Agnes Heyer" supported_extensions = "game" corename = "Dinothawr" categories = "Game" +systemname = "libretro" license = "Non-commercial" permissions = "" display_version = "v1.0" diff --git a/dist/info/example b/dist/info/example index e9abeb33..88a853b6 100644 --- a/dist/info/example +++ b/dist/info/example @@ -1,42 +1,42 @@ ## All data is optional, but helps improve user experience. -# Name displayed when the user is selecting the core. +# Name displayed when the user is selecting the core: # display_name = "NES / Famicom" -# The authors. +# Name of the authors who wrote the core: # authors = "Martin Freij|R. Belmont|R. Danbrook" -# List of supported extensions. +# List of extensions the core supports: # supported_extensions = "nes|fds" -# Name of the core. +# Name of the core: # corename = "Nestopia" -# The developer. +# Name of the manufacturer who produced the emulated system: # manufacturer = "Nintendo" # -# Categories that the core belongs to (optional). +# Categories that the core belongs to (optional): # categories = "Emulator" -# Name of the system that the core targets (optional). +# Name of the system that the core targets (optional): # systemname = "Nintendo Entertainment System" -# Name of the database that the core supports (optional). +# Name of the database that the core supports (optional): # database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System" -# License of the core's sourcecode +# License of the cores source code: # license = "GPLv3" -# Privacy-specific permissions needed for using the core +# Privacy-specific permissions needed for using the core: # permissions = "" -# Version of the core. +# Version of the core: # display_version = "v0.2.97.30" -# Whether or not the core requires an external file to work. +# Whether or not the core requires an external file to work: # supports_no_game = "false" -# The number of mandatory/optional firmware files the core needs +# The number of mandatory/optional firmware files the core needs: # firmware_count = 7 # Firmware entries should be named from 0 @@ -47,5 +47,5 @@ # Is firmware optional or not, if not defined RetroArch will assume it is required # firmware0_opt = "true/false" -# Notes +# Additional notes: #notes = "note1|note2|note3 with spaces|note 4 with spaces|note 5 (test)|note6" diff --git a/dist/info/fb_alpha_libretro.info b/dist/info/fb_alpha_libretro.info index fd44f3b1..bd91da36 100644 --- a/dist/info/fb_alpha_libretro.info +++ b/dist/info/fb_alpha_libretro.info @@ -7,6 +7,6 @@ categories = "Emulator" systemname = "Arcade (various)" license = "Non-commercial" permissions = "" -display_version = "v0.2.97.30" +display_version = "v0.2.97.36" supports_no_game = "false" notes = "- BIOS files go into the ROM directory|" diff --git a/dist/info/fceumm_libretro.info b/dist/info/fceumm_libretro.info index b70de82c..6ebe71e3 100644 --- a/dist/info/fceumm_libretro.info +++ b/dist/info/fceumm_libretro.info @@ -1,5 +1,5 @@ display_name = "NES / Famicom (FCEUmm)" -authors = "CaH4e3|FCEU Team" +authors = "FCEU Team|CaH4e3" supported_extensions = "fds|nes|unif" corename = "FCEUmm" manufacturer = "Nintendo" diff --git a/dist/info/ffmpeg_libretro.info b/dist/info/ffmpeg_libretro.info index 03b38f8a..982fa9db 100644 --- a/dist/info/ffmpeg_libretro.info +++ b/dist/info/ffmpeg_libretro.info @@ -2,9 +2,9 @@ display_name = "FFmpeg" authors = "Fabrice Bellard|FFmpeg team" supported_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a" corename = "FFmpeg" -systemname = "FFmpeg" categories = "Media player" +systemname = "FFmpeg" license = "LGPLv2, GPLv2" permissions = "" -display:version = "Git" +display_version = "Git" supports_no_game = "false" diff --git a/dist/info/mednafen_gba_libretro.info b/dist/info/mednafen_gba_libretro.info index d0810d4c..fe44ce63 100644 --- a/dist/info/mednafen_gba_libretro.info +++ b/dist/info/mednafen_gba_libretro.info @@ -1,5 +1,5 @@ display_name = "Game Boy Advance (Mednafen GBA)" -authors = "Forgotten|VisualBoyAdvance team|Ryphecha" +authors = "Forgotten|Ryphecha" supported_extensions = "gba|agb|bin" corename = "Mednafen/Beetle GBA" manufacturer = "Nintendo" diff --git a/dist/info/mednafen_ngp_libretro.info b/dist/info/mednafen_ngp_libretro.info index 9f271bfc..896de791 100644 --- a/dist/info/mednafen_ngp_libretro.info +++ b/dist/info/mednafen_ngp_libretro.info @@ -1,4 +1,4 @@ -display_name = "Neo Geo Pocket/Color (Mednafen Neopop)" +display_name = "Neo Geo Pocket/Color (Mednafen NeoPop)" authors = "neopop_uk|Ryphecha" supported_extensions = "ngp|ngc" corename = "Mednafen/Beetle NeoPop" diff --git a/dist/info/mednafen_psx_libretro.info b/dist/info/mednafen_psx_libretro.info index 09a7a1aa..17896cbe 100644 --- a/dist/info/mednafen_psx_libretro.info +++ b/dist/info/mednafen_psx_libretro.info @@ -8,7 +8,7 @@ systemname = "PlayStation" database = "Sony - PlayStation" license = "GPLv2" permissions = "" -display_version = "v0.9.36.3" +display_version = "v0.9.38.3" supports_no_game = "false" firmware_count = 3 firmware0_desc = "scph5500.bin (PS1 JP BIOS)" diff --git a/dist/info/mupen64plus_libretro.info b/dist/info/mupen64plus_libretro.info index fda5d30b..e4c5a32f 100644 --- a/dist/info/mupen64plus_libretro.info +++ b/dist/info/mupen64plus_libretro.info @@ -1,5 +1,5 @@ display_name = "Nintendo 64 (Mupen64Plus)" -authors = "Hacktarux|Mupen64Plus Team" +authors = "Hacktarux|Mupen64Plus Team|Squarepusher" supported_extensions = "n64|v64|z64|bin|u1" corename = "Mupen64Plus" manufacturer = "Nintendo" diff --git a/dist/info/pascal_pong_libretro.info b/dist/info/pascal_pong_libretro.info index cd8484e2..f9ab7dec 100644 --- a/dist/info/pascal_pong_libretro.info +++ b/dist/info/pascal_pong_libretro.info @@ -3,6 +3,7 @@ authors = "Heuripedes" supported_extensions = "game" corename = "PascalPong" categories = "Game" +systemname = "Pong game clone" license = "Non-commercial" permissions = "" display_version = "v1.0" diff --git a/dist/info/pocketsnes_libretro.info b/dist/info/pocketsnes_libretro.info index 987dab46..2aa72c1a 100644 --- a/dist/info/pocketsnes_libretro.info +++ b/dist/info/pocketsnes_libretro.info @@ -1,5 +1,5 @@ display_name = "SNES / Super Famicom (PocketSNES)" -authors = "SNES9x Team|PocketSNES Team|Toadking" +authors = "Snes9X Team|PocketSNES Team|Toadking" supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc" corename = "PocketSNES" manufacturer = "Nintendo" @@ -8,5 +8,5 @@ systemname = "Super Nintendo Entertainment System" database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo" license = "Non-commercial" permissions = "" -display_version = "v1" +display_version = "7.2.0" supports_no_game = "false" From 4e45e8e92ccebdd10798463e816b490c873e7496 Mon Sep 17 00:00:00 2001 From: Oggom Date: Tue, 12 May 2015 17:39:19 +0200 Subject: [PATCH 3/5] Update --- dist/info/dinothawr_libretro.info | 1 - dist/info/pascal_pong_libretro.info | 1 - 2 files changed, 2 deletions(-) diff --git a/dist/info/dinothawr_libretro.info b/dist/info/dinothawr_libretro.info index 2037f9eb..f8b2eca1 100644 --- a/dist/info/dinothawr_libretro.info +++ b/dist/info/dinothawr_libretro.info @@ -3,7 +3,6 @@ authors = "Themaister|Agnes Heyer" supported_extensions = "game" corename = "Dinothawr" categories = "Game" -systemname = "libretro" license = "Non-commercial" permissions = "" display_version = "v1.0" diff --git a/dist/info/pascal_pong_libretro.info b/dist/info/pascal_pong_libretro.info index f9ab7dec..cd8484e2 100644 --- a/dist/info/pascal_pong_libretro.info +++ b/dist/info/pascal_pong_libretro.info @@ -3,7 +3,6 @@ authors = "Heuripedes" supported_extensions = "game" corename = "PascalPong" categories = "Game" -systemname = "Pong game clone" license = "Non-commercial" permissions = "" display_version = "v1.0" From a460ba4cee4fad23516c95c3cfaaad262d23cd42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s?= Date: Thu, 14 May 2015 01:09:55 -0500 Subject: [PATCH 4/5] Add the new fba core (WIN x64) --- recipes/win_x86/cores-mingw-w32-dw2 | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/win_x86/cores-mingw-w32-dw2 b/recipes/win_x86/cores-mingw-w32-dw2 index 98ea4c3e..0b080076 100644 --- a/recipes/win_x86/cores-mingw-w32-dw2 +++ b/recipes/win_x86/cores-mingw-w32-dw2 @@ -13,6 +13,7 @@ bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.g bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC Makefile . dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_ALT Makefile . +fba_libretro libretro-fba_new https://github.com/libretro/libretro-fba.git PROJECT YES GENERIC makefile.libretro . fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2 From 04fd752cf9097389048c9adbd426c9f17ab141db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s?= Date: Thu, 14 May 2015 01:10:14 -0500 Subject: [PATCH 5/5] Add the new fba core (WIN x86) --- recipes/win_x86/cores-mingw-w32-dw2 | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/win_x86/cores-mingw-w32-dw2 b/recipes/win_x86/cores-mingw-w32-dw2 index 0b080076..da7810d4 100644 --- a/recipes/win_x86/cores-mingw-w32-dw2 +++ b/recipes/win_x86/cores-mingw-w32-dw2 @@ -14,6 +14,7 @@ bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.g catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC Makefile . dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_ALT Makefile . fba_libretro libretro-fba_new https://github.com/libretro/libretro-fba.git PROJECT YES GENERIC makefile.libretro . +fba_libretro libretro-fba_new https://github.com/libretro/libretro-fba.git PROJECT YES GENERIC makefile.libretro . fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2