From 9b079acd72594f8e90cd668ee4e1c71d58eb96a1 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Mon, 3 Oct 2016 16:47:37 -0400 Subject: [PATCH 1/7] Add a "libretro-dats" folder This is to house the DATs provided by [libretro-dats](https://github.com/robloach/libretro-dats). --- libretro-build-database.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libretro-build-database.sh b/libretro-build-database.sh index b5c78aaa..91669c0f 100755 --- a/libretro-build-database.sh +++ b/libretro-build-database.sh @@ -165,6 +165,11 @@ build_libretro_database() { COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/tgdb/${1}.dat"' fi + #Check if meta libretro-dats folder is there + if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat" ]; then + COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat"' + fi + #Check if meta no-intro is there if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/no-intro/${1}.dat" ]; then COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/no-intro/${1}.dat"' From 06af7a6811e58fbdc50f392b8569f81308227b7e Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Thu, 6 Oct 2016 05:57:20 +0200 Subject: [PATCH 2/7] Update cores-ios9-generic --- recipes/apple/cores-ios9-generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/apple/cores-ios9-generic b/recipes/apple/cores-ios9-generic index 0cc0795a..2df82580 100644 --- a/recipes/apple/cores-ios9-generic +++ b/recipes/apple/cores-ios9-generic @@ -21,7 +21,7 @@ fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha20 fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . ffmpeg libretro-ffmpeg https://github.com/libretro/FFmpeg.git PROJECT YES GENERIC_GL Makefile libretro fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . -gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile +gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile . genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES GENERIC Makefile . From b0e0b2bc6b43e6410de227020bf68abd1cc42504 Mon Sep 17 00:00:00 2001 From: orbea Date: Thu, 6 Oct 2016 21:25:18 -0700 Subject: [PATCH 3/7] Rename Button Test info file to match core name --- ...tton_test_libretro.info => testinput_buttontest_libretro.info} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dist/info/{button_test_libretro.info => testinput_buttontest_libretro.info} (100%) diff --git a/dist/info/button_test_libretro.info b/dist/info/testinput_buttontest_libretro.info similarity index 100% rename from dist/info/button_test_libretro.info rename to dist/info/testinput_buttontest_libretro.info From 648140b89169ac4be78a7039a9aea630ac68cc9c Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sat, 8 Oct 2016 00:14:17 +0100 Subject: [PATCH 4/7] (3DS) change core info path. --- libretro-buildbot-recipe.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 673bdc24..bb2719d3 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1625,15 +1625,17 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then cp retroarch.cfg retroarch.default.cfg mkdir -p $WORK/$RADIR/pkg/3ds/retroarch - mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/info + mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cores mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/remaps mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cheats mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters/audio mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters/video + mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cores/info + cp -v $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/3ds/retroarch/filters/video/ cp -v $WORK/$RADIR/audio/audio_filters/*.dsp $WORK/$RADIR/pkg/3ds/retroarch/filters/audio/ - cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/3ds/retroarch/info/ + cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/3ds/retroarch/cores/info/ fi fi From fa81ea9424b3d1f4a9bafebc56f9362dc1b8e38e Mon Sep 17 00:00:00 2001 From: JuanVCS Date: Fri, 7 Oct 2016 21:28:37 -0300 Subject: [PATCH 5/7] Fix typo libretro-fceuumm -> libretro-fceumm --- recipes/playstation/psp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/playstation/psp b/recipes/playstation/psp index 42bd3cd9..173ac52a 100644 --- a/recipes/playstation/psp +++ b/recipes/playstation/psp @@ -1,6 +1,6 @@ snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git PROJECT YES GENERIC Makefile . snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git PROJECT YES GENERIC Makefile . USE_BLARGG_APU=1 -fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . +fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile . lutro libretro-lutro https://github.com/libretro/libretro-lutro PROJECT YES GENERIC Makefile . From 856fa3824fa63fc4750d5491b83f40d79549d5e4 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sat, 8 Oct 2016 06:16:45 +0100 Subject: [PATCH 6/7] (buildbot) 3ds: add databases --- libretro-buildbot-recipe.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index bb2719d3..cd531e8e 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1626,16 +1626,22 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then mkdir -p $WORK/$RADIR/pkg/3ds/retroarch mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cores + mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cores/info mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/remaps mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cheats mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters/audio mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters/video - mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cores/info + mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/database + mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/database/rdb + mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/database/cursors + cp -v $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/3ds/retroarch/filters/video/ cp -v $WORK/$RADIR/audio/audio_filters/*.dsp $WORK/$RADIR/pkg/3ds/retroarch/filters/audio/ cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/3ds/retroarch/cores/info/ + cp -v $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/3ds/retroarch/database/rdb/ + cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/3ds/retroarch/database/cursors/ fi fi From b4ea42cd202ed0b800eb87177f17029e253de2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Su=C3=A1rez?= Date: Mon, 10 Oct 2016 15:22:16 -0500 Subject: [PATCH 7/7] Update 3ds.ra --- recipes/nintendo/3ds.ra | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/nintendo/3ds.ra b/recipes/nintendo/3ds.ra index 014afb12..ec721ad9 100644 --- a/recipes/nintendo/3ds.ra +++ b/recipes/nintendo/3ds.ra @@ -1,3 +1,4 @@ retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES . overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media +assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch/media