Merge pull request #2143 from CvH/9.0-ffmpegx-emby

FFmpegx rework for Emby update
LibreELEC · Nov 13, 2017 · d3a878e · d3a878e
2 parents cf3baeb + b8cf560
commit d3a878e
Show file tree

Hide file tree

Showing 10 changed files with 337 additions and 130 deletions.
diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
diff --git a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk b/packages/addons/addon-depends/emby-depends/imagemagick/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="imagemagick"
-PKG_VERSION="7.0.5-0"
-PKG_SHA256="f2c0e316069df630e42f63a635068ed943fb3d371627ec9989c3b460b69e2758"
+PKG_VERSION="7.0.7-1"
+PKG_SHA256="5a45e29509dbb23793a9c8db5c47ef1114c1ee82c9ca60053eaf06b3fc243e2c"
 PKG_ARCH="any"
 PKG_LICENSE="http://www.imagemagick.org/script/license.php"
 PKG_SITE="http://www.imagemagick.org/"

diff --git a/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk b/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk
@@ -0,0 +1,29 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-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="fdk-aac"
+PKG_VERSION="0.1.5"
+PKG_SHA256="ff53d1d01cacc29c071e23192dfefa93bdbeaf775fc5d296259b4859d0306b79"
+PKG_ARCH="any"
+PKG_LICENSE="other"
+PKG_SITE="https://sourceforge.net/projects/opencore-amr/"
+PKG_URL="https://github.com/mstorsjo/fdk-aac/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="multimedia"
+PKG_LONGDESC="A standalone library of the Fraunhofer FDK AAC code from Android."
+PKG_AUTORECONF="yes"
diff --git a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk
@@ -0,0 +1,62 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      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
+#  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="libvpx"
+PKG_VERSION="1.6.1"
+PKG_SHA256="cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="https://www.webmproject.org"
+PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain yasm:host"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="WebM VP8/VP9 Codec SDK"
+PKG_LONGDESC="The WebM Project is dedicated to developing a high-quality, open video format for the web that's freely available to everyone."
+PKG_AUTORECONF="no"
+
+configure_target() {
+
+  case $ARCH in
+    aarch64)
+      PKG_TARGET_NAME_LIBVPX="arm64-linux-gcc"
+      ;;
+    arm)
+      PKG_TARGET_NAME_LIBVPX="armv7-linux-gcc"
+      ;;
+    x86_64)
+      PKG_TARGET_NAME_LIBVPX="x86_64-linux-gcc"
+      ;;
+  esac
+
+  $PKG_CONFIGURE_SCRIPT --prefix=/usr \
+                        --extra-cflags="$CFLAGS" \
+                        --as=yasm \
+                        --target=$PKG_TARGET_NAME_LIBVPX \
+                        --disable-docs \
+                        --disable-examples \
+                        --disable-shared \
+                        --disable-tools \
+                        --disable-unit-tests \
+                        --disable-vp8-decoder \
+                        --disable-vp9-decoder \
+                        --enable-ccache \
+                        --enable-pic \
+                        --enable-static \
+                        --enable-vp8 \
+                        --enable-vp9
+}
diff --git a/...ddon-depends/emby-depends/x264/package.mk → ...n-depends/ffmpegx-depends/x264/package.mk b/...ddon-depends/emby-depends/x264/package.mk → ...n-depends/ffmpegx-depends/x264/package.mk
@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20170327-2245-stable"
-PKG_SHA256="b96a858a35e36a9248d73f710aeb5ea0f26805517d276a347915fb2d6f3f8550"
+PKG_VERSION="snapshot-20171015-2245"
+PKG_SHA256="0a1fb77545821285227bcbd85244e127af5e45180298d3f2c27dcec42a133992"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
-PKG_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://download.videolan.org/x264/snapshots/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="x264"

diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-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="x265"
+PKG_VERSION="2.5"
+PKG_SHA256="a5607edead00e9ba90ca222c4a6e93c1f4db76e9f04a4905a96f21fbdb7d626d"
+PKG_ARCH="x86_64"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/videolan/x265"
+PKG_URL="https://github.com/videolan/x265/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="multimedia"
+PKG_LONGDESC="x265 is a H.265/HEVC video encoder application library"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  LDFLAGS="$LDFLAGS -ldl"
+  cmake -G "Unix Makefiles" ./source
+}