From 78b04c425b3186833bddd4b4df0d318632fef863 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 15 Apr 2017 18:18:26 +0200
Subject: [PATCH] Add multimedia config to ansible script.

---
 ansible/config.yml                    | 5 +++++
 ansible/files/apt-mark/multimedia     | 5 +++++
 ansible/files/apt-mark/various_useful | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 ansible/files/apt-mark/multimedia

diff --git a/ansible/config.yml b/ansible/config.yml
index a546c53..9167ee8 100644
--- a/ansible/config.yml
+++ b/ansible/config.yml
@@ -80,6 +80,11 @@
     apt: name={{item}} state=present
     with_lines: cat ~/config/ansible/files/apt-mark/browser_environment | sed -e 's/ *#.*$//'
 
+  # Ensure audio/video consumption necessities.
+  - name: ensure multimedia tools
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/multimedia | sed -e 's/ *#.*$//'
+
   # Remove undesired packages
   - name: collect desired packages
     shell: cat files/apt-mark/*  | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted
diff --git a/ansible/files/apt-mark/multimedia b/ansible/files/apt-mark/multimedia
new file mode 100644
index 0000000..6616bbb
--- /dev/null
+++ b/ansible/files/apt-mark/multimedia
@@ -0,0 +1,5 @@
+alsa-utils
+ffmpeg  # somehow this is needed to make youtube-dl grab 1080p versions of videos
+libdvd-pkg  # decss stuff
+mpv
+youtube-dl  # needed by mpv to directly work YouTube URLs
diff --git a/ansible/files/apt-mark/various_useful b/ansible/files/apt-mark/various_useful
index c1ab0c4..e37a898 100644
--- a/ansible/files/apt-mark/various_useful
+++ b/ansible/files/apt-mark/various_useful
@@ -1,4 +1,3 @@
-alsa-utils
 git
 less
 openssh-client
-- 
2.30.2