Skip to content
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

libretro.ppsspp: update to v1.11 and fix build againt ffmpeg 4.4 #123842

Merged
merged 1 commit into from May 23, 2021

Conversation

lunik1
Copy link
Contributor

@lunik1 lunik1 commented May 20, 2021

Motivation for this change

#120705

This also adds a patch from upstream that fixes the build against ffmpeg 4.4 and brings the package definition more in line with the ppsspp package.

While it compiles successfully, I have not been able to verify that the core works beyond selecting it in retroarch; I don't have the required system files or any isos to test with.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 20, 2021

Result of nixpkgs-review pr 123842 at a5a5088 run on x86_64-linux 1

1 package built successfully:
  • libretro.ppsspp
12 suggestions:
  • warning: unused-argument

    Unused argument: gtk2.
    Near pkgs/misc/emulators/retroarch/cores.nix:2:61:

      |
    2 | , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
      |                                                             ^
    
  • warning: unused-argument

    Unused argument: SDL_net.
    Near pkgs/misc/emulators/retroarch/cores.nix:2:83:

      |
    2 | , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
      |                                                                                   ^
    
  • warning: unused-argument

    Unused argument: SDL2.
    Near pkgs/misc/emulators/retroarch/cores.nix:2:92:

      |
    2 | , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
      |                                                                                            ^
    
  • warning: unused-argument

    Unused argument: miniupnpc.
    Near pkgs/misc/emulators/retroarch/cores.nix:4:3:

      |
    4 | , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
      |   ^
    
  • warning: unused-argument

    Unused argument: fetchFromGitLab.
    Near pkgs/misc/emulators/retroarch/cores.nix:1:43:

      |
    1 | { lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
      |                                           ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/misc/emulators/retroarch/cores.nix:632:7:

        |
    632 |       (fetchpatch {
        |       ^
    
  • warning: unused-argument

    Unused argument: SDL2_image.
    Near pkgs/misc/emulators/retroarch/cores.nix:2:98:

      |
    2 | , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
      |                                                                                                  ^
    
  • error: no-flags-spaces

    cmakeFlags cannot contain spaces, please use cmakeFlagsArray in Bash.

    Near pkgs/misc/emulators/retroarch/cores.nix:853:5:

        |
    853 |     cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ];
        |     ^
    
  • warning: missing-phase-hooks

    installPhase should probably contain runHook preInstall and runHook postInstall.

    Near pkgs/misc/emulators/retroarch/cores.nix:35:5:

       |
    35 |     installPhase = ''
       |     ^
    
  • warning: unused-argument

    Unused argument: glib.
    Near pkgs/misc/emulators/retroarch/cores.nix:2:55:

      |
    2 | , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
      |                                                       ^
    
  • warning: name-and-version

    Did you mean to pass pname instead of name to mkDerivation?

    Near pkgs/misc/emulators/retroarch/cores.nix:14:5:

       |
    14 |     name = "libretro-${a.core}-${version}";
       |     ^
    

    Near pkgs/misc/emulators/retroarch/cores.nix:15:5:

       |
    15 |     version = "2020-03-06";
       |     ^
    
  • warning: unclear-gpl

    gpl2 is a deprecated license, please check if project uses gpl2Plus or gpl2Only and change meta.license accordingly.

    Near pkgs/misc/emulators/retroarch/cores.nix:50:18:

       |
    50 |       inherit (a) description license;
       |                  ^
    

Result of nixpkgs-review pr 123842 at a5a5088 run on aarch64-linux 1

1 package built successfully:
  • libretro.ppsspp

@SuperSandro2000 SuperSandro2000 merged commit c5265c0 into NixOS:master May 23, 2021
@dotlambda
Copy link
Member

I guess this should be backported to 21.05?

@lunik1
Copy link
Contributor Author

lunik1 commented May 24, 2021

I think so, #123843 too once/if we can get it working

@dotlambda
Copy link
Member

@lunik1 Can you make a PR for this one's backport?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants