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

Jump to bottom

[20.09] ffmpegthumbnailer: enable generation of thumbnailer file, misc cleanups #109077

Merged
merged 1 commit into from Jan 14, 2021
Merged

[20.09] ffmpegthumbnailer: enable generation of thumbnailer file, misc cleanups #109077

merged 1 commit into from Jan 14, 2021

Conversation

vs49688
Copy link
Contributor

@vs49688 vs49688 commented Jan 12, 2021

Motivation for this change

Passing "-DENABLE_THUMBNAILER=ON" to CMake causes it to install
"ffmpegthumbnailer.thumbnailer" into /share/thumbnailers, making it
actually usable with desktop environments.

Cleanups:

  • remove trailing whitespace
  • change pkgconfig -> pkg-config
  • change license from gpl2 to gpl2Plus

(cherry picked from commit 6a4695b)

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.

@vs49688
ffmpegthumbnailer: enable generation of thumbnailer file, misc cleanups
4ce3a2d 
Passing "-DENABLE_THUMBNAILER=ON" to CMake causes it to install
"ffmpegthumbnailer.thumbnailer" into /share/thumbnailers, making it
actually usable with desktop environments.

Cleanups:
- remove trailing whitespace
- change pkgconfig -> pkg-config
- change license from gpl2 to gpl2Plus

(cherry picked from commit 6a4695b)
@ofborg ofborg bot requested a review from jagajaga January 12, 2021 05:22
@infinisil infinisil merged commit f2234d0 into NixOS:release-20.09 Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jagajaga jagajaga Awaiting requested review from jagajaga

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vs49688 @infinisil