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.

Sign up for GitHub

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

Jump to bottom

ffmpeg: enable libdrm #49389

Merged
merged 1 commit into from Oct 30, 2018
Merged

ffmpeg: enable libdrm #49389

merged 1 commit into from Oct 30, 2018

Conversation

colemickens
Copy link
Member

Motivation for this change

Enables more hardware acceleration paths, particular screen capturey scenarios that need access to to libdrm.

Discovered via: https://github.com/atomnuker/wlstream/issues/3, printf-debugging and guess work with the derivation.

I can't guarantee every version of ffmpeg was tested, but I looked up the version the flag was added and it fixed all the copies of ffmpeg that my systems build.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@srhb
Copy link
Contributor

srhb commented Oct 30, 2018

@GrahamcOfBorg build ffmpeg

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ffmpeg

Partial log (click to expand)

gzipping man pages under /nix/store/mq52niz2g6898hypyx2j35aa680ljqhs-ffmpeg-3.4.4-man/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/mq52niz2g6898hypyx2j35aa680ljqhs-ffmpeg-3.4.4-man
checking for references to /build in /nix/store/mq52niz2g6898hypyx2j35aa680ljqhs-ffmpeg-3.4.4-man...
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
Moving /nix/store/2nrk0b4bckdqji058vq1m20s0awh54dx-ffmpeg-3.4.4/bin to /nix/store/ab63pql5d9fjv249mcdpk0g36rgxx8s4-ffmpeg-3.4.4-bin/bin
rmdir: failed to remove '/nix/store/2nrk0b4bckdqji058vq1m20s0awh54dx-ffmpeg-3.4.4': Directory not empty
Moving /nix/store/2nrk0b4bckdqji058vq1m20s0awh54dx-ffmpeg-3.4.4/share/ffmpeg/examples to /nix/store/mqdvs5chrsw8gh1iwv82q1ypfjmaij9v-ffmpeg-3.4.4-doc/share/ffmpeg/examples
rmdir: failed to remove '/nix/store/2nrk0b4bckdqji058vq1m20s0awh54dx-ffmpeg-3.4.4/share/ffmpeg': Directory not empty
/nix/store/ab63pql5d9fjv249mcdpk0g36rgxx8s4-ffmpeg-3.4.4-bin

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ffmpeg

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/y41w4fqklrwjmk27bm2apbkcrvzhj8gn-ffmpeg-3.4.4-man
gzipping man pages under /nix/store/y41w4fqklrwjmk27bm2apbkcrvzhj8gn-ffmpeg-3.4.4-man/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/y41w4fqklrwjmk27bm2apbkcrvzhj8gn-ffmpeg-3.4.4-man
checking for references to /build in /nix/store/y41w4fqklrwjmk27bm2apbkcrvzhj8gn-ffmpeg-3.4.4-man...
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
Moving /nix/store/rz4y5wpkdk26a9ziivp3ki0q5j8g9513-ffmpeg-3.4.4/bin to /nix/store/sfnjr6h3vq15ldgc8d8ljfr8carvdgfk-ffmpeg-3.4.4-bin/bin
rmdir: failed to remove '/nix/store/rz4y5wpkdk26a9ziivp3ki0q5j8g9513-ffmpeg-3.4.4': Directory not empty
Moving /nix/store/rz4y5wpkdk26a9ziivp3ki0q5j8g9513-ffmpeg-3.4.4/share/ffmpeg/examples to /nix/store/28dxy0f9fjhcysjbf27niznh7kq1i6dh-ffmpeg-3.4.4-doc/share/ffmpeg/examples
rmdir: failed to remove '/nix/store/rz4y5wpkdk26a9ziivp3ki0q5j8g9513-ffmpeg-3.4.4/share/ffmpeg': Directory not empty

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: ffmpeg

Partial log (click to expand)

find: '/nix/store/pfn0n6jjcf4f5wpa3rpvflsffdczpjb1-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/pfn0n6jjcf4f5wpa3rpvflsffdczpjb1-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/pfn0n6jjcf4f5wpa3rpvflsffdczpjb1-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/pfn0n6jjcf4f5wpa3rpvflsffdczpjb1-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/pfn0n6jjcf4f5wpa3rpvflsffdczpjb1-ffmpeg-3.4.4-doc': No such file or directory
Moving /nix/store/1ic3j8dfyjz2r6l3r87l175dfyxqjc4s-ffmpeg-3.4.4/bin to /nix/store/3ih551cmhi8pbbfxydaxb91cn9jd9pm0-ffmpeg-3.4.4-bin/bin
rmdir: failed to remove '/nix/store/1ic3j8dfyjz2r6l3r87l175dfyxqjc4s-ffmpeg-3.4.4': Directory not empty
Moving /nix/store/1ic3j8dfyjz2r6l3r87l175dfyxqjc4s-ffmpeg-3.4.4/share/ffmpeg/examples to /nix/store/pfn0n6jjcf4f5wpa3rpvflsffdczpjb1-ffmpeg-3.4.4-doc/share/ffmpeg/examples
rmdir: failed to remove '/nix/store/1ic3j8dfyjz2r6l3r87l175dfyxqjc4s-ffmpeg-3.4.4/share/ffmpeg': Directory not empty
/nix/store/3ih551cmhi8pbbfxydaxb91cn9jd9pm0-ffmpeg-3.4.4-bin

@srhb srhb merged commit 5c1c90a into NixOS:master Oct 30, 2018
@colemickens colemickens deleted the ffmpeg branch November 2, 2018 00:36
@squarepear squarepear mentioned this pull request Jul 23, 2021
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@colemickens @srhb @GrahamcOfBorg