From 4e9fbb01fba31819dcc6093eb82a4d3e3e29b218 Mon Sep 17 00:00:00 2001 From: awiouy Date: Thu, 25 May 2017 18:38:09 +0200 Subject: [PATCH 1/4] ffmpegx: rebuild --- .../addon-depends/emby-depends/ffmpegx/package.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk index 353d507137..75f4263cd0 100644 --- a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk @@ -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 @@ -18,18 +18,12 @@ PKG_NAME="ffmpegx" PKG_VERSION="libreelec" -PKG_REV="8" -PKG_ARCH="any" +PKG_REV="9" PKG_LICENSE="LGPLv2.1+" PKG_SITE="https://ffmpeg.org" PKG_DEPENDS_TARGET="toolchain ffmpeg lame x264" -PKG_SECTION="multimedia" -PKG_SHORTDESC="FFmpeg+" PKG_LONGDESC="FFmpeg built static with additional features" -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - pre_configure_target() { cd "$ROOT/$PKG_BUILD" rm -rf ".$TARGET_NAME" From e5b2ea3244081e7eff40042db1dd3c635b00ad5f Mon Sep 17 00:00:00 2001 From: awiouy Date: Thu, 25 May 2017 18:39:06 +0200 Subject: [PATCH 2/4] imagemagick: update to 7.0.5-7 --- .../addon-depends/emby-depends/imagemagick/package.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk b/packages/addons/addon-depends/emby-depends/imagemagick/package.mk index 9ce6fa8a2d..848a5fd039 100644 --- a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk +++ b/packages/addons/addon-depends/emby-depends/imagemagick/package.mk @@ -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 @@ -17,20 +17,14 @@ ################################################################################ PKG_NAME="imagemagick" -PKG_VERSION="7.0.5-0" -PKG_ARCH="any" +PKG_VERSION="7.0.5-7" PKG_LICENSE="http://www.imagemagick.org/script/license.php" PKG_SITE="http://www.imagemagick.org/" PKG_URL="http://www.imagemagick.org/download/releases/ImageMagick-$PKG_VERSION.tar.xz" PKG_SOURCE_DIR="ImageMagick-$PKG_VERSION" PKG_DEPENDS_TARGET="toolchain libX11" -PKG_SECTION="graphics" -PKG_SHORTDESC="ImageMagick" PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images" -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --enable-shared \ --with-quantum-depth=8 \ From 9dc1f5d16838766a76a1f5923cdc7ca55ee23227 Mon Sep 17 00:00:00 2001 From: awiouy Date: Thu, 25 May 2017 18:39:55 +0200 Subject: [PATCH 3/4] x264: update to snapshot-20170524-2245-stable --- .../addons/addon-depends/emby-depends/x264/package.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/addons/addon-depends/emby-depends/x264/package.mk b/packages/addons/addon-depends/emby-depends/x264/package.mk index 459b53d867..94b20857bf 100644 --- a/packages/addons/addon-depends/emby-depends/x264/package.mk +++ b/packages/addons/addon-depends/emby-depends/x264/package.mk @@ -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 @@ -17,19 +17,13 @@ ################################################################################ PKG_NAME="x264" -PKG_VERSION="snapshot-20170327-2245-stable" -PKG_ARCH="any" +PKG_VERSION="snapshot-20170524-2245-stable" 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_DEPENDS_TARGET="toolchain" -PKG_SECTION="multimedia" -PKG_SHORTDESC="x264" PKG_LONGDESC="x264" -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - pre_configure_target() { cd $ROOT/$PKG_BUILD rm -rf .$TARGET_NAME From fd382b974323afad92336586d5462f2d3b5cc9e4 Mon Sep 17 00:00:00 2001 From: awiouy Date: Thu, 25 May 2017 18:55:00 +0200 Subject: [PATCH 4/4] emby: update to 3.2.17.0 --- packages/addons/service/emby/changelog.txt | 68 ++++++++++--------- packages/addons/service/emby/package.mk | 7 +- .../addons/service/emby/source/bin/emby.start | 2 +- .../emby/source/resources/settings.xml | 2 +- 4 files changed, 41 insertions(+), 38 deletions(-) diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt index 552cab71ea..b8448939f9 100644 --- a/packages/addons/service/emby/changelog.txt +++ b/packages/addons/service/emby/changelog.txt @@ -1,52 +1,56 @@ -113 -- Updated to version 3.2.8 -- Rebuilt x264 and ffmpegx +114: +- Update to version 3.2.17.0 +- Rebuild libx264, ffmpegx and imagemagick +- Use ffmpgex by default -112 +113: +- Update to version 3.2.8 +- Rebuild x264 and ffmpegx + +112: - Refer to libMagickWand-7 -111 +111: - Updated to version 3.2.5 -- Rebuilt libx264, ffmpegx and imagemagick +- Rebuild libx264, ffmpegx and imagemagick -110 +110: - Rebuild ffmpegx with libx264 -109 -- Rebuilt ffmpgex and imagemagick +109: +- Rebuild ffmpgex and imagemagick -108 -- Updated to version 3.0.8500 +108: +- Update to version 3.0.8500 +107: +- Update to version 3.0.8300 +- Rebuild ffmpegx -107 -- Updated to version 3.0.8300 -- Rebuilt ffmpegx +106: +- Updat to version 3.0.8100 +- Rebuild ffmpegx -106 -- Updated to version 3.0.8100 -- Rebuilt ffmpegx +105: +- Update to version 3.0.7100 -105 -- Updated to version 3.0.7100 +104: +- Update to version 3.0.6300 +- Rebuild ffmpegx -104 -- Updated to version 3.0.6300 -- Rebuilt ffmpegx - -103 -- Updated to version 3.0.6070 +103: +- Update to version 3.0.6070 - Build for all architectures - Refer to libsqlite3.so.0 instead of libsqlite3.so -102 -- Updated to version 3.0.6030 -- Added dedicated ffmpeg and ffprobe -- Removed unused shared libraries +102: +- Update to version 3.0.6030 +- Add dedicated ffmpeg and ffprobe +- Remove unused shared libraries -101 -- Updated to version 3.0.5985 +101: +- Update to version 3.0.5985 - Removed mono build dependency -100 +100: - Initial release diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk index 1057f6c612..7b6aaa31f7 100644 --- a/packages/addons/service/emby/package.mk +++ b/packages/addons/service/emby/package.mk @@ -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 @@ -17,9 +17,8 @@ ################################################################################ PKG_NAME="emby" -PKG_VERSION="3.2.8" -PKG_REV="113" -PKG_ARCH="any" +PKG_VERSION="3.2.17.0" +PKG_REV="114" PKG_LICENSE="OSS" PKG_SITE="http://emby.media" PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip" diff --git a/packages/addons/service/emby/source/bin/emby.start b/packages/addons/service/emby/source/bin/emby.start index 9caee9e7cc..319a8853e7 100644 --- a/packages/addons/service/emby/source/bin/emby.start +++ b/packages/addons/service/emby/source/bin/emby.start @@ -23,7 +23,7 @@ oe_setup_addon service.emby chmod +x $ADDON_DIR/bin/* mkdir -p $ADDON_HOME -if [ "$emby_ffmpeg" = "true" ] +if [ "$emby_ffmpeg" != "false" ] then emby_flags="-ffmpeg $ADDON_DIR/bin/ffmpegx -ffprobe $ADDON_DIR/bin/ffprobex" fi diff --git a/packages/addons/service/emby/source/resources/settings.xml b/packages/addons/service/emby/source/resources/settings.xml index d213cf69e2..0d08d8d297 100644 --- a/packages/addons/service/emby/source/resources/settings.xml +++ b/packages/addons/service/emby/source/resources/settings.xml @@ -1,6 +1,6 @@ - +