Merge remote-tracking branch 'upstream/master'

dist/info/beetle_psx_libretro.info

@@ -0,0 +1,24 @@
+display_name = "PlayStation (Beetle PSX)"
+authors = "Ryphecha|Libretro"
+supported_extensions = "cue|toc|m3u|ccd|exe"
+corename = "Beetle PSX"
+manufacturer = "Sony"
+systemname = "PlayStation"
+license = "GPLv2"
+permissions = ""
+display_version = "v0.9.36.3"
+need_fullpath = "true"
+block_extract = "false"
+supports_no_game = "false"
+firmware_count = 3
+firmware0_desc = "scph5500.bin (PS1 JP BIOS)"
+firmware0_path = "scph5500.bin"
+firmware0_opt = "false"
+firmware1_desc = "scph5501.bin (PS1 US BIOS)"
+firmware1_path = "scph5501.bin"
+firmware1_opt = "false"
+firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
+firmware2_path = "scph5502.bin"
+firmware2_opt = "false"
+
+notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"

dist/info/mednafen_psx_libretro.info

@@ -1,7 +1,7 @@
 display_name = "PlayStation (Mednafen PSX)"
 authors = "Ryphecha"
 supported_extensions = "cue|toc|m3u|ccd|exe"
-corename = "Mednafen/Beetle PSX"
+corename = "Mednafen PSX"
 manufacturer = "Sony"
 systemname = "PlayStation"
 license = "GPLv2"

dist/info/mess_libretro.info

@@ -1,9 +1,9 @@
-display_name = "Computers, video game consoles and calculators (MESS 2014)"
+display_name = "MULTI (MESS 2014)"
 authors = "MAMEdev"
 supported_extensions = "zip|chd|7z"
 corename = "MESS 2014 (Git)"
 manufacturer = "Various"
-systemname = "Computers, video game consoles and calculators (various)"
+systemname = "MULTI (various)"
 license = "MAME"
 permissions = ""
 display_version = "Git"

dist/info/quicknes_libretro.info

@@ -4,7 +4,7 @@ supported_extensions = "nes"
 corename = "QuickNES"
 manufacturer = "Nintendo"
 systemname = "Nintendo Entertainment System"
-license = "GPLv2"
+license = "LGPLv2.1+"
 permissions = ""
 display_version = "v1"
 need_fullpath = "false"

dist/info/ume_libretro.info

@@ -0,0 +1,14 @@
+display_name = "MULTI (UME 2014)"
+authors = "MAMEdev"
+supported_extensions = "zip|chd|7z"
+corename = "UME 2014 (Git)"
+manufacturer = "Various"
+systemname = "MULTI (various)"
+license = "MAME"
+permissions = ""
+display_version = "Git"
+need_fullpath = "true"
+block_extract = "true"
+supports_no_game = "false"
+
+notes = "- To load roms, you need the hashes in SYSTEMDIR\ume\hash and softlist romset|- You can get the hashes from the mame/mess source code|- core supports ume save states|- core supports extracted ume cheats|- BIOS files go into the ROM directory|- CHD files go into the ROM directory in a directory with the same name|- ARTWORK, CHEATS, SAMPLES may go into SYSTEMDIR\ume into their own directories|- STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, DIFF will be saved to SAVEDIR\ume into their own directories"

libretro-build-common.sh

@@ -121,6 +121,10 @@ build_libretro_stonesoup() {
    build_libretro_generic_makefile "stonesoup" "crawl-ref" "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
 }
 
+build_libretro_hatari() {
+   build_libretro_generic_makefile "hatari" "." "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
+}
+
 build_libretro_prosystem() {
    build_libretro_generic_makefile "prosystem" "." "Makefile" ${FORMAT_COMPILER_TARGET}
 }
@@ -250,6 +254,10 @@ build_libretro_beetle_pcfx() {
 }
 
 build_libretro_beetle_psx() {
+   build_libretro_generic_makefile "beetle_psx" "." "Makefile" ${FORMAT_COMPILER_TARGET}
+}
+
+build_libretro_mednafen_psx() {
    build_libretro_generic_makefile "mednafen_psx" "." "Makefile" ${FORMAT_COMPILER_TARGET}
 }
 

libretro-build.sh

@@ -110,6 +110,7 @@ else
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
    build_libretro_beetle_psx
+   build_libretro_mednafen_psx
    build_libretro_beetle_snes
    build_libretro_catsfc
    build_libretro_snes9x
@@ -149,4 +150,5 @@ else
    build_libretro_3dengine
    build_libretro_ppsspp
    build_libretro_o2em
+   build_libretro_hatari
 fi

libretro-fetch.sh

@@ -68,6 +68,22 @@ fetch_subprojects()
    echo "=== Fetched ==="
 }
 
+fetch_project_submodule_no_update()
+{
+   echo "=== Fetching $3 ==="
+   if [ -d "$2/.git" ]; then
+      cd "$2"
+      git pull
+      cd ..
+   else
+      git clone "$1" "$2"
+      cd "$2"
+      git submodule update --init
+      cd ..
+   fi
+   echo "=== Fetched ==="
+}
+
 fetch_project_submodule()
 {
    echo "=== Fetching $3 ==="
@@ -121,7 +137,8 @@ fetch_project "$REPO_BASE/libretro/beetle-lynx-libretro.git" "libretro-mednafen_
 fetch_project "$REPO_BASE/libretro/beetle-ngp-libretro.git" "libretro-mednafen_ngp" "libretro/Beetle NGP"
 fetch_project "$REPO_BASE/libretro/beetle-pce-fast-libretro.git" "libretro-mednafen_pce_fast" "libretro/Beetle PCE Fast"
 fetch_project "$REPO_BASE/libretro/beetle-supergrafx-libretro.git" "libretro-mednafen_supergrafx" "libretro/Beetle SuperGrafx"
-fetch_project "$REPO_BASE/libretro/beetle-psx-libretro.git" "libretro-mednafen_psx" "libretro/Beetle PSX"
+fetch_project "$REPO_BASE/libretro/beetle-psx-libretro.git" "libretro-beetle_psx" "libretro/Beetle PSX"
+fetch_project "$REPO_BASE/libretro/mednafen-psx-libretro.git" "libretro-mednafen_psx" "libretro/Mednafen PSX"
 fetch_project "$REPO_BASE/libretro/beetle-pcfx-libretro.git" "libretro-mednafen_pcfx" "libretro/Beetle PCFX"
 fetch_project "$REPO_BASE/libretro/beetle-bsnes-libretro.git" "libretro-mednafen_snes" "libretro/Beetle bSNES"
 fetch_project "$REPO_BASE/libretro/beetle-vb-libretro.git" "libretro-mednafen_vb" "libretro/Beetle VB"
@@ -140,7 +157,6 @@ fetch_project_submodule "$REPO_BASE/libretro/picodrive.git" "libretro-picodrive"
 fetch_project "$REPO_BASE/libretro/tgbdual-libretro.git" "libretro-tgbdual" "libretro/tgbdual"
 fetch_project "$REPO_BASE/libretro/mupen64plus-libretro.git" "libretro-mupen64plus" "libretro/mupen64plus"
 fetch_project "$REPO_BASE/libretro/Dinothawr.git" "libretro-dinothawr" "libretro/Dinothawr"
-fetch_project "$REPO_BASE/libretro/hatari-libretro.git" "libretro-hatari" "libretro/Hatari"
 fetch_project "$REPO_BASE/libretro/libretro-uae.git" "libretro-uae" "libretro/UAE"
 fetch_project "$REPO_BASE/libretro/libretro-3dengine.git" "libretro-3dengine" "libretro/3DEngine"
 fetch_project "$REPO_BASE/libretro/libretro-remotejoy.git" "libretro-remotejoy" "libretro/RemoteJoy"
@@ -154,4 +170,6 @@ fetch_project "$REPO_BASE/libretro/prosystem-libretro.git" "libretro-prosystem"
 fetch_project "$REPO_BASE/libretro/libretro-o2em.git" "libretro-o2em" "libretro/o2em"
 fetch_project "$REPO_BASE/libretro/4do-libretro.git" "libretro-4do" "libretro/4do"
 fetch_project "$REPO_BASE/libretro/CATSFC-libretro.git" "libretro-catsfc" "libretro/CATSFC"
-fetch_project_submodule "$REPO_BASE/libretro/crawl-ref.git" "libretro-stonesoup" "libretro/DungeonCrawler StoneSoup"
+fetch_project_submodule_no_update "$REPO_BASE/libretro/crawl-ref.git" "libretro-stonesoup" "libretro/DungeonCrawler StoneSoup"
+fetch_project "$REPO_BASE/libretro/hatari.git" "libretro-hatari" "libretro/hatari"
+fetch_project "$REPO_BASE/libretro/TempGBA-libretro.git" "libretro-tempgba" "libretro/TempGBA"