Merge pull request #2510 from CvH/9.0-ffmpeg-addon

ffmpeg addon and emby integration

packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="libvpx"
-PKG_VERSION="1.6.1"
-PKG_SHA256="cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588"
+PKG_VERSION="1.7.0"
+PKG_SHA256="1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"

packages/addons/addon-depends/ffmpegx-depends/x264/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20171015-2245"
-PKG_SHA256="0a1fb77545821285227bcbd85244e127af5e45180298d3f2c27dcec42a133992"
+PKG_VERSION="snapshot-20180220-2245"
+PKG_SHA256="80090285b40983776793168a3828dfd8125caca06cb6949511d64946d6166882"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"

packages/addons/addon-depends/ffmpegx-depends/x265/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="x265"
-PKG_VERSION="2.5"
-PKG_SHA256="a5607edead00e9ba90ca222c4a6e93c1f4db76e9f04a4905a96f21fbdb7d626d"
+PKG_VERSION="2.7"
+PKG_SHA256="1a731cd6e70ca26a332bb42f089da2eedfc16f606653140bef8ff48c9042a274"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/videolan/x265"

packages/addons/addon-depends/ffmpegx/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="ffmpegx"
-PKG_VERSION="3.4"
-PKG_SHA256="2865712ead48b9e5939c1eb23c409c8f1d60e49bc6434ca489271ea677c81adc"
+PKG_VERSION="3.4.2"
+PKG_SHA256="d079c68dc19a0223239a152ffc2b67ef1e9d3144e4d2c2563380dc59dccf33e5"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
@@ -121,6 +121,16 @@ pre_configure_target() {
     --enable-libvorbis \
     --enable-encoder=libvorbis"
 
+# X11 grab for screen recording
+  if [ "$DISPLAYSERVER" = "x11" ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libxcb"
+    PKG_FFMPEG_LIBS="$PKG_FFMPEG_LIBS -lX11"
+    PKG_FFMPEG_X11_GRAB="\
+    --enable-libxcb \
+    --enable-libxcb-shm \
+    --enable-libxcb-xfixes \
+    --enable-libxcb-shape"
+  fi
 }
 
 configure_target() {
@@ -151,6 +161,7 @@ configure_target() {
     --enable-avresample \
     --disable-lzma \
     --disable-alsa \
+    $PKG_FFMPEG_X11_GRAB \
     \
     `#Toolchain options` \
     --arch="$TARGET_ARCH" \

packages/addons/service/emby/changelog.txt

@@ -1,3 +1,7 @@
+118
+- Update to 3.3.0.0
+- Moved ffmpegx to ffmpeg-tools add-on
+
 117
 - Update to 3.2.34.0
 - Use reworked ffmpegx

packages/addons/service/emby/package.mk

@@ -17,14 +17,14 @@
 ################################################################################
 
 PKG_NAME="emby"
-PKG_VERSION="3.2.34.0"
-PKG_SHA256="85a1bf1d88321063f3c01d84e43226c45418126ec4b4c1e05ea7b53f1152bd81"
-PKG_REV="117"
+PKG_VERSION="3.3.0.0"
+PKG_SHA256="15ca0835d939dbd2ac730bafa1377276c3a63854fd6a2ace8ff02dd439cdd692"
+PKG_REV="118"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
 PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
-PKG_DEPENDS_TARGET="toolchain ffmpegx imagemagick"
+PKG_DEPENDS_TARGET="toolchain imagemagick"
 PKG_SECTION="service"
 PKG_SHORTDESC="Emby Server: a personal media server"
 PKG_LONGDESC="Emby Server ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device"
@@ -33,7 +33,7 @@ PKG_TOOLCHAIN="manual"
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby Server"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_REQUIRES="tools.mono:0.0.0"
+PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.mono:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 unpack() {
@@ -51,11 +51,6 @@ addon() {
   sed -i 's/libsqlite3.so/libsqlite3.so.0/g' \
       $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono/SQLitePCLRaw.provider.sqlite3.dll.config
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -L $(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/bin/ffmpegx  \
-        $(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/bin/ffprobex \
-        $ADDON_BUILD/$PKG_ADDON_ID/bin/
-
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-7.Q8.so.? \
         $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-7.Q8.so   \

packages/addons/service/emby/source/bin/emby.start

@@ -1,7 +1,7 @@
 #!/bin/sh
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ mkdir -p $ADDON_HOME
 
 if [ "$emby_ffmpeg" != "false" ]
 then
-  emby_flags="-ffmpeg $ADDON_DIR/bin/ffmpegx -ffprobe $ADDON_DIR/bin/ffprobex"
+  emby_flags="-ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpegx -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobex"
 fi
 
 mono $ADDON_DIR/Emby.Mono/MediaBrowser.Server.Mono.exe -programdata $ADDON_HOME \

packages/addons/service/emby/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

packages/addons/service/emby/source/resources/language/English/strings.po

@@ -1,4 +1,7 @@
 # Kodi Media Center language file
+# Addon Name: emby
+# Addon id: service.emby
+# Addon Provider: Team LibreELEC
 msgid ""
 msgstr ""
 
@@ -7,5 +10,5 @@ msgid "Configuration"
 msgstr ""
 
 msgctxt "#30001"
-msgid "Use dedicated ffmpeg/ffprobe (experimental)"
+msgid "Use dedicated ffmpeg/ffprobe"
 msgstr ""

packages/addons/tools/ffmpeg-tools/changelog.txt

@@ -0,0 +1,2 @@
+100
+- Initial release

packages/addons/tools/ffmpeg-tools/package.mk

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="ffmpeg-tools"
+PKG_VERSION="1.0"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://libreelec.tv"
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain ffmpegx"
+PKG_SECTION="tools"
+PKG_SHORTDESC="FFmpeg binary for transcoding and audio/video manipulating."
+PKG_TOOLCHAIN="manual"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="FFmpeg Tools"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  cp -L $(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin
+}

packages/addons/tools/ffmpeg-tools/source/default.py

@@ -0,0 +1,25 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+import xbmcaddon
+import xbmcgui
+
+dialog = xbmcgui.Dialog()
+strings  = xbmcaddon.Addon().getLocalizedString
+
+dialog.ok(strings(30000), strings(30001))

packages/addons/tools/ffmpeg-tools/source/resources/language/English/strings.po

@@ -0,0 +1,14 @@
+# Kodi Media Center language file
+# Addon Name: ffmpeg-tools
+# Addon id: tools.ffmpeg-tools
+# Addon Provider: Team LibreELEC
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "FFmpeg Tools Help"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Please have a look at our Wiki (https://libreelec.wiki) for instructions how the FFmpeg binary could be used."
+msgstr ""