From e221312edc89ea8d41e5a5364b8a40c46a510878 Mon Sep 17 00:00:00 2001
From: awiouy <awiouy@gmail.com>
Date: Sun, 15 Jan 2017 12:55:19 +0100
Subject: [PATCH 1/4] Revert "ffmpegx: build with x264 for aarch64"

This reverts commit a7dbba8c5a53c178ffe9dbce19ccc9ccf0995160.
---
 .../addons/addon-depends/emby-depends/ffmpegx/package.mk     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
index 7245e7afc6..3130204d05 100644
--- a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
@@ -46,6 +46,11 @@ 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 764cd03d19eeb09734495f8146e88abc8872a4c5 Mon Sep 17 00:00:00 2001
From: awiouy <awiouy@gmail.com>
Date: Sun, 15 Jan 2017 13:06:54 +0100
Subject: [PATCH 2/4] ffmpegx: reintroduce libx264

---
 packages/addons/addon-depends/emby-depends/ffmpegx/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
index 3130204d05..111f960642 100644
--- a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="ffmpegx"
 PKG_VERSION="libreelec"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"

From ddb1632490ed7fb84983732c9b1048fd359bb017 Mon Sep 17 00:00:00 2001
From: awiouy <awiouy@gmail.com>
Date: Sun, 15 Jan 2017 13:07:36 +0100
Subject: [PATCH 3/4] emby: reintroduce libx264

---
 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 22217738aa..0701806b3f 100644
--- a/packages/addons/service/emby/changelog.txt
+++ b/packages/addons/service/emby/changelog.txt
@@ -1,3 +1,6 @@
+110
+- Rebuild ffmpegx with libx264
+
 109
 - Rebuilt ffmpgex and imagemagick
 
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index f6bce83f14..0b90ee47f5 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="109"
+PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"

From 22f43985ca2c520ad8da05963edde5e9927d6aae Mon Sep 17 00:00:00 2001
From: awiouy <awiouy@gmail.com>
Date: Mon, 16 Jan 2017 00:26:25 +0100
Subject: [PATCH 4/4] libX11: fix build

---
 packages/x11/lib/libX11/package.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk
index e81525ced5..db2c6c8272 100644
--- a/packages/x11/lib/libX11/package.mk
+++ b/packages/x11/lib/libX11/package.mk
@@ -56,4 +56,5 @@ pre_configure_target() {
   export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
   export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
   export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
+  unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
 }