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

skia: init at 124-unstable-2024-05-22 #325871

Merged
merged 1 commit into from
Jul 12, 2024
Merged

skia: init at 124-unstable-2024-05-22 #325871

merged 1 commit into from
Jul 12, 2024

Conversation

fgaz
Copy link
Member

@fgaz fgaz commented Jul 9, 2024

Description of changes

Dependency of #325045

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@fgaz fgaz added the 5. scope: tracked Issue (or PR) is linked back to a `5. scope: tracking` issue label Jul 9, 2024
@zlepper
Copy link
Contributor

zlepper commented Jul 9, 2024

Result of nixpkgs-review pr 325871 run on x86_64-linux 1

1 package built:
  • skia

@fgaz fgaz force-pushed the skia/init branch 2 times, most recently from d70784b to 09f4545 Compare July 10, 2024 13:01
@qbit
Copy link
Contributor

qbit commented Jul 10, 2024

Result of nixpkgs-review pr 325871 run on x86_64-linux 1

1 package built:
  • skia

@qbit
Copy link
Contributor

qbit commented Jul 10, 2024

Result of nixpkgs-review pr 325871 run on aarch64-darwin 1

1 package failed to build:
  • skia

@qbit
Copy link
Contributor

qbit commented Jul 10, 2024

Error from darwin:

error: builder for '/nix/store/8xh0ayff2s5qrgvifjcgbxbccddlqp42-skia-124-unstable-2024-05-22.drv' failed with exit code 1;
       last 10 log lines:
       > FAILED: obj/src/gpu/gpu_shared.MutableTextureState.o
       > c++ -MD -MF obj/src/gpu/gpu_shared.MutableTextureState.o.d -DNDEBUG -DSK_CODEC_DECODES_BMP -DSK_CODEC_DECODES_WBMP -DSKIA_DLL -DSK_ENABLE_PRECOMPILE -DSK_ASSUME_GL=1 -DSK_GANESH -DSK_DISABLE_TRACING -DSK_USE_PERFETTO -DSK_ENABLE_API_AVAILABLE -DSK_GAMMA_APPLY_TO_A8 -DSK_ENABLE_AVX512_OPTS -DSKIA_IMPLEMENTATION=1 -I.. -Wno-attributes -ffp-contract=off -fstrict-aliasing -fPIC -fvisibility=hidden -march=armv7-a -mfpu=neon -mthumb -isysroot /nix/store/12rrl7arpahm7l708pvg1ly247sc0djg-SDKs/MacOSX11.0.sdk -target x86_64-apple-macos10.13 -O3 -I/nix/store/lha2hfsmgz1a5yrscpqaq9yfphjvi1g7-harfbuzz-icu-8.4.0-dev/include/harfbuzz -std=c++17 -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -c ../src/gpu/MutableTextureState.cpp -o obj/src/gpu/gpu_shared.MutableTextureState.o
       > clang-16: warning: overriding '-mmacos-version-min=11.0' option with '-target x86_64-apple-macos10.13' [-Woverriding-t-option]
       > clang-16: error: unsupported argument 'armv7-a' to option '-march='
       > [8/1004] compile ../src/gpu/PipelineUtils.cpp
       > FAILED: obj/src/gpu/gpu_shared.PipelineUtils.o
       > c++ -MD -MF obj/src/gpu/gpu_shared.PipelineUtils.o.d -DNDEBUG -DSK_CODEC_DECODES_BMP -DSK_CODEC_DECODES_WBMP -DSKIA_DLL -DSK_ENABLE_PRECOMPILE -DSK_ASSUME_GL=1 -DSK_GANESH -DSK_DISABLE_TRACING -DSK_USE_PERFETTO -DSK_ENABLE_API_AVAILABLE -DSK_GAMMA_APPLY_TO_A8 -DSK_ENABLE_AVX512_OPTS -DSKIA_IMPLEMENTATION=1 -I.. -Wno-attributes -ffp-contract=off -fstrict-aliasing -fPIC -fvisibility=hidden -march=armv7-a -mfpu=neon -mthumb -isysroot /nix/store/12rrl7arpahm7l708pvg1ly247sc0djg-SDKs/MacOSX11.0.sdk -target x86_64-apple-macos10.13 -O3 -I/nix/store/lha2hfsmgz1a5yrscpqaq9yfphjvi1g7-harfbuzz-icu-8.4.0-dev/include/harfbuzz -std=c++17 -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -c ../src/gpu/PipelineUtils.cpp -o obj/src/gpu/gpu_shared.PipelineUtils.o
       > clang-16: warning: overriding '-mmacos-version-min=11.0' option with '-target x86_64-apple-macos10.13' [-Woverriding-t-option]
       > clang-16: error: unsupported argument 'armv7-a' to option '-march='
       > ninja: build stopped: subcommand failed.
       For full logs, run 'nix-store -l /nix/store/8xh0ayff2s5qrgvifjcgbxbccddlqp42-skia-124-unstable-2024-05-22.drv'.
error: 1 dependencies of derivation '/nix/store/xvvwhcl9572fhc5q8w4dzxn61lhg2yz1-review-shell.drv' failed to build

armv7-a seems wrong? Maybe darwin support should come post-merge?

@fgaz
Copy link
Member Author

fgaz commented Jul 11, 2024

darwin x86_64 also fails:

../include/private/base/SkTArray.h:523:49: error: no matching function for call to 'min'
    static constexpr int kMaxCapacity = SkToInt(std::min(SIZE_MAX / sizeof(T), (size_t)INT_MAX));
                                                ^~~~~~~~

I marked both as broken.

Copy link
Member

@jopejoe1 jopejoe1 left a comment

Choose a reason for hiding this comment

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

Maybe also add the pkg-config module to meta.

Result of nixpkgs-review pr 325871 run on x86_64-linux 1

1 package built:
  • skia

@jopejoe1 jopejoe1 merged commit bef536b into NixOS:master Jul 12, 2024
24 of 26 checks passed
@fgaz fgaz deleted the skia/init branch July 12, 2024 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5. scope: tracked Issue (or PR) is linked back to a `5. scope: tracking` issue 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants