-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
retroarch: 1.9.13.2 -> 1.9.14; libretro: unstable-2021-11-22 -> unstable-2021-12-06 #149114
Conversation
patches = [ | ||
(fetchpatch { | ||
name = "fix_mame_build_on_make-4.3.patch"; | ||
url = "https://github.com/libretro/mame2016-libretro/commit/5874fae3d124f5e7c8a91634f5473a8eac902e47.patch"; | ||
sha256 = "061f1lcm72glksf475ikl8w10pnbgqa7049ylw06nikis2qdjlfn"; | ||
}) | ||
]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merged upstream: libretro/mame2016-libretro#47
Result of 89 packages built:
|
Tested:
|
CC @aanderse |
snes9x2005-plus = mkLibRetroCore { | ||
core = "snes9x2005-plus"; | ||
src = getCoreSrc "snes9x2005"; | ||
description = "Optimized port/rewrite of SNES9x 1.43 to Libretro, with Blargg's APU"; | ||
license = "Non-commercial"; | ||
makefile = "Makefile"; | ||
makeFlags = [ "USE_BLARGG_APU=1" ]; | ||
postBuild = "mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
snes9x2005
with USE_BLARGG_APU
results on snes9x2005-plus
(that was what we previously called snes9x2005
). So this just fixes it, and add a proper snes9x2005
(without the USE_BLARGG_APU
set).
@@ -674,7 +659,6 @@ in | |||
|
|||
pcsx2 = mkLibRetroCore { | |||
core = "pcsx2"; | |||
version = "unstable-2021-11-27"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No more version for this guy?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It derivates the version from here: https://github.com/NixOS/nixpkgs/pull/149114/files#diff-86029dc4c3d1ca3e77939271748ead9d43e99e83df50a7d368337b59e64b3b30R58.
The only reason this version was set before because when I introduced this core in PR #147622 I didn't want to bump all other cores.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha.
Also, migrate old MAME cores to build with Python 3 instead of Python 2.
This is actually the old `libretro.snes9x2005` renamed with the proper core name, and the `libretro.snes9x2005` now is build without the Blaarg's APU (same as upstream).
Result of 90 packages built:
|
postPatch = '' | ||
sed -i -e 's:-Wall:-Wall -Wno-format-security:g' src/burner/libretro/Makefile | ||
''; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't seem to be needed anymore, build and works fine without it.
preBuild = "cd src/burner/libretro"; | ||
makeFlags = [ "USE_EXPERIMENTAL_FLAGS=1" ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This flag seems to be used mostly for optimizations on slow platforms. Seems to enable some "dangerous" optimization flags that are not needed on x86_64 or even aarch64.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The slow platforms that upstream enable are either a Funkey S or a Classic NES/SNES that should be much slower than any platform we support.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
Thanks @thiagokokada 🎉 |
Motivation for this change
New release: https://www.libretro.com/index.php/retroarch-1-9-14-release/
Also, migrate old MAME cores to build with Python 3 instead of Python 2 (issue: #148779).
As always, some clean-ups. Sorry for the reviewers.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes