Added libvmaf + support for it in ffmpeg-full #70797
Conversation
|
@GrahamcOfBorg build libvmaf ffmpeg-full |
|
@jonringer Fuuzetsu Anything else needed from me? (or is there another reviewer I should tag) |
|
LGTM, I've just been busy. Sorry @marsam does it look good to you? |
There was a problem hiding this comment.
please disable libvmaf for ffmpeg-full on darwin
diff --git i/pkgs/top-level/all-packages.nix w/pkgs/top-level/all-packages.nix
index 70bd668e4af..7cb69f15a40 100644
--- i/pkgs/top-level/all-packages.nix
+++ w/pkgs/top-level/all-packages.nix
@@ -10802,6 +10802,7 @@ in
game-music-emu = if stdenv.isDarwin then null else game-music-emu;
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;
+ libvmaf = if stdenv.isDarwin then null else libvmaf;
openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;Besides that, LTGM
| doCheck = true; | ||
|
|
||
| makeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ]; | ||
|
|
There was a problem hiding this comment.
I think you need to add:
postFixup = ''
substituteInPlace "$dev/lib/pkgconfig/libvmaf.pc" \
--replace "includedir=/usr/local/include" "includedir=$dev"
'';for pkgconfig to find libvmaf
|
|
||
| meta = with stdenv.lib; { | ||
| homepage = "https://github.com/Netflix/vmaf"; | ||
| description = "Perceptual video quality assessment based on multi-method fusion (VMAF)."; |
There was a problem hiding this comment.
description should not include a period at the end:
| description = "Perceptual video quality assessment based on multi-method fusion (VMAF)."; | |
| description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; |
…f. Removed period at end of description.
|
@marsam sorry for the delay in fixing these things, I've been away a few days. All done. |
|
@GrahamcOfBorg build libvmaf ffmpeg-full |
|
@marsam if it looks good, could you merge? thanks |
|
Sorry for the delay. I've disabled ffmpeg-full with libvmaf for aarch64, I hope you don't mind @GrahamcOfBorg build libvmaf ffmpeg-full |
|
@GrahamcOfBorg build ffmpeg-full |
#70593 #### Things done
Tested on Ubuntu Linux. Nothing fancy here though, all quite standard.
Notify maintainers
cc @jonringer @Fuuzetsu