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

libplacebo: fix building with shaderc 2020.2 #100818

Merged
merged 1 commit into from Oct 17, 2020

Conversation

SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 17, 2020

Motivation for this change

This fixes a regression introduced by #94049.

builder for '/nix/store/86lrf5m4vy9r4hbwm6r95ljv6w0pwi4d-libplacebo-2.72.0.drv' failed with exit code 1; last 10 log lines:
  build flags: -j128 -l128
  [42/44] Compiling C++ object 'src/25a6634@@placebo@sha/glsl_glslang.cc.o's_gen.c.o'
  FAILED: src/25a6634@@placebo@sha/glsl_glslang.cc.o
  g++ -Isrc/25a6634@@placebo@sha -Isrc -I../src -I../src/include -I../src/include/dummy -I../subprojects/xtalloc/include -I../subprojects/bstr/include -I/nix/store/81iy20n5rhvcm18ha289anygpgq5qyjc-lcms2-2.11-dev/include -I/nix/store/riw48ysh0rhkf2fck7m1iiany4rif2mv-vulkan-headers-1.2.141.0/include -I/nix/store/psda85jw38cxzqp6fa59vrdipz67h6bk-epoxy-1.5.4-dev/include -I/usr/include/glslang -I/nix/store/my4bdsgi308bq216gkhfwnwnk35yhszn-libplacebo-2.72.0/include/glslang -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=c++11 -Wundef -Wshadow -Wparentheses -Wpointer-arith -fvisibility=hidden -fPIC -pthread -MD -MQ 'src/25a6634@@placebo@sha/glsl_glslang.cc.o' -MF 'src/25a6634@@placebo@sha/glsl_glslang.cc.o.d' -o 'src/25a6634@@placebo@sha/glsl_glslang.cc.o' -c ../src/glsl/glslang.cc
  ../src/glsl/glslang.cc:229:1: error: cannot convert '<brace-enclosed initializer list>' to 'int' in initialization
    229 | };
        | ^
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.

@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented Oct 17, 2020

The results of reverting "shaderc: 2019.1 -> 2020.2". Removing a patch also fixes building so I decided to change this PR to do this.

Result of nixpkgs-review pr 100818 1

19 packages built:
  • celluloid (gnome-mpv)
  • curseradio
  • jellyfin-mpv-shim
  • jftui
  • libplacebo
  • minitube
  • mpc-qt
  • mpv (mpv-with-scripts)
  • mpv-unwrapped
  • mpvScripts.mpris
  • plex-media-player
  • plex-mpv-shim
  • python37Packages.mpv
  • python38Packages.mpv
  • qimgv
  • shaderc
  • somafm-cli
  • sublime-music
  • tuijam

@SuperSandro2000 SuperSandro2000 changed the title Revert "shaderc: 2019.1 -> 2020.2" libplacebo: fix building Oct 17, 2020
@SuperSandro2000 SuperSandro2000 changed the title libplacebo: fix building libplacebo: fix building with shaderc 2020.2 Oct 17, 2020
@ofborg ofborg bot requested review from tadeokondrak and primeos October 17, 2020 12:18
@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented Oct 17, 2020

The results of removing the offending patch.

Result of nixpkgs-review pr 100818 1

18 packages built:
  • celluloid (gnome-mpv)
  • curseradio
  • jellyfin-mpv-shim
  • jftui
  • libplacebo
  • minitube
  • mpc-qt
  • mpv (mpv-with-scripts)
  • mpv-unwrapped
  • mpvScripts.mpris
  • plex-media-player
  • plex-mpv-shim
  • python37Packages.mpv
  • python38Packages.mpv
  • qimgv
  • somafm-cli
  • sublime-music
  • tuijam

Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Interesting, seems like shaderc/glslang updates can cause quite a mess... :o (not sure if we reverted glslang or they broke their API again to revert the original breakage...)

Anyway, thanks for the fix! ❤️

@primeos primeos merged commit 1efdcde into NixOS:master Oct 17, 2020
@SuperSandro2000 SuperSandro2000 deleted the fix-libplacebo branch October 17, 2020 15:01
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

2 participants