Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5a6981654bad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b610d814e09
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 1, 2020

  1. mplayer: allow enabling v4l2 driver for e.g webcams 

    - add flag for enabling v4l2 support for the tv backend
- required for some webcams
- off by default as no other package seems to be relying on it so far
    @schmittlauch
    schmittlauch committed Oct 1, 2020
    Copy the full SHA
    5204792 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #99210 from schmittlauch/mplayer-v4l 

    mplayer: allow enabling v4l2 driver for e.g webcams
    @Mic92
    Mic92 authored Nov 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4b610d8 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/applications/video/mplayer/default.nix
4 changes: 4 additions & 0 deletions pkgs/applications/video/mplayer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
, jackaudioSupport ? false, libjack2 ? null
, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
, v4lSupport ? false, libv4l ? null
# For screenshots
, libpngSupport ? true, libpng ? null
, libjpegSupport ? true, libjpeg ? null
@@ -53,6 +54,7 @@ assert pulseSupport -> libpulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
assert libjpegSupport -> libjpeg != null;
assert v4lSupport -> libv4l != null;

let

@@ -132,6 +134,7 @@ stdenv.mkDerivation rec {
++ optional libpngSupport libpng
++ optional libjpegSupport libjpeg
++ optional bs2bSupport libbs2b
++ optional v4lSupport libv4l
++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ])
;

@@ -156,6 +159,7 @@ stdenv.mkDerivation rec {
(if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc")
(if jackaudioSupport then "" else "--disable-jack")
(if pulseSupport then "--enable-pulse" else "--disable-pulse")
(if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2")
"--disable-xanim"
"--disable-ivtv"
"--disable-xvid --disable-xvid-lavc"