diff --git a/build/config b/build/config index 769133f..423d1a2 100644 --- a/build/config +++ b/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 -} \ No newline at end of file +} diff --git a/build/make/encoders.mk b/build/make/encoders.mk deleted file mode 100644 index d65a374..0000000 --- a/build/make/encoders.mk +++ /dev/null @@ -1,2 +0,0 @@ -encoders: compile - $(call script,$@) \ No newline at end of file diff --git a/build/make/ffmpeg.mk b/build/make/ffmpeg.mk index 6713305..e64f9e5 100644 --- a/build/make/ffmpeg.mk +++ b/build/make/ffmpeg.mk @@ -1,2 +1,2 @@ -ffmpeg: - $(call script,ffmpeg) \ No newline at end of file +ffmpeg: compile + $(call script,ffmpeg) diff --git a/build/make/handbrake.mk b/build/make/handbrake.mk new file mode 100644 index 0000000..c4daed6 --- /dev/null +++ b/build/make/handbrake.mk @@ -0,0 +1,2 @@ +handbrake: multimedia + $(call script,$@) diff --git a/build/make/headphones.mk b/build/make/headphones.mk index cad16e3..ea135ad 100644 --- a/build/make/headphones.mk +++ b/build/make/headphones.mk @@ -1,4 +1,4 @@ -headphones: base encoders ffmpeg +headphones: base transcoder ffmpeg $(call script,$@) $(call boot,02,$@) - $(call runit,$@) \ No newline at end of file + $(call runit,$@) diff --git a/build/make/kodi.mk b/build/make/kodi.mk index ce49807..b63d475 100644 --- a/build/make/kodi.mk +++ b/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,$@) \ No newline at end of file + $(call runit,$@) diff --git a/build/make/multimedia.mk b/build/make/multimedia.mk new file mode 100644 index 0000000..a6d780c --- /dev/null +++ b/build/make/multimedia.mk @@ -0,0 +1,2 @@ +multimedia: + $(call script,$@) diff --git a/build/make/rar.mk b/build/make/rar.mk new file mode 100644 index 0000000..f2c6cf1 --- /dev/null +++ b/build/make/rar.mk @@ -0,0 +1,3 @@ +rar: + $(call script,utilities) + $(call script,$@) diff --git a/build/make/sabnzbd.mk b/build/make/sabnzbd.mk index 03114e8..adb4e1b 100644 --- a/build/make/sabnzbd.mk +++ b/build/make/sabnzbd.mk @@ -1,4 +1,4 @@ -sabnzbd: base +sabnzbd: base rar $(call script,$@) $(call boot,02,$@) - $(call runit,$@) \ No newline at end of file + $(call runit,$@) diff --git a/build/make/transcoder.mk b/build/make/transcoder.mk new file mode 100644 index 0000000..886a531 --- /dev/null +++ b/build/make/transcoder.mk @@ -0,0 +1,2 @@ +transcoder: rar handbrake + $(call script,$@) diff --git a/build/scripts/handbrake.sh b/build/scripts/handbrake.sh new file mode 100644 index 0000000..8e65fec --- /dev/null +++ b/build/scripts/handbrake.sh @@ -0,0 +1,2 @@ +# Handbrake +apt_install_permanent --force-yes handbrake-cli diff --git a/build/scripts/encoders.sh b/build/scripts/multimedia.sh similarity index 62% rename from build/scripts/encoders.sh rename to build/scripts/multimedia.sh index 635faae..805c4c3 100644 --- a/build/scripts/encoders.sh +++ b/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 \ No newline at end of file diff --git a/build/scripts/rar.sh b/build/scripts/rar.sh new file mode 100644 index 0000000..2e823f4 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/build/scripts/sabnzbd.sh b/build/scripts/sabnzbd.sh index 26359dc..caad1a1 100644 --- a/build/scripts/sabnzbd.sh +++ b/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 diff --git a/build/scripts/transcoder.sh b/build/scripts/transcoder.sh new file mode 100644 index 0000000..8fc275f --- /dev/null +++ b/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 diff --git a/build/scripts/utilities.sh b/build/scripts/utilities.sh index cb06ed5..59bacd1 100644 --- a/build/scripts/utilities.sh +++ b/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 \ No newline at end of file +pip install argparse