From a7dbba8c5a53c178ffe9dbce19ccc9ccf0995160 Mon Sep 17 00:00:00 2001 From: awiouy Date: Fri, 9 Dec 2016 09:48:05 +0100 Subject: [PATCH 1/3] ffmpegx: build with x264 for aarch64 --- .../addons/addon-depends/emby-depends/ffmpegx/package.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk index 3130204d05..7245e7afc6 100644 --- a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk @@ -46,11 +46,6 @@ pre_configure_target() { FFMPEG_RPI_HADE="--enable-mmal --enable-omx-rpi" fi -# ffmpeg does not build with libx264 on aarch64 - if [ "$TARGET_ARCH" != "aarch64" ]; then - FFMPEG_X264="--enable-libx264" - fi - if [ "$TARGET_ARCH" == "arm" ]; then FFMPEG_ARM_AO="--enable-hardcoded-tables" fi From b41db5be3c7f616c9ba200385d34ce0a1b75b2e3 Mon Sep 17 00:00:00 2001 From: awiouy Date: Fri, 9 Dec 2016 09:48:54 +0100 Subject: [PATCH 2/3] imagemagick: update to 6.9.6-7 --- .../addons/addon-depends/emby-depends/imagemagick/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk b/packages/addons/addon-depends/emby-depends/imagemagick/package.mk index 8df5f547f4..45d1d23441 100644 --- a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk +++ b/packages/addons/addon-depends/emby-depends/imagemagick/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="imagemagick" -PKG_VERSION="6.9.6-6" +PKG_VERSION="6.9.6-7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="http://www.imagemagick.org/script/license.php" From 6501dcea097169c3dc72177fd598b9dcacb17fa6 Mon Sep 17 00:00:00 2001 From: awiouy Date: Fri, 9 Dec 2016 09:49:52 +0100 Subject: [PATCH 3/3] emby: rebuild ffmpgex and imagemagick --- packages/addons/service/emby/changelog.txt | 3 +++ packages/addons/service/emby/package.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt index 06955be771..22217738aa 100644 --- a/packages/addons/service/emby/changelog.txt +++ b/packages/addons/service/emby/changelog.txt @@ -1,3 +1,6 @@ +109 +- Rebuilt ffmpgex and imagemagick + 108 - Updated to version 3.0.8500 diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk index 80f3ee968b..f6bce83f14 100644 --- a/packages/addons/service/emby/package.mk +++ b/packages/addons/service/emby/package.mk @@ -18,7 +18,7 @@ PKG_NAME="emby" PKG_VERSION="3.0.8500" -PKG_REV="108" +PKG_REV="109" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://emby.media"