rearrange encoder/transcoder/multimedia parts in various containers

build/config

@@ -1,7 +1,7 @@
 export LC_ALL=C
 export DEBIAN_FRONTEND=noninteractive
 
-apt_install='apt-get install -y --no-install-recommends'
+apt_install='apt-get install -y --no-install-recommends --force-yes'
 
 apt_install_permanent() {
     echo $@ | tr ' ' '\n' >> /build/permanent
@@ -30,4 +30,4 @@ export_container_environment() {
     for file in /etc/container_environment/*; do
         export $(basename $file)="$(cat $file)";
     done
-}
+}

build/make/encoders.mk

@@ -1,2 +0,0 @@
-encoders: compile
-	$(call script,$@)

build/make/ffmpeg.mk

@@ -1,2 +1,2 @@
-ffmpeg:
-	$(call script,ffmpeg)
+ffmpeg: compile
+	$(call script,ffmpeg)

build/make/handbrake.mk

@@ -0,0 +1,2 @@
+handbrake: multimedia
+	$(call script,$@)

build/make/headphones.mk

@@ -1,4 +1,4 @@
-headphones: base encoders ffmpeg
+headphones: base transcoder ffmpeg
 	$(call script,$@)
 	$(call boot,02,$@)
-	$(call runit,$@)
+	$(call runit,$@)

build/make/kodi.mk

@@ -1,4 +1,4 @@
-kodi: base encoders ffmpeg
+kodi: base compile transcoder ffmpeg
 	$(call aux,headless.patch)
 	$(call script,$@)
-	$(call runit,$@)
+	$(call runit,$@)

build/make/multimedia.mk

@@ -0,0 +1,2 @@
+multimedia:
+	$(call script,$@)

build/make/rar.mk

@@ -0,0 +1,3 @@
+rar:
+	$(call script,utilities)
+	$(call script,$@)

build/make/sabnzbd.mk

@@ -1,4 +1,4 @@
-sabnzbd: base
+sabnzbd: base rar
 	$(call script,$@)
 	$(call boot,02,$@)
-	$(call runit,$@)
+	$(call runit,$@)

build/make/transcoder.mk

@@ -0,0 +1,2 @@
+transcoder: rar handbrake
+	$(call script,$@)

build/scripts/handbrake.sh

@@ -0,0 +1,2 @@
+# Handbrake
+apt_install_permanent --force-yes handbrake-cli

build/scripts/multimedia.sh

@@ -3,6 +3,3 @@ echo 'deb http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/source
 echo 'deb-src http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list
 apt update
 apt_install_permanent --force-yes deb-multimedia-keyring
-
-## Encoders
-apt_install_permanent --force-yes libmp3lame0 libavcodec-extra* libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev libopenjpeg-dev libx264-* libfaac-dev 

build/scripts/rar.sh

@@ -0,0 +1,15 @@
+## Environment
+export_env RAR_VERSION 5.4.0
+
+## Rar
+cd /opt
+wget http://www.rarlab.com/rar/rarlinux-x64-$RAR_VERSION.tar.gz
+tar xzf rarlinux-x64-$RAR_VERSION.tar.gz
+ln -s /opt/rar/rar /usr/bin
+
+
+## Remove installation files
+if [ $MODE == "minimal" ]; then
+    cd /opt
+    rm rarlinux-x64-$RAR_VERSION.tar.gz
+fi

build/scripts/sabnzbd.sh

@@ -1,5 +1,4 @@
 ## Environment
-export_env RAR_VERSION 5.4.0
 export_env SABNZBD_CONFIG /host/etc/sabnzbd/sabnzbd.ini
 export_env SABNZBD_DATA /host/var/lib/sabnzbd
 
@@ -12,11 +11,5 @@ apt_install_permanent sabnzbdplus
 ## Utilities
 apt_install_permanent unzip par2 python-openssl python-yenc
 
-## Rar
-cd /opt
-wget http://www.rarlab.com/rar/rarlinux-x64-$RAR_VERSION.tar.gz
-tar xzf rarlinux-x64-$RAR_VERSION.tar.gz
-ln -s /opt/rar/rar /usr/bin
-
 ## 7zip
 apt_install_permanent p7zip-full

build/scripts/transcoder.sh

@@ -0,0 +1,19 @@
+## Environment
+export_env LIBDVDCSS_VERSION 1.2.13
+
+## LibDVDCSS
+cd /opt
+wget http://download.videolan.org/pub/debian/stable/libdvdcss2_$LIBDVDCSS_VERSION-0_amd64.deb
+dpkg -i libdvdcss2_$LIBDVDCSS_VERSION-0_amd64.deb
+
+## DVD
+apt_install_permanent vobcopy
+
+## Audio
+apt_install_permanent --force-yes libmp3lame0 libavcodec-extra* libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev libopenjpeg-dev libx264-* libfaac-dev 
+
+## Remove installation files
+if [ $MODE == "minimal" ]; then
+    cd /opt
+    rm libdvdcss2_$LIBDVDCSS_VERSION-0_amd64.deb
+fi

build/scripts/utilities.sh

@@ -1,5 +1,5 @@
 ## Often used tools
-apt_install_permanent psmisc wget curl python-pip git gawk zip gperf unzip bzip2 inetutils-ping inetutils-telnet rsync
+apt_install_permanent software-properties-common psmisc wget curl python-pip git gawk zip gperf unzip bzip2 inetutils-ping inetutils-telnet rsync
 
 ## Often used python modules
-pip install argparse
+pip install argparse