mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge pull request #1645 from awiouy/emby-3.2.17-8
emby: update to 3.2.17.0
This commit is contained in:
commit
679cd0482b
@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
# This file is part of LibreELEC - https://libreelec.tv
|
# 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
|
# LibreELEC is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -18,18 +18,12 @@
|
|||||||
|
|
||||||
PKG_NAME="ffmpegx"
|
PKG_NAME="ffmpegx"
|
||||||
PKG_VERSION="libreelec"
|
PKG_VERSION="libreelec"
|
||||||
PKG_REV="8"
|
PKG_REV="9"
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="LGPLv2.1+"
|
PKG_LICENSE="LGPLv2.1+"
|
||||||
PKG_SITE="https://ffmpeg.org"
|
PKG_SITE="https://ffmpeg.org"
|
||||||
PKG_DEPENDS_TARGET="toolchain ffmpeg lame x264"
|
PKG_DEPENDS_TARGET="toolchain ffmpeg lame x264"
|
||||||
PKG_SECTION="multimedia"
|
|
||||||
PKG_SHORTDESC="FFmpeg+"
|
|
||||||
PKG_LONGDESC="FFmpeg built static with additional features"
|
PKG_LONGDESC="FFmpeg built static with additional features"
|
||||||
|
|
||||||
PKG_IS_ADDON="no"
|
|
||||||
PKG_AUTORECONF="no"
|
|
||||||
|
|
||||||
pre_configure_target() {
|
pre_configure_target() {
|
||||||
cd "$ROOT/$PKG_BUILD"
|
cd "$ROOT/$PKG_BUILD"
|
||||||
rm -rf ".$TARGET_NAME"
|
rm -rf ".$TARGET_NAME"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
# This file is part of LibreELEC - https://libreelec.tv
|
# 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
|
# LibreELEC is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -17,20 +17,14 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="imagemagick"
|
PKG_NAME="imagemagick"
|
||||||
PKG_VERSION="7.0.5-0"
|
PKG_VERSION="7.0.5-7"
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="http://www.imagemagick.org/script/license.php"
|
PKG_LICENSE="http://www.imagemagick.org/script/license.php"
|
||||||
PKG_SITE="http://www.imagemagick.org/"
|
PKG_SITE="http://www.imagemagick.org/"
|
||||||
PKG_URL="http://www.imagemagick.org/download/releases/ImageMagick-$PKG_VERSION.tar.xz"
|
PKG_URL="http://www.imagemagick.org/download/releases/ImageMagick-$PKG_VERSION.tar.xz"
|
||||||
PKG_SOURCE_DIR="ImageMagick-$PKG_VERSION"
|
PKG_SOURCE_DIR="ImageMagick-$PKG_VERSION"
|
||||||
PKG_DEPENDS_TARGET="toolchain libX11"
|
PKG_DEPENDS_TARGET="toolchain libX11"
|
||||||
PKG_SECTION="graphics"
|
|
||||||
PKG_SHORTDESC="ImageMagick"
|
|
||||||
PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images"
|
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 \
|
PKG_CONFIGURE_OPTS_TARGET="--enable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--with-quantum-depth=8 \
|
--with-quantum-depth=8 \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
# This file is part of LibreELEC - https://libreelec.tv
|
# 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
|
# LibreELEC is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -17,19 +17,13 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="x264"
|
PKG_NAME="x264"
|
||||||
PKG_VERSION="snapshot-20170327-2245-stable"
|
PKG_VERSION="snapshot-20170524-2245-stable"
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.videolan.org/developers/x264.html"
|
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="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
PKG_DEPENDS_TARGET="toolchain"
|
PKG_DEPENDS_TARGET="toolchain"
|
||||||
PKG_SECTION="multimedia"
|
|
||||||
PKG_SHORTDESC="x264"
|
|
||||||
PKG_LONGDESC="x264"
|
PKG_LONGDESC="x264"
|
||||||
|
|
||||||
PKG_IS_ADDON="no"
|
|
||||||
PKG_AUTORECONF="no"
|
|
||||||
|
|
||||||
pre_configure_target() {
|
pre_configure_target() {
|
||||||
cd $ROOT/$PKG_BUILD
|
cd $ROOT/$PKG_BUILD
|
||||||
rm -rf .$TARGET_NAME
|
rm -rf .$TARGET_NAME
|
||||||
|
@ -1,52 +1,56 @@
|
|||||||
113
|
114:
|
||||||
- Updated to version 3.2.8
|
- Update to version 3.2.17.0
|
||||||
- Rebuilt x264 and ffmpegx
|
- 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
|
- Refer to libMagickWand-7
|
||||||
|
|
||||||
111
|
111:
|
||||||
- Updated to version 3.2.5
|
- Updated to version 3.2.5
|
||||||
- Rebuilt libx264, ffmpegx and imagemagick
|
- Rebuild libx264, ffmpegx and imagemagick
|
||||||
|
|
||||||
110
|
110:
|
||||||
- Rebuild ffmpegx with libx264
|
- Rebuild ffmpegx with libx264
|
||||||
|
|
||||||
109
|
109:
|
||||||
- Rebuilt ffmpgex and imagemagick
|
- Rebuild ffmpgex and imagemagick
|
||||||
|
|
||||||
108
|
108:
|
||||||
- Updated to version 3.0.8500
|
- Update to version 3.0.8500
|
||||||
|
|
||||||
|
107:
|
||||||
|
- Update to version 3.0.8300
|
||||||
|
- Rebuild ffmpegx
|
||||||
|
|
||||||
107
|
106:
|
||||||
- Updated to version 3.0.8300
|
- Updat to version 3.0.8100
|
||||||
- Rebuilt ffmpegx
|
- Rebuild ffmpegx
|
||||||
|
|
||||||
106
|
105:
|
||||||
- Updated to version 3.0.8100
|
- Update to version 3.0.7100
|
||||||
- Rebuilt ffmpegx
|
|
||||||
|
|
||||||
105
|
104:
|
||||||
- Updated to version 3.0.7100
|
- Update to version 3.0.6300
|
||||||
|
- Rebuild ffmpegx
|
||||||
|
|
||||||
104
|
103:
|
||||||
- Updated to version 3.0.6300
|
- Update to version 3.0.6070
|
||||||
- Rebuilt ffmpegx
|
|
||||||
|
|
||||||
103
|
|
||||||
- Updated to version 3.0.6070
|
|
||||||
- Build for all architectures
|
- Build for all architectures
|
||||||
- Refer to libsqlite3.so.0 instead of libsqlite3.so
|
- Refer to libsqlite3.so.0 instead of libsqlite3.so
|
||||||
|
|
||||||
102
|
102:
|
||||||
- Updated to version 3.0.6030
|
- Update to version 3.0.6030
|
||||||
- Added dedicated ffmpeg and ffprobe
|
- Add dedicated ffmpeg and ffprobe
|
||||||
- Removed unused shared libraries
|
- Remove unused shared libraries
|
||||||
|
|
||||||
101
|
101:
|
||||||
- Updated to version 3.0.5985
|
- Update to version 3.0.5985
|
||||||
- Removed mono build dependency
|
- Removed mono build dependency
|
||||||
|
|
||||||
100
|
100:
|
||||||
- Initial release
|
- Initial release
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
# This file is part of LibreELEC - https://libreelec.tv
|
# 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
|
# LibreELEC is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -17,9 +17,8 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="emby"
|
PKG_NAME="emby"
|
||||||
PKG_VERSION="3.2.8"
|
PKG_VERSION="3.2.17.0"
|
||||||
PKG_REV="113"
|
PKG_REV="114"
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
PKG_SITE="http://emby.media"
|
PKG_SITE="http://emby.media"
|
||||||
PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
|
PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
|
||||||
|
@ -23,7 +23,7 @@ oe_setup_addon service.emby
|
|||||||
chmod +x $ADDON_DIR/bin/*
|
chmod +x $ADDON_DIR/bin/*
|
||||||
mkdir -p $ADDON_HOME
|
mkdir -p $ADDON_HOME
|
||||||
|
|
||||||
if [ "$emby_ffmpeg" = "true" ]
|
if [ "$emby_ffmpeg" != "false" ]
|
||||||
then
|
then
|
||||||
emby_flags="-ffmpeg $ADDON_DIR/bin/ffmpegx -ffprobe $ADDON_DIR/bin/ffprobex"
|
emby_flags="-ffmpeg $ADDON_DIR/bin/ffmpegx -ffprobe $ADDON_DIR/bin/ffprobex"
|
||||||
fi
|
fi
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||||
<settings>
|
<settings>
|
||||||
<category label="30000">
|
<category label="30000">
|
||||||
<setting label="30001" id="emby_ffmpeg" type="bool" default="false" />
|
<setting label="30001" id="emby_ffmpeg" type="bool" default="true" />
|
||||||
</category>
|
</category>
|
||||||
</settings>
|
</settings>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user