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

[21.05] libretro.ppsspp: backport update and fix build against ffmpeg 4.4 #124275

Merged

Conversation

lunik1
Copy link
Contributor

@lunik1 lunik1 commented May 24, 2021

Motivation for this change

Backport of #123842

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/)
  • Added a release notes entry if the change is major or breaking
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

Result of nixpkgs-review pr 124275 at a6709432 run on x86_64-linux 1

1 package built successfully:
  • libretro.ppsspp
12 suggestions:
  • 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: 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: 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
      |                                                                                                  ^
    
  • 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: 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: 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: 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: 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: miniupnpc.
    Near pkgs/misc/emulators/retroarch/cores.nix:4:3:

      |
    4 | , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
      |   ^
    
  • 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: 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;
       |                  ^
    
  • 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 {
        |       ^
    

@fabianhjr
Copy link
Member

Hey, to help with the PRs could you edit the title to include the release version as a prefix? ([21.05])

Per the contributing.md document:

Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. release-20.09) as the target branch of the pull request, and link to the pull request in which the original change was comitted to master. The pull request title should be the commit title with the release version as prefix, e.g. [20.09].

@lunik1 lunik1 force-pushed the libretro-ppsspp-ffmpeg4-backport branch from a670943 to c72323f Compare May 24, 2021 17:18
@lunik1
Copy link
Contributor Author

lunik1 commented May 24, 2021

Sure! My mistake!

@fabianhjr
Copy link
Member

fabianhjr commented May 24, 2021

Sorry, it wasn't the commit message but the PR title here. UnU

@lunik1 lunik1 changed the title libretro.ppsspp: backport update and fix build against ffmpeg 4.4 [21.05] libretro.ppsspp: backport update and fix build against ffmpeg 4.4 May 24, 2021
@lunik1 lunik1 force-pushed the libretro-ppsspp-ffmpeg4-backport branch from c72323f to 9e09f78 Compare May 24, 2021 17:22
Copy link
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, same commit message and diff as 123842 (which is the one being backported)

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use git cherry-pick -x a5a5088eae8955bc781f240af54880fa78232a2f.

@lunik1 lunik1 force-pushed the libretro-ppsspp-ffmpeg4-backport branch from 9e09f78 to e3f7168 Compare May 25, 2021 15:50
@lunik1 lunik1 requested a review from dotlambda May 28, 2021 21:30
@dotlambda dotlambda merged commit 6eba052 into NixOS:release-21.05 May 29, 2021
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.

4 participants