Merge pull request #3768 from frangarcj/master

Salamander and Retrodb

Makefile.griffin

@@ -248,6 +248,7 @@ else ifeq ($(platform), vita)
   HAVE_STB_FONT :=1
   RARCH_CONSOLE          = 1
   HAVE_THREADS     := 1
+  HAVE_LIBRETRODB := 1
 endif
 
 

core_info.c

@@ -171,7 +171,7 @@ static config_file_t *core_info_list_iterate(
    fill_pathname_base_noext(info_path_base, contents->elems[i].data,
          sizeof(info_path_base));
 
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS))
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA))
    char *substr = strrchr(info_path_base, '_');
    if (substr)
       *substr = '\0';

dist-scripts/dist-cores.sh

@@ -33,6 +33,7 @@ cp -f ../kernel_functions.prx ../pkg/${platform}/kernel_functions.prx
 elif [ $PLATFORM = "vita" ] ; then
 platform=vita
 MAKEFILE_GRIFFIN=yes
+SALAMANDER=yes
 EXT=a
 mkdir -p ../pkg/vita/vpk
 # CTR/3DS
@@ -126,6 +127,38 @@ if [ $SALAMANDER = "yes" ]; then
    if [ $PLATFORM = "psp1" ] ; then
    mv -f ../EBOOT.PBP ../pkg/${platform}/EBOOT.PBP
    fi
+   if [ $PLATFORM = "vita" ] ; then
+     mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/sce_sys/livearea/contents
+     vita-make-fself -s ../retroarchvita_salamander.velf ../pkg/${platform}/retroarch.vpk/vpk/eboot.bin
+     vita-mksfoex -s TITLE_ID=RETROVITA "RetroArch" ../pkg/${platform}/retroarch.vpk/vpk/sce_sys/param.sfo
+     cp ../pkg/${platform}/assets/ICON0.PNG ../pkg/${platform}/retroarch.vpk/vpk/sce_sys/icon0.png
+     cp -R ../pkg/${platform}/assets/livearea ../pkg/${platform}/retroarch.vpk/vpk/sce_sys/
+     mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/assets
+      if [ -d ../media/assets/glui ]; then
+         cp -r ../media/assets/glui ../pkg/${platform}/retroarch.vpk/vpk/assets
+      fi
+      if [ -d ../media/assets/xmb ]; then
+         cp -r ../media/assets/xmb ../pkg/${platform}/retroarch.vpk/vpk/assets
+         # Strip source SVG files
+         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/flatui/src
+         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/monochrome/src
+         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/retroactive/src
+         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/retroactive_marked/src
+      fi
+      if [ -d ../media/libretrodb/rdb ]; then
+         mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/rdb
+         cp -r ../media/libretrodb/rdb/* ../pkg/${platform}/retroarch.vpk/vpk/database/rdb
+      fi
+      if [ -d ../media/libretrodb/cursors ]; then
+         mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/cursors
+         cp -r ../media/libretrodb/cursors/* ../pkg/${platform}/retroarch.vpk/vpk/database/cursors
+      fi
+      if [ -d ../../dist/info ]; then
+         mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/info
+         cp -fv ../../dist/info/*.info ../pkg/${platform}/retroarch.vpk/vpk/info/
+      fi
+      make -C ../ -f Makefile.${platform}.salamander clean || exit 1
+   fi
    if [ $PLATFORM = "ctr" ] ; then
    mv -f ../retroarch_3ds_salamander.cia ../pkg/3ds/cia/retroarch_3ds.cia
    make -C ../ -f Makefile.${platform} clean || exit 1
@@ -228,6 +261,7 @@ for f in `ls -v *_${platform}.${EXT}`; do
       mkdir -p ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/livearea
       mkdir -p ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/livearea/contents
       vita-make-fself -s ../retroarch_${platform}.velf ../pkg/${platform}/${name}_libretro.vpk/vpk/eboot.bin
+      cp ../pkg/${platform}/${name}_libretro.vpk/vpk/eboot.bin ../pkg/${platform}/retroarch.vpk/vpk/${name}_libretro.self
       vita-mksfoex -s TITLE_ID=RETR${COUNTER_ID} "RetroArch ${name}" ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/param.sfo
       cp ../pkg/${platform}/assets/ICON0.PNG ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/icon0.png
       cp ../pkg/${platform}/assets/livearea/contents/bg.png ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/livearea/contents/bg.png
@@ -246,6 +280,18 @@ for f in `ls -v *_${platform}.${EXT}`; do
             rm -rf ../pkg/${platform}/${name}_libretro.vpk/vpk/assets/xmb/retroactive/src
             rm -rf ../pkg/${platform}/${name}_libretro.vpk/vpk/assets/xmb/retroactive_marked/src
          fi
+         if [ -d ../media/libretrodb/rdb ]; then
+            mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/rdb
+            cp -r ../media/libretrodb/rdb/* ../pkg/${platform}/${name}_libretro.vpk/vpk/database/rdb
+         fi
+         if [ -d ../media/libretrodb/cursors ]; then
+            mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/cursors
+            cp -r ../media/libretrodb/cursors/* ../pkg/${platform}/${name}_libretro.vpk/vpk/database/cursors
+         fi
+         if [ -d ../../dist/info ]; then
+            mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/info
+            cp -fv ../../dist/info/"${name}_libretro.info" ../pkg/${platform}/${name}_libretro.vpk/vpk/info/"${name}_libretro.info"
+         fi
    elif [ $PLATFORM = "ctr" ] ; then
       mv -f ../retroarch_3ds.cia ../pkg/3ds/cia/${name}_libretro.cia
       mv -f ../retroarch_3ds.3ds ../pkg/3ds/rom/${name}_libretro.3ds

frontend/drivers/platform_psp.c

@@ -95,8 +95,9 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
 #endif
 
 #ifdef VITA
-   strlcpy(eboot_path, "ux0:/data/retroarch/", sizeof(eboot_path));
+   strlcpy(eboot_path, "app0:/", sizeof(eboot_path));
    strlcpy(g_defaults.dir.port, eboot_path, sizeof(g_defaults.dir.port));
+   strlcpy(user_path, "ux0:/data/retroarch/", sizeof(user_path));
 #else
    strlcpy(eboot_path, argv[0], sizeof(eboot_path));
    /* for PSP, use uppercase directories, and no trailing slashes
@@ -108,36 +109,40 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
 
 #ifdef VITA
    /* bundle data*/
-   fill_pathname_join(g_defaults.dir.assets, "app0:/",
-         "assets", sizeof(g_defaults.dir.assets));
-   fill_pathname_join(g_defaults.dir.core, "app0:/",
+   fill_pathname_join(g_defaults.dir.core, g_defaults.dir.port,
          "", sizeof(g_defaults.dir.core));
+   fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.port,
+         "assets", sizeof(g_defaults.dir.assets));
    fill_pathname_join(g_defaults.dir.core_info, g_defaults.dir.core,
          "info", sizeof(g_defaults.dir.core_info));
+   fill_pathname_join(g_defaults.dir.database, g_defaults.dir.port,
+         "database/rdb", sizeof(g_defaults.dir.database));
+   fill_pathname_join(g_defaults.dir.cursor, g_defaults.dir.port,
+         "database/cursors", sizeof(g_defaults.dir.cursor));
    /* user data*/
-   fill_pathname_join(g_defaults.dir.cheats, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.cheats, user_path,
          "cheats", sizeof(g_defaults.dir.cheats));
-   fill_pathname_join(g_defaults.dir.menu_config, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.menu_config, user_path,
          "config", sizeof(g_defaults.dir.menu_config));
-   fill_pathname_join(g_defaults.dir.core_assets, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.core_assets, user_path,
          "downloads", sizeof(g_defaults.dir.core_assets));
-   fill_pathname_join(g_defaults.dir.playlist, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.playlist, user_path,
          "playlists", sizeof(g_defaults.dir.playlist));
-   fill_pathname_join(g_defaults.dir.remap, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.remap, user_path,
          "remaps", sizeof(g_defaults.dir.remap));
-   fill_pathname_join(g_defaults.dir.sram, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.sram, user_path,
          "savefiles", sizeof(g_defaults.dir.sram));
-   fill_pathname_join(g_defaults.dir.savestate, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.savestate, user_path,
          "savestates", sizeof(g_defaults.dir.savestate));
-   fill_pathname_join(g_defaults.dir.system, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.system, user_path,
          "system", sizeof(g_defaults.dir.system));
-   fill_pathname_join(g_defaults.dir.cache, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.cache, user_path,
          "temp", sizeof(g_defaults.dir.cache));
-   fill_pathname_join(g_defaults.dir.overlay, g_defaults.dir.port,
+   fill_pathname_join(g_defaults.dir.overlay, user_path,
          "overlays", sizeof(g_defaults.dir.overlay));
    strlcpy(g_defaults.dir.content_history,
-         g_defaults.dir.port, sizeof(g_defaults.dir.content_history));
-   fill_pathname_join(g_defaults.path.config, g_defaults.dir.port,
+         user_path, sizeof(g_defaults.dir.content_history));
+   fill_pathname_join(g_defaults.path.config, user_path,
          file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
 #else