Merge pull request #257342 from thiagokokada/retroarch-cleanup

beetle-pce: init at unstable-2023-09-24; libretro.mame: fix build
This commit is contained in:
Thiago Kenji Okada 2023-09-27 22:49:35 +01:00 committed by GitHub
commit 4ab8a3de29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 8 deletions

View File

@ -100,12 +100,22 @@ in
};
};
beetle-pce = mkLibretroCore {
core = "mednafen-pce";
src = getCoreSrc "beetle-pce";
makefile = "Makefile";
meta = {
description = "Port of Mednafen's PC Engine core to libretro";
license = lib.licenses.gpl2Only;
};
};
beetle-pce-fast = mkLibretroCore {
core = "mednafen-pce-fast";
src = getCoreSrc "beetle-pce-fast";
makefile = "Makefile";
meta = {
description = "Port of Mednafen's PC Engine core to libretro";
description = "Port of Mednafen's PC Engine fast core to libretro";
license = lib.licenses.gpl2Only;
};
};
@ -291,7 +301,11 @@ in
core = "citra";
extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ];
makefile = "Makefile";
makeFlags = [ "HAVE_FFMPEG_STATIC=0" ];
makeFlags = [
"HAVE_FFMPEG_STATIC=0"
# https://github.com/libretro/citra/blob/1a66174355b5ed948de48ef13c0ed508b6d6169f/Makefile#L90
"BUILD_DATE=01/01/1970_00:00"
];
meta = {
description = "Port of Citra to libretro";
license = lib.licenses.gpl2Plus;
@ -506,15 +520,11 @@ in
core = "mame";
extraNativeBuildInputs = [ python3 ];
extraBuildInputs = [ alsa-lib libGLU libGL ];
# Setting this is breaking compilation of src/3rdparty/genie for some reason
makeFlags = [ "ARCH=" ];
meta = {
description = "Port of MAME to libretro";
license = with lib.licenses; [ bsd3 gpl2Plus ];
# Build fail with errors:
# gcc: warning: <arch>: linker input file unused because linking not done
# gcc: error: <arch>: linker input file not found: No such file or directory
# Removing it from platforms instead of marking as broken to allow
# retroarchFull to be built
platforms = [ ];
};
};

View File

@ -29,6 +29,12 @@
"rev": "65460e3a9ad529f6901caf669abbda11f437ab55",
"hash": "sha256-+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w="
},
"beetle-pce": {
"owner": "libretro",
"repo": "beetle-pce-libretro",
"rev": "541463bd937dad175aec09c2a0c8d6a52d175386",
"hash": "sha256-wWS9reb6aN71Q7OlGst+32T8XX1yMCSOHUKHkXht3hg="
},
"beetle-pce-fast": {
"owner": "libretro",
"repo": "beetle-pce-fast-libretro",

View File

@ -17,6 +17,7 @@ CORES = {
"beetle-gba": {"repo": "beetle-gba-libretro"},
"beetle-lynx": {"repo": "beetle-lynx-libretro"},
"beetle-ngp": {"repo": "beetle-ngp-libretro"},
"beetle-pce": {"repo": "beetle-pce-libretro"},
"beetle-pce-fast": {"repo": "beetle-pce-fast-libretro"},
"beetle-pcfx": {"repo": "beetle-pcfx-libretro"},
"beetle-psx": {"repo": "beetle-psx-libretro"},