ffmpeg: misc cleanups #50220

pbogdan · 2018-11-11T03:03:33Z

Motivation for this change

There are 5 versions of ffmpeg included in nixpkgs, 2 of which are not supported upstream as I understand it. This attempts to switch packages to a more up to date version where possible. As a result ffmpeg_1 can be dropped; ffmpeg_0 still remains :/ with a single reverse dependency gst-ffmpeg. The packages depending on gst-ffmpeg are:

miro - depends on other deps marked as insecure already - webkitgtk24x-gtk2 - so perhaps could be dropped? - miro: remove #50354
gnash - as per gnash: init at 0.8.11-2017-03-08 [WIP] #26620 gstreamer support is not enabled by default and some parts of it don't work well? Could the gstreamer support be removed here? - gnash: remove gstreamer support #50481
transcribe - I think it should be possible to update the package and switch to new gstreamer and drop the gst-ffmpeg dependency - transcribe: 8.40 -> 8.72 #50337
tor-browser-bundle{-bin} - don't know what to do with those.. - firefoxen: remove unused gstreamer dependencies #50373

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.

I verified things build on x86_64-linux but not tested much beyond that.

jtojnar · 2018-11-13T13:51:47Z

Related issues: #22372, #15930

👍 for dropping Miro, for #39975

jtojnar · 2018-11-13T13:55:43Z

pkgs/tools/audio/acoustid-fingerprinter/default.nix

+      url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw";
+      sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk";
+    })
+    ./ffmpeg.patch


Could you add source of the path in a comment?

I wrote it myself so this is the source 😆 I would probably need to re-work it a bit before sending upstream so that it works with older versions too.

jtojnar · 2018-11-13T13:56:27Z

pkgs/applications/audio/spotify/default.nix

@@ -23,7 +23,7 @@ let
    curl
    dbus
    expat
-    ffmpeg_0_10
+    ffmpeg


Does this really work (can local files be played)? Arch package requires https://aur.archlinux.org/packages/ffmpeg-compat-54/

With the symlinks I added further down in this file it does, yes. I tested locally and playing files from a local library works fine.

jtojnar · 2018-11-13T13:57:19Z

pkgs/top-level/all-packages.nix

@@ -9525,9 +9525,6 @@ with pkgs;
  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
    inherit (darwin.apple_sdk.frameworks) Cocoa;
  };
-  ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix {


Could you delete the file as well?

Done, thanks for the catch.

Mic92 · 2018-11-13T23:16:41Z

cc @rnhmjoj regarding gnash

rnhmjoj · 2018-11-14T20:22:50Z

It should be safe to remove, it didn't really work anyway.

Mic92 · 2018-11-14T20:46:03Z

I doubt that the tor-browser still uses gst-ffmpeg, because it is based on firefox. cc @joachifm

pbogdan · 2018-11-14T21:19:08Z

@Mic92 Yeah, I believe it should be safe to remove as gstreamer support seems to be gone (only looked into it today). I started working on a change that removes gstreamer dependencies from firefox and tor-browser expressions (FF doesn't use gst-ffmpeg but refers to some other legacy gstreamer packages).

veprbl · 2018-12-12T17:37:09Z

@pbogdan What is the status of this? What kind of testing did you do?

infinisil · 2019-01-26T22:10:26Z

Nice work! Can you fix the merge conflict? Post a comment when done (GitHub doesn't send out notifications for new commits), I can then quickly test some things myself and merge it after that.

pbogdan · 2019-01-27T13:51:31Z

@infinisil Thanks, conflicts resolved.

infinisil · 2019-01-27T16:52:35Z

@GrahamcOfBorg build acoustidFingerprinter
@GrahamcOfBorg build cantata
@GrahamcOfBorg build renpy
@GrahamcOfBorg build ffmpegthumbnailer
@GrahamcOfBorg build ffms
@GrahamcOfBorg build xineLib
@GrahamcOfBorg build avxsynth
@GrahamcOfBorg build baresip
@GrahamcOfBorg build freerdp_legacy
@GrahamcOfBorg build guvcview

This fixes evaluation. I'm not sure why pantheon.elementary-videos was mixing gst 1 with old gst-ffmpeg. /cc #48637, #50220.

This fixes evaluation. I'm not sure why pantheon.elementary-videos was mixing gst 1 with old gst-ffmpeg. /cc NixOS#48637, NixOS#50220.

GrahamcOfBorg added 8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Nov 11, 2018

jtojnar reviewed Nov 13, 2018

View reviewed changes

jtojnar added this to To do in Picking up garbage via automation Nov 13, 2018

jtojnar moved this from To do to In progress in Picking up garbage Nov 13, 2018

pbogdan mentioned this pull request Nov 14, 2018

miro: remove #50354

Merged

9 tasks

rnhmjoj mentioned this pull request Nov 16, 2018

gnash: remove gstreamer support #50481

Merged

9 tasks

veprbl added the 2.status: merge conflict label Jan 19, 2019

infinisil added this to the 19.03 milestone Jan 26, 2019

pbogdan added 13 commits January 27, 2019 00:40

acoustid-fingerprinter: switch to ffmpeg_2

12298ba

cantata: switch to default ffmpeg

1e899e8

cfdg: switch to default ffmpeg

156b33d

renpy: switch to default ffmpeg

14133c7

ffmpegthumbnailer: switch to default ffmpeg

1e68d2f

ffms: switch to default ffmpeg

f474f51

opencv: switch to default ffmpeg

3293800

xineLib: switch to default ffmpeg

22d92d6

livepeer: ffmpeg_3 is the current default so don't override

f8d0626

avxsynth: switch to default ffmpeg

7ec7bac

baresip: switch to default ffmpeg

b8ae907

freerdp_legacy: switch to ffmpeg_2

16b8498

guvcview: switch to default ffmpeg

a17ac8c

pbogdan added 5 commits January 27, 2019 00:40

moc: switch to default ffmpeg

323ad74

spotify: switch to ffmpeg_2

336cd48

ffmpeg_1: drop

8eeecd6

gst-ffmpeg: drop

0fb0af6

ffmpeg_0: drop

c626c85

GrahamcOfBorg removed the 2.status: merge conflict label Jan 27, 2019

infinisil merged commit fede414 into NixOS:master Jan 27, 2019

Picking up garbage automation moved this from In progress to Done Jan 27, 2019

infinisil mentioned this pull request Jan 27, 2019

Drop old ffmpegs #22372

Closed

vcunat added a commit that referenced this pull request Feb 1, 2019

pantheon, aliases: remove remaining gst-ffmpeg

f55f45f

This fixes evaluation. I'm not sure why pantheon.elementary-videos was mixing gst 1 with old gst-ffmpeg. /cc #48637, #50220.

dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Feb 5, 2019

pantheon, aliases: remove remaining gst-ffmpeg

7c1cd61

This fixes evaluation. I'm not sure why pantheon.elementary-videos was mixing gst 1 with old gst-ffmpeg. /cc NixOS#48637, NixOS#50220.

pbogdan deleted the ffmpeg-cleanup branch December 3, 2019 17:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ffmpeg: misc cleanups #50220

ffmpeg: misc cleanups #50220

pbogdan commented Nov 11, 2018 •

edited

jtojnar commented Nov 13, 2018

jtojnar Nov 13, 2018

pbogdan Nov 13, 2018

jtojnar Nov 13, 2018

pbogdan Nov 13, 2018

jtojnar Nov 13, 2018

pbogdan Nov 13, 2018

Mic92 commented Nov 13, 2018

rnhmjoj commented Nov 14, 2018

Mic92 commented Nov 14, 2018

pbogdan commented Nov 14, 2018

veprbl commented Dec 12, 2018

infinisil commented Jan 26, 2019

pbogdan commented Jan 27, 2019

infinisil commented Jan 27, 2019

ffmpeg: misc cleanups #50220

ffmpeg: misc cleanups #50220

Conversation

pbogdan commented Nov 11, 2018 • edited

Motivation for this change

Things done

jtojnar commented Nov 13, 2018

jtojnar Nov 13, 2018

Choose a reason for hiding this comment

pbogdan Nov 13, 2018

Choose a reason for hiding this comment

jtojnar Nov 13, 2018

Choose a reason for hiding this comment

pbogdan Nov 13, 2018

Choose a reason for hiding this comment

jtojnar Nov 13, 2018

Choose a reason for hiding this comment

pbogdan Nov 13, 2018

Choose a reason for hiding this comment

Mic92 commented Nov 13, 2018

rnhmjoj commented Nov 14, 2018

Mic92 commented Nov 14, 2018

pbogdan commented Nov 14, 2018

veprbl commented Dec 12, 2018

infinisil commented Jan 26, 2019

pbogdan commented Jan 27, 2019

infinisil commented Jan 27, 2019

pbogdan commented Nov 11, 2018 •

edited