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: 4.208.0 -> 5.264.1 #224795

Merged
merged 4 commits into from
Apr 6, 2023
Merged

libplacebo: 4.208.0 -> 5.264.1 #224795

merged 4 commits into from
Apr 6, 2023

Conversation

Kranzes
Copy link
Member

@Kranzes Kranzes commented Apr 5, 2023

Diff: https://code.videolan.org/videolan/libplacebo/-/compare/v4.208.0...v5.264.1

Changelog: https://code.videolan.org/videolan/libplacebo/-/tags/v5.264.1

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@Kranzes
Copy link
Member Author

Kranzes commented Apr 5, 2023

I need to package libdovi but it seems to be using cargo-c which I don't know how to use properly as it isn't common in nixpkgs, I asked for help in the Rust Nix Matrix room, in the meantime I drafted this PR.

@PedroHLC
Copy link
Member

PedroHLC commented Apr 5, 2023

Worth mentioning:

major breaking change of this
release is a switch away from the external libepoxy and mako
dependencies in favor of the (optionally bundled) glad2 and jinja2.

Since it explains the glad2 new dep. And that we can remove the libepoxy dep.

@Kranzes
Copy link
Member Author

Kranzes commented Apr 5, 2023

I already got those two sorted.

@Kranzes
Copy link
Member Author

Kranzes commented Apr 5, 2023

@PedroHLC I can't get it to detect glad2 and jinja2 properly, can you help out?

@PedroHLC
Copy link
Member

PedroHLC commented Apr 5, 2023

@PedroHLC I can't get it to detect glad2 and jinja2 properly, can you help out?

Their meson.build is overwriting our PYTHONPATH:

{
  postPatch = ''
    substituteInPlace meson.build \
      --replace 'python_env.append' '#'
  '';
}

PS: vulkan-headers is a nativeBuildInputs (python3Packages.* too), and in src the preferred way is hash = "sha256-..." instead of sha256 = "sha256-...".

@Kranzes
Copy link
Member Author

Kranzes commented Apr 5, 2023

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

46 packages failed to build:
  • arcanPackages.all-wrapped
  • arcanPackages.arcan
  • arcanPackages.arcan-wrapped
  • arcanPackages.cat9-wrapped
  • arcanPackages.durden-wrapped
  • arcanPackages.pipeworld-wrapped
  • arcanPackages.prio-wrapped
  • arcanPackages.xarcan
  • deepin.deepin-music
  • deepin.deepin-voice-note
  • eaglemode
  • kaffeine
  • kphotoalbum
  • libsForQt5.elisa
  • libsForQt5.elisa.dev
  • libsForQt5.phonon-backend-vlc
  • libvlc
  • megaglest
  • minitube
  • obs-studio
  • obs-studio-plugins.advanced-scene-switcher
  • obs-studio-plugins.droidcam-obs
  • obs-studio-plugins.input-overlay
  • obs-studio-plugins.looking-glass-obs
  • obs-studio-plugins.obs-gstreamer
  • obs-studio-plugins.obs-hyperion
  • obs-studio-plugins.obs-livesplit-one
  • obs-studio-plugins.obs-move-transition
  • obs-studio-plugins.obs-multi-rtmp
  • obs-studio-plugins.obs-ndi
  • obs-studio-plugins.obs-nvfbc
  • obs-studio-plugins.obs-pipewire-audio-capture
  • obs-studio-plugins.obs-source-record
  • obs-studio-plugins.obs-vaapi
  • obs-studio-plugins.obs-vkcapture
  • obs-studio-plugins.wlrobs
  • pympress
  • pympress.dist
  • python310Packages.python-vlc
  • python310Packages.python-vlc.dist
  • python311Packages.python-vlc
  • python311Packages.python-vlc.dist
  • reaper
  • strawberry
  • vlc
  • wtwitch
56 packages built:
  • adl
  • ani-cli
  • anime-downloader
  • anime-downloader.dist
  • anki
  • anki.doc
  • anki.man
  • ankisyncd
  • celluloid
  • cplay-ng
  • cplay-ng.dist
  • curseradio
  • curseradio.dist
  • deepin.deepin-movie-reborn
  • deepin.deepin-movie-reborn.dev
  • dmlive
  • ff2mpv
  • gonic
  • haruna
  • hydrus
  • hydrus.doc
  • hypnotix
  • jellyfin-media-player
  • jellyfin-mpv-shim
  • jellyfin-mpv-shim.dist
  • jftui
  • libdovi
  • libplacebo
  • libsForQt5.plasmatube
  • mnemosyne
  • mnemosyne.dist
  • mpc-qt
  • mpv
  • mpv-unwrapped
  • mpv-unwrapped.dev
  • mpv-unwrapped.man
  • mpvScripts.inhibit-gnome
  • mpvScripts.mpris
  • mpvpaper
  • plex-media-player
  • plex-mpv-shim
  • plex-mpv-shim.dist
  • python310Packages.glad2
  • python310Packages.glad2.dist
  • python310Packages.mpv
  • python310Packages.mpv.dist
  • python311Packages.mpv
  • python311Packages.mpv.dist
  • qimgv
  • radioboat
  • somafm-cli
  • stremio
  • sublime-music
  • sublime-music.dist
  • subtitleedit
  • ytfzf

@Kranzes
Copy link
Member Author

Kranzes commented Apr 5, 2023

libvlc failing.

@PedroHLC
Copy link
Member

PedroHLC commented Apr 6, 2023

libvlc failing.

Needs to bump, or backport this: https://code.videolan.org/videolan/vlc/-/merge_requests/3027

@PedroHLC PedroHLC mentioned this pull request Apr 6, 2023
3 tasks
@Kranzes
Copy link
Member Author

Kranzes commented Apr 6, 2023

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

1 package failed to build:
  • obs-studio-plugins.obs-ndi
101 packages built:
  • adl
  • ani-cli
  • anime-downloader
  • anime-downloader.dist
  • anki
  • anki.doc
  • anki.man
  • ankisyncd
  • arcanPackages.all-wrapped
  • arcanPackages.arcan
  • arcanPackages.arcan-wrapped
  • arcanPackages.cat9-wrapped
  • arcanPackages.durden-wrapped
  • arcanPackages.pipeworld-wrapped
  • arcanPackages.prio-wrapped
  • arcanPackages.xarcan
  • celluloid
  • cplay-ng
  • cplay-ng.dist
  • curseradio
  • curseradio.dist
  • deepin.deepin-movie-reborn
  • deepin.deepin-movie-reborn.dev
  • deepin.deepin-music
  • deepin.deepin-voice-note
  • dmlive
  • eaglemode
  • ff2mpv
  • gonic
  • haruna
  • hydrus
  • hydrus.doc
  • hypnotix
  • jellyfin-media-player
  • jellyfin-mpv-shim
  • jellyfin-mpv-shim.dist
  • jftui
  • kaffeine
  • kphotoalbum
  • libdovi
  • libplacebo
  • libsForQt5.elisa
  • libsForQt5.elisa.dev
  • libsForQt5.phonon-backend-vlc
  • libsForQt5.plasmatube
  • libvlc
  • megaglest
  • minitube
  • mnemosyne
  • mnemosyne.dist
  • mpc-qt
  • mpv
  • mpv-unwrapped
  • mpv-unwrapped.dev
  • mpv-unwrapped.man
  • mpvScripts.inhibit-gnome
  • mpvScripts.mpris
  • mpvpaper
  • obs-studio
  • obs-studio-plugins.advanced-scene-switcher
  • obs-studio-plugins.droidcam-obs
  • obs-studio-plugins.input-overlay
  • obs-studio-plugins.looking-glass-obs
  • obs-studio-plugins.obs-gstreamer
  • obs-studio-plugins.obs-hyperion
  • obs-studio-plugins.obs-livesplit-one
  • obs-studio-plugins.obs-move-transition
  • obs-studio-plugins.obs-multi-rtmp
  • obs-studio-plugins.obs-nvfbc
  • obs-studio-plugins.obs-pipewire-audio-capture
  • obs-studio-plugins.obs-source-record
  • obs-studio-plugins.obs-vaapi
  • obs-studio-plugins.obs-vkcapture
  • obs-studio-plugins.wlrobs
  • plex-media-player
  • plex-mpv-shim
  • plex-mpv-shim.dist
  • pympress
  • pympress.dist
  • python310Packages.glad2
  • python310Packages.glad2.dist
  • python310Packages.mpv
  • python310Packages.mpv.dist
  • python310Packages.python-vlc
  • python310Packages.python-vlc.dist
  • python311Packages.mpv
  • python311Packages.mpv.dist
  • python311Packages.python-vlc
  • python311Packages.python-vlc.dist
  • qimgv
  • radioboat
  • reaper
  • somafm-cli
  • strawberry
  • stremio
  • sublime-music
  • sublime-music.dist
  • subtitleedit
  • vlc
  • wtwitch
  • ytfzf

obs-studio-plugins.obs-ndi is unrelated.

@Kranzes Kranzes marked this pull request as ready for review April 6, 2023 21:04
@Kranzes Kranzes requested a review from PedroHLC April 6, 2023 21:05
@ofborg ofborg bot requested a review from AndersonTorres April 6, 2023 21:14
@lovesegfault lovesegfault merged commit ed04529 into NixOS:master Apr 6, 2023
6 of 8 checks passed
@Kranzes Kranzes deleted the plaecebo branch April 6, 2023 21:42
# patch to build with recent libplacebo
(fetchpatch {
url = "https://code.videolan.org/videolan/vlc/-/merge_requests/3027.patch";
hash = "sha256-aV+YT1l0ND/USoIIpxcPhdIlP/06J2FxVW4uArS8j88=";
Copy link
Member

Choose a reason for hiding this comment

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

error: hash mismatch in fixed-output derivation '/nix/store/3b1xm0v22yizbr8nkd2p2hnyqg956ngc-3027.patch.drv':
         specified: sha256-aV+YT1l0ND/USoIIpxcPhdIlP/06J2FxVW4uArS8j88=
            got:    sha256-Zz+g75V6X9OZI3sn614K9Uenxl3WtRHKSdLkWP3b17w=
error: 1 dependencies of derivation '/nix/store/mp38cfqhwj1m02a118vhrmh5z5hkfkgk-libvlc-3.0.18.drv' failed to build

Did GitLab change the hash for a merged MR, or did we miscalculate the hash somewhere down the fetchpatch hill?

Copy link
Member Author

Choose a reason for hiding this comment

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

Already fixed in another pr.

@@ -0,0 +1,28 @@
{ lib
, python3
Copy link
Member

Choose a reason for hiding this comment

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

Not okay in pythonPackages. This would use Python 3.10 for python311Packages.glad2. Fixed in #244135

jinja2
];

pythonImportsCheck = [ "glad" ];
Copy link
Member

Choose a reason for hiding this comment

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

Also add nativeCheckInputs or set doCheck = false.

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

5 participants