summaryrefslogtreecommitdiff
path: root/package/kodi
diff options
context:
space:
mode:
Diffstat (limited to 'package/kodi')
-rw-r--r--package/kodi/Makefile9
-rw-r--r--package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp71
2 files changed, 4 insertions, 76 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 3bb3b9822..c7fb2413c 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kodi
-PKG_VERSION:= 17.3
+PKG_VERSION:= 17.6
PKG_RELEASE:= 1
-PKG_HASH:= ca97d044dc544568f34f067688b783d29f180b5e504814d5d947143b2f7e6d7b
+PKG_HASH:= c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
PKG_DEPENDS:= python2 libsquish libressl libxz
@@ -23,8 +23,7 @@ PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis
PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host
PKG_BUILDDEP+= tinyxml sqlite pcre libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame
-PKG_BUILDDEP+= alsa-lib glib libmodplug
-PKG_BUILDDEP+= libgpg-error libvorbis
+PKG_BUILDDEP+= alsa-lib glib libmodplug libgpg-error libvorbis
PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host
PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec
PKG_BUILDDEP+= libcrossguid libressl xz bzip2 liblzo
@@ -50,6 +49,7 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \
-DENABLE_DVDCSS=ON \
-DENABLE_INTERNAL_CROSSGUID=OFF \
-DENABLE_INTERNAL_FFMPEG=OFF \
+ -DWITH_FFMPEG=$(STAGING_TARGET_DIR)/usr \
-DKODI_DEPENDSBUILD=OFF \
-DENABLE_OPENSSL=ON \
-DENABLE_MYSQLCLIENT=OFF \
@@ -90,7 +90,6 @@ CMAKE_FLAGS+= -DCORE_SYSTEM_NAME=linux
endif
pre-configure:
- #(cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh)
(cd $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder && PATH='$(HOST_PATH)' cmake .)
PATH='$(HOST_PATH)' make -C $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder
cp $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \
diff --git a/package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp b/package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp
deleted file mode 100644
index fff30955b..000000000
--- a/package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp
+++ /dev/null
@@ -1,71 +0,0 @@
---- xbmc-17.3-Krypton.orig/xbmc/filesystem/FTPParse.cpp 2017-05-24 22:49:32.000000000 +0200
-+++ xbmc-17.3-Krypton/xbmc/filesystem/FTPParse.cpp 2017-07-22 21:01:29.538581226 +0200
-@@ -34,7 +34,7 @@ CFTPParse::CFTPParse()
- m_time = 0;
- }
-
--string CFTPParse::getName()
-+std::string CFTPParse::getName()
- {
- return m_name;
- }
-@@ -59,16 +59,16 @@ time_t CFTPParse::getTime()
- return m_time;
- }
-
--void CFTPParse::setTime(string str)
-+void CFTPParse::setTime(std::string str)
- {
- /* Variables used to capture patterns via the regexes */
-- string month;
-- string day;
-- string year;
-- string hour;
-- string minute;
-- string second;
-- string am_or_pm;
-+ std::string month;
-+ std::string day;
-+ std::string year;
-+ std::string hour;
-+ std::string minute;
-+ std::string second;
-+ std::string am_or_pm;
-
- /* time struct used to set the time_t variable */
- struct tm time_struct = {};
-@@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, i
- return day_of_week;
- }
-
--int CFTPParse::FTPParse(string str)
-+int CFTPParse::FTPParse(std::string str)
- {
- /* Various variable to capture patterns via the regexes */
-- string permissions;
-- string link_count;
-- string owner;
-- string group;
-- string size;
-- string date;
-- string name;
-- string type;
-- string stuff;
-- string facts;
-- string version;
-- string file_id;
-+ std::string permissions;
-+ std::string link_count;
-+ std::string owner;
-+ std::string group;
-+ std::string size;
-+ std::string date;
-+ std::string name;
-+ std::string type;
-+ std::string stuff;
-+ std::string facts;
-+ std::string version;
-+ std::string file_id;
-
- /* Regex for standard Unix listing formats */
- pcrecpp::RE unix_re("^([-bcdlps])" // type