Merge pull request #2384 from MilhouseVH/le90_kodi_Feb2017

kodi: updates for Feb 2018

packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.timidity"
-PKG_VERSION="1e13049"
-PKG_SHA256="bac11b90751d241bc191840b48327312b607dcac2149ef1d2855a09a84332a60"
+PKG_VERSION="d80a679"
+PKG_SHA256="bea723fe494907d02f833f151adca7a9e6ab796316f7f2520f49e5317b4a8558"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="inputstream.adaptive"
-PKG_VERSION="fb0ca21"
-PKG_SHA256="f20eb3c1037234c153955ab9c0a55fd22937776544c0530d1420e3ee4331cb15"
+PKG_VERSION="b28d3f0"
+PKG_SHA256="83103097ee933b8794bc50bcfa601715ff5e819e81778bcbc50403f6fb5f8182"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/peak3d/inputstream.adaptive/archive/$PKG_VERSION.tar.gz"

packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="inputstream.rtmp"
-PKG_VERSION="482f5c1"
-PKG_SHA256="36852beafb3a61ac8c54a612c642fe182d027af025a431db0b71b2477e0ffec0"
+PKG_VERSION="b3ffc49"
+PKG_SHA256="99e2c4b168a1026a2c0683894700e85210990f7c4ed9d3068c15101116dc6273"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/notspiff/inputstream.rtmp/archive/$PKG_VERSION.tar.gz"

packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="peripheral.joystick"
-PKG_VERSION="3a93486"
-PKG_SHA256="9a72ea32488128cf179fcc4a1ff5c9312719d2288ec9c85923ec16992e56fa84"
+PKG_VERSION="0a20d01"
+PKG_SHA256="759a2f8d06de059727cd5ab684826fe7b9dd7ae31bdd2205b0750c3de058da68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.demo"
-PKG_VERSION="6284566"
-PKG_SHA256="6572badf7da576b15c612345793d635e48e15f6611f37b805853ae8cd2c1cce5"
+PKG_VERSION="0224cbd"
+PKG_SHA256="7d4e432031378fef28354cbe46d419438560bbcf760339298ef5e43a71c5f78d"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.hts"
-PKG_VERSION="bf22a18"
-PKG_SHA256="a3a0b5a41d899ab26902cd308d9ad77dd8a7c08da5c3796a5f03782b7860cc7f"
+PKG_VERSION="774943f"
+PKG_SHA256="df02ad8adfd07422b0640718d9ec680a3626198b80ba46a123eb04cd33a45d41"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.iptvsimple"
-PKG_VERSION="a768d0e"
-PKG_SHA256="0f2a6fd796740564261d80cd19d4e20e469b039564c0506220c4cc794a4bc021"
+PKG_VERSION="a00d008"
+PKG_SHA256="7238c88cc8d8b1fb95bf28811938d9adefd357c7f9cf5303ca5b99e19744c79d"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="dcf0512"
-PKG_SHA256="4bcf691b3cd0e3cde95a0bc71f11e8400697e99951d79a5ca2feb300a6940dd3"
+PKG_VERSION="0c5ece3"
+PKG_SHA256="74087d3403ccd6b394ad831c57f163ce63c9ef1dbd004bb3a7523d9cac1f9340"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.mythtv"
-PKG_VERSION="cab8839"
-PKG_SHA256="c83c05b2f94a794a96520631f080f2845556e0bca4eaf5f517db11f438d7d3e6"
+PKG_VERSION="3200b09"
+PKG_SHA256="8e9443c386cbc4183e74f100aa7dd968310b8b8739d7a4640d8f69c31d3c20e8"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.octonet"
-PKG_VERSION="c4af00a"
-PKG_SHA256="4a62a84c957517044e1d44a40ae5db93576e8c0244acebf9c3a37203920202f9"
+PKG_VERSION="689afbf"
+PKG_SHA256="1bb5ae45466a719021cc192506eb601ef36e68027040ce31ca9b02b1441e2740"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.vdr.vnsi"
-PKG_VERSION="3c76791"
-PKG_SHA256="170fbc2634180c2e6b9d672de59f15e949d98b3e4bdf4aaf0456314f55c59bb0"
+PKG_VERSION="4db947c"
+PKG_SHA256="5b1d0482b15e8ca11ed86120b3b22b87a7808e2606c1c5f4db846418a9d3e90f"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="pvr.zattoo"
-PKG_VERSION="4940bcc"
-PKG_SHA256="9a79bdba574a9b069443fd0040a86ece017dbc47f7d5fe5f34e20308450c7beb"
+PKG_VERSION="fed0aea"
+PKG_SHA256="c26a6fd96e49964de0da2d9200d12aa23f348606e6331f80a3d6a134029673cf"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="visualization.shadertoy"
-PKG_VERSION="764d59d"
-PKG_SHA256="0b050831c6f9b7de89d7cebb6d6b7984a4675db3744cd5c7c8aebaf6251c9181"
+PKG_VERSION="6d70239"
+PKG_SHA256="6465ed95ed9cc541015226f0c6e99885f743b902478b951e4ff3ce3f660c6b18"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="visualization.spectrum"
-PKG_VERSION="d75d995"
-PKG_SHA256="1d838196a38bca5b1ca6b29f340165e4249513c548f9f183b2b07fbd10dae268"
+PKG_VERSION="b533965"
+PKG_SHA256="41173e5ef9058a8356e105fdc41f4facf14722fc9125ec2fc19f6ae1a1273e28"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="visualization.waveform"
-PKG_VERSION="9a8112f"
-PKG_SHA256="067b90a64562bf314699a777fea8f0b120904a78b69057e7b4744fe4dc1b25b3"
+PKG_VERSION="d34beaa"
+PKG_SHA256="12ecd1dbcea0bba4a424f6c3ef36e150a82fb72664ffdc4aa4af683c1fbf8fe7"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="dc587bd"
-PKG_SHA256="91c41ecf4ef676cdc3259c6bd03d413518f980f5fdae0ab8d580865ab33e0944"
+PKG_VERSION="f621a02"
+PKG_SHA256="ac4b2e5d5858ed2d07cd547dadae8394430da80bde39e5f191572b6e1f20df01"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"

packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch

@@ -5,7 +5,7 @@ Date:   Mon Dec 11 23:44:41 2017 -0800
     [linux] allow using alsa and pulse together
 
 diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
-index 24394d7631..0914d28820 100644
+index 398a311..6b3e6d8 100644
 --- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
 +++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
 @@ -52,31 +52,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
@@ -43,7 +43,7 @@ index 24394d7631..0914d28820 100644
  
  CWinSystemX11GLContext::~CWinSystemX11GLContext()
 diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
-index 4b8199760e..e50a31daf9 100644
+index 020e501..ed0f084 100644
 --- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
 +++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
 @@ -32,6 +32,7 @@
@@ -53,20 +53,20 @@ index 4b8199760e..e50a31daf9 100644
 +#include "cores/AudioEngine/Sinks/AESinkPULSE.h"
  #include "guilib/GraphicContext.h"
  #include "guilib/Resolution.h"
- #include "settings/Settings.h"
-@@ -78,6 +79,7 @@ CWinSystemAmlogic::CWinSystemAmlogic()
+ #include "powermanagement/linux/LinuxPowerSyscall.h"
+@@ -79,6 +80,7 @@ CWinSystemAmlogic::CWinSystemAmlogic()
    // Register sink
    AE::CAESinkFactory::ClearSinks();
    CAESinkALSA::Register();
 +  CAESinkPULSE::Register();
+   CLinuxPowerSyscall::Register();
  }
  
- CWinSystemAmlogic::~CWinSystemAmlogic()
 diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
-index 3ef426f677..7a1dfe1c8e 100644
+index 854040f..7ea9e75 100644
 --- a/xbmc/windowing/gbm/WinSystemGbm.cpp
 +++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
-@@ -37,31 +37,8 @@ CWinSystemGbm::CWinSystemGbm() :
+@@ -38,31 +38,8 @@ CWinSystemGbm::CWinSystemGbm() :
    m_nativeDisplay(nullptr),
    m_nativeWindow(nullptr)
  {
@@ -99,9 +99,9 @@ index 3ef426f677..7a1dfe1c8e 100644
 +  GBM::PulseAudioRegister();
  
    m_winEvents.reset(new CWinEventsLinux());
- }
+   CLinuxPowerSyscall::Register();
 diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
-index 9e7f8bd9be..464cf1342b 100644
+index b1caf83..da1b59f 100644
 --- a/xbmc/windowing/rpi/WinSystemRpi.cpp
 +++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
 @@ -34,7 +34,9 @@
@@ -111,16 +111,15 @@ index 9e7f8bd9be..464cf1342b 100644
 +#include "cores/AudioEngine/Sinks/AESinkALSA.h"
  #include "cores/AudioEngine/Sinks/AESinkPi.h"
 +#include "cores/AudioEngine/Sinks/AESinkPULSE.h"
+ #include "powermanagement/linux/LinuxPowerSyscall.h"
  
  #include <EGL/egl.h>
- #include <EGL/eglplatform.h>
-@@ -55,6 +57,8 @@ CWinSystemRpi::CWinSystemRpi()
+@@ -56,6 +58,8 @@ CWinSystemRpi::CWinSystemRpi()
    m_winEvents.reset(new CWinEventsLinux());
    AE::CAESinkFactory::ClearSinks();
    CAESinkPi::Register();
 +  CAESinkALSA::Register();
 +  CAESinkPULSE::Register();
+   CLinuxPowerSyscall::Register();
  }
  
- CWinSystemRpi::~CWinSystemRpi()
-

packages/mediacenter/kodi/patches/kodi-999.99-filesytem-reduce-smb-chunksize-to-64K.patch

@@ -0,0 +1,26 @@
+From 5c47c8c3c19faa9a9c5d754d0618b08706630fe7 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Tue, 30 Jan 2018 05:07:26 +0000
+Subject: [PATCH] filesystem: Reduce chunksize to 64K
+
+See: https://forum.kodi.tv/showthread.php?tid=298461&pid=2697818#pid2697818
+---
+ xbmc/filesystem/SMBFile.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/filesystem/SMBFile.h b/xbmc/filesystem/SMBFile.h
+index 39fb35e..75db1fe 100644
+--- a/xbmc/filesystem/SMBFile.h
++++ b/xbmc/filesystem/SMBFile.h
+@@ -89,7 +89,7 @@ public:
+   bool OpenForWrite(const CURL& url, bool bOverWrite = false) override;
+   bool Delete(const CURL& url) override;
+   bool Rename(const CURL& url, const CURL& urlnew) override;
+-  int GetChunkSize() override { return 2048*1024; }
++  int GetChunkSize() override { return 64*1024; }
+   int IoControl(EIoControl request, void* param) override;
+ 
+ protected:
+-- 
+2.14.1
+

packages/multimedia/ffmpeg/package.mk

@@ -18,8 +18,8 @@
 
 PKG_NAME="ffmpeg"
 # Current branch is: release/3.4-kodi
-PKG_VERSION="d413620"
-PKG_SHA256="c02de2197f8b70544f018e83f48c1bed2a1b47e1a1aa34ef59d9167fb0d2090a"
+PKG_VERSION="f96fd5c"
+PKG_SHA256="35ccc07c72b203101030a35b4bb11779365adb7bbf143ef1d68a1f87c781e38b"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"

packages/multimedia/ffmpeg/patches/ffmpeg-99.1002-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch

@@ -1,4 +1,4 @@
-From 214a8ccc1489db28ce6cec2739365d7eebbdb0f9 Mon Sep 17 00:00:00 2001
+From d8bdcc8791c501921ee8961f3b0de0bd47668ebf Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 5 Jun 2015 22:48:33 +0100
 Subject: [PATCH] mpeg4video: Signal unsupported GMC with more than one warp
@@ -10,10 +10,10 @@ Subject: [PATCH] mpeg4video: Signal unsupported GMC with more than one warp
  2 files changed, 5 insertions(+)
 
 diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
-index c207d3a784..08aa8112b1 100644
+index c26b6d607c..6c4b011b5c 100644
 --- a/libavcodec/avcodec.h
 +++ b/libavcodec/avcodec.h
-@@ -2967,6 +2967,7 @@ typedef struct AVCodecContext {
+@@ -2965,6 +2965,7 @@ typedef struct AVCodecContext {
  #define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
  #define FF_BUG_TRUNCATED       16384
  #define FF_BUG_IEDGE           32768

packages/multimedia/ffmpeg/patches/ffmpeg-99.1004-added_upstream_mvc_patches.patch

@@ -1,4 +1,4 @@
-From 8f170986cda0695f28eb2cd4e863aaae0e14d19f Mon Sep 17 00:00:00 2001
+From e75d7807cc97b3ddd8d8f6fe2fcf3dc4de58863f Mon Sep 17 00:00:00 2001
 From: Hendrik Leppkes <h.leppkes@gmail.com>
 Date: Sat, 9 Jan 2016 16:34:09 +0100
 Subject: [PATCH 1/4] avcodec: add h264_mvc codec id and profiles
@@ -32,12 +32,12 @@ index 6c4b011b5c..8f1f5a3e53 100644
  #define FF_PROFILE_VC1_SIMPLE   0
  #define FF_PROFILE_VC1_MAIN     1
 diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
-index 478b7c0ffc..ff10f3b2bc 100644
+index 6a13bbbf0e..03ae4838d2 100644
 --- a/libavcodec/codec_desc.c
 +++ b/libavcodec/codec_desc.c
-@@ -1700,6 +1700,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
-         .long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"),
-         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
+@@ -1665,6 +1665,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
+         .props     = AV_CODEC_PROP_LOSSLESS,
+         .mime_types= MT("image/png"),
      },
 +    {
 +        .id        = AV_CODEC_ID_H264_MVC,
@@ -78,7 +78,7 @@ index 53cbcfb543..f93f06fcfb 100644
 2.14.1
 
 
-From 00de72f97e8f69f5d4c614bff956ec726f97fa2e Mon Sep 17 00:00:00 2001
+From 51f6cec0b87840c32482df5d2b09f50d503d2b2b Mon Sep 17 00:00:00 2001
 From: Hendrik Leppkes <h.leppkes@gmail.com>
 Date: Sat, 9 Jan 2016 16:34:40 +0100
 Subject: [PATCH 2/4] h264_parser: add support for parsing h264 mvc NALUs
@@ -116,7 +116,7 @@ index 86df5eb9b3..22c4f1d82a 100644
  
  #endif /* AVCODEC_H264_H */
 diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
-index 053325c26b..855c74896e 100644
+index dd0a965af0..855c74896e 100644
 --- a/libavcodec/h264_parser.c
 +++ b/libavcodec/h264_parser.c
 @@ -62,6 +62,7 @@ typedef struct H264ParseContext {
@@ -139,7 +139,7 @@ index 053325c26b..855c74896e 100644
                      goto found;
                  }
              } else if (nalu_type == H264_NAL_SLICE || nalu_type == H264_NAL_DPA ||
--                       nalu_type == H264_NAL_IDR_SLICE)) {
+-                       nalu_type == H264_NAL_IDR_SLICE) {
 +                       nalu_type == H264_NAL_IDR_SLICE || (p->is_mvc && nalu_type == H264_NAL_SLICE_EXT)) {
                  state += 8;
 +
@@ -195,7 +195,7 @@ index 053325c26b..855c74896e 100644
 2.14.1
 
 
-From bbf5daa149ccc2c462be1bd5f6f710eba0e82094 Mon Sep 17 00:00:00 2001
+From 6edab559331e83ad11e7940233dbbaae121e528c Mon Sep 17 00:00:00 2001
 From: Hendrik Leppkes <h.leppkes@gmail.com>
 Date: Tue, 28 Nov 2017 16:12:12 +0000
 Subject: [PATCH 3/4] h264_parser: force grabing a new timestamp until a frame
@@ -223,10 +223,10 @@ index 855c74896e..90a99a19a8 100644
 2.14.1
 
 
-From 3a0ebb0f7473a9a5ab93e01f7261862a3d324e50 Mon Sep 17 00:00:00 2001
+From 2263d8d3a16ccf886c3692597331779a726373b5 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 28 Nov 2017 18:32:08 +0000
-Subject: [PATCH 4/4] extract_extradata_bsf: Support H264_MVC
+Date: Sun, 21 Jan 2018 20:31:31 +0000
+Subject: [PATCH 4/4] fixup
 
 ---
  libavcodec/extract_extradata_bsf.c | 8 +++++---

packages/textproc/expat/package.mk

@@ -17,17 +17,22 @@
 ################################################################################
 
 PKG_NAME="expat"
-PKG_VERSION="2.2.0"
-PKG_SHA256="d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff"
+PKG_VERSION="2.2.5"
+PKG_SHA256="b3781742738611eaa737543ee94264dd511c52a3ba7e53111f7d705f6bff65a8"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://expat.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://github.com/libexpat/libexpat/archive/R_${PKG_VERSION//./_}.tar.gz"
+PKG_SOURCE_DIR="libexpat-*/expat"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="expat: XML parser library"
 PKG_LONGDESC="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags). An introductory article on using Expat is available on xml.com."
 
-PKG_CMAKE_OPTS_TARGET="-DBUILD_docs=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
-PKG_CMAKE_OPTS_HOST="-DBUILD_docs=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
+PKG_CMAKE_OPTS_TARGET="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
+PKG_CMAKE_OPTS_HOST="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
 
+# cleanup
+post_unpack() {
+  rm -fr $BUILD/libexpat-R_${PKG_VERSION//./_}
+}

packages/textproc/expat/patches/expat-0001-allow-disabling-doc-build.patch

@@ -1,23 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2016-06-21 05:58:38.000000000 -0700
-+++ b/CMakeLists.txt	2017-10-10 09:39:36.713079492 -0700
-@@ -10,6 +10,7 @@
- set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
- set(PACKAGE_TARNAME "${PACKAGE_NAME}")
- 
-+option(BUILD_docs "build the docs for expat library" ON)
- option(BUILD_tools "build the xmlwf tool for expat library" ON)
- option(BUILD_examples "build the examples for expat library" ON)
- option(BUILD_tests "build the tests for expat library" ON)
-@@ -92,8 +93,9 @@
- install(FILES lib/expat.h lib/expat_external.h DESTINATION include)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig)
- 
--
--add_custom_command(TARGET expat PRE_BUILD COMMAND $(MAKE) -C doc xmlwf.1)
-+if(BUILD_docs)
-+    add_custom_command(TARGET expat PRE_BUILD COMMAND $(MAKE) -C doc xmlwf.1)
-+endif()
- 
- if(BUILD_tools AND NOT WINCE)
-     set(xmlwf_SRCS