package/kodi: bump to version 17.4

PATCH New Bernd Kuhls 2 participants 6 messages Aug 22, 2017 – Aug 30, 2017

lore

Share & tools

lore

Bernd Kuhls

author

2017-08-22 20:15 UTC #0 lore raw

PATCH 1/3 package/kodi: bump to version 17.4

Removed patch 0003, applied upstream:
https://github.com/xbmc/xbmc/commit/5fa10ff6b1b60abee172296d9c1dec8dfc10615c

-DWITH_FFMPEG is needed due to commit
https://github.com/xbmc/xbmc/commit/5ba6eb7cadc41d5eb86ef94e3661b833b62953ff

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../kodi-jsonschemabuilder.mk                      |  2 +-
 package/kodi-texturepacker/kodi-texturepacker.mk   |  2 +-
 .../kodi/0003-FTPParse.cpp-use-std-string.patch    | 91 ----------------------
 package/kodi/kodi.hash                             |  2 +-
 package/kodi/kodi.mk                               |  3 +-
 5 files changed, 5 insertions(+), 95 deletions(-)
 delete mode 100644 package/kodi/0003-FTPParse.cpp-use-std-string.patch

package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +1 -1

index 320c77977..e3de102b7 100644
@@ -6,7 +6,7 @@
 
 # Not possible to directly refer to kodi variables, because of
 # first/second expansion trickery...
-KODI_JSONSCHEMABUILDER_VERSION = 17.3-Krypton
+KODI_JSONSCHEMABUILDER_VERSION = 17.4-Krypton
 KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
 KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
 KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0

package/kodi-texturepacker/kodi-texturepacker.mk +1 -1

index d69585b09..26776acbe 100644
@@ -6,7 +6,7 @@
 
 # Not possible to directly refer to kodi variables, because of
 # first/second expansion trickery...
-KODI_TEXTUREPACKER_VERSION = 17.3-Krypton
+KODI_TEXTUREPACKER_VERSION = 17.4-Krypton
 KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION))
 KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz
 KODI_TEXTUREPACKER_LICENSE = GPL-2.0

package/kodi/0003-FTPParse.cpp-use-std-string.patch deleted +0 ~~-91~~

91 lines not on this page · raw message

package/kodi/kodi.hash +1 -1

index 167b17928..6c7cf8f61 100644
@@ -1,5 +1,5 @@
 # Locally computed
-sha256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1  kodi-17.3-Krypton.tar.gz
+sha256 b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f  kodi-17.4-Krypton.tar.gz
 # Locally computed - libdvdcss
 sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34  2f12236.tar.gz
 # Locally computed - libdvdnav

package/kodi/kodi.mk +2 -1

index 0bf7331dd..793289f9b 100644
@@ -6,7 +6,7 @@
 
 # When updating the version, please also update kodi-jsonschemabuilder
 # and kodi-texturepacker
-KODI_VERSION = 17.3-Krypton
+KODI_VERSION = 17.4-Krypton
 KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
 KODI_LICENSE = GPL-2.0
 KODI_LICENSE_FILES = LICENSE.GPL

@@ -67,6 +67,7 @@ KODI_CONF_OPTS += \
 	-DENABLE_OPENSSL=ON \
 	-DNATIVEPREFIX=$(HOST_DIR) \
 	-DDEPENDS_PATH=$(@D) \
+	-DWITH_FFMPEG=$(STAGING_DIR)/usr \
 	-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
 	-DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
 	-DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-08-22 20:15 UTC #1 lore raw

PATCH 2/3 package/kodi-inputstream-adaptive: bump version to latest Krypton release

Upstream does not depend on a fixed version anymore but uses the latest commit of the Krypton branch:
https://github.com/xbmc/repo-binary-addons/commit/2f3dfcfa97249ab01808c79a88d5b3d33bf5d620

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +-
 package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +1 -1

index e461bd97a..c7de62a4f 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 cb0fa6f8326b439006701890d3fd90621b4f6f2db6055a9abe781b089170d28f  kodi-inputstream-adaptive-1.0.8_k17.tar.gz
+sha256 4691ac8bde78b5abb2847cf6ad64d36141c0582f944ba435eafe7702cc2d1187  kodi-inputstream-adaptive-161f319bb2cd946f4659d841a54f19b1fb6143cc.tar.gz

package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +1 -1

index e5a197cd4..8d7daefc4 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_INPUTSTREAM_ADAPTIVE_VERSION = 1.0.8_k17
+KODI_INPUTSTREAM_ADAPTIVE_VERSION = 161f319bb2cd946f4659d841a54f19b1fb6143cc
 KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
 KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+
 KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-08-22 20:15 UTC #2 lore raw

PATCH 3/3 package/kodi-pvr-*: mass version bump

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/kodi-pvr-hts/kodi-pvr-hts.hash               | 2 +-
 package/kodi-pvr-hts/kodi-pvr-hts.mk                 | 2 +-
 package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +-
 package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

package/kodi-pvr-hts/kodi-pvr-hts.hash +1 -1

index 5656e8e3b..bf0a7361b 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 29867bd1fad4c4d69ec0d25ea1bb1507fd4543442aef890a2124f63f67318d92  kodi-pvr-hts-3.4.24-Krypton.tar.gz
+sha256 4fb24496622762ea8c894368bdababd2104c5f70978b901b983974ef389b83e1  kodi-pvr-hts-3.4.27.tar.gz

package/kodi-pvr-hts/kodi-pvr-hts.mk +1 -1

index fb5873bff..182fd4b0d 100644
@@ -6,7 +6,7 @@
 
 # This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HTS_VERSION = 3.4.24-Krypton
+KODI_PVR_HTS_VERSION = 3.4.27
 KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
 KODI_PVR_HTS_LICENSE = GPL-2.0+
 KODI_PVR_HTS_LICENSE_FILES = src/client.h

package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +1 -1

index 906cbb575..0b0406feb 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 0a006e275cddba02d5d3fd22a95cec6411a765719509a9bc8fcc93dfa247bd4c  kodi-pvr-iptvsimple-2.4.11-Krypton.tar.gz
+sha256 329bd71e5c786d7b037bf5fd103ee4abff892afc6e5186a5d0a797194a8c4c7c  kodi-pvr-iptvsimple-2.4.14-Krypton.tar.gz

package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +1 -1

index 5ea0a454f..0df509ea6 100644
@@ -6,7 +6,7 @@
 
 # This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_IPTVSIMPLE_VERSION = 2.4.11-Krypton
+KODI_PVR_IPTVSIMPLE_VERSION = 2.4.14-Krypton
 KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
 KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
 KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h

Signature · 1 line

2.11.0

Thomas Petazzoni

2017-08-23 13:51 UTC #3 lore raw

PATCH 1/3 package/kodi: bump to version 17.4

In reply to Bernd Kuhls

Hello,

Quoted 5 lines · Bernd Kuhls

Removed patch 0003, applied upstream:
https://github.com/xbmc/xbmc/commit/5fa10ff6b1b60abee172296d9c1dec8dfc10615c
-DWITH_FFMPEG is needed due to commit
https://github.com/xbmc/xbmc/commit/5ba6eb7cadc41d5eb86ef94e3661b833b62953ff

It is not clear to me what in this commit makes -DWITH_FFMPEG required. Could you explain?

I have nothing against adding -DWITH_FFMPEG, it looks alright, but I'd like to understand the relationship with this commit you're pointing at.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Bernd Kuhls

author

2017-08-23 20:28 UTC #4 lore raw

PATCH 1/3 package/kodi: bump to version 17.4

Hi THomas,

Am Wed, 23 Aug 2017 15:51:02 +0200 schrieb Thomas Petazzoni:

Quoted 5 lines

Hello,
Quoted 2 lines · Bernd Kuhls
Removed patch 0003, applied upstream:
https://github.com/xbmc/xbmc/

commit/5fa10ff6b1b60abee172296d9c1dec8dfc10615c

Quoted 3 lines

Quoted 3 lines
-DWITH_FFMPEG is needed due to commit
https://github.com/xbmc/xbmc/

commit/5ba6eb7cadc41d5eb86ef94e3661b833b62953ff

Quoted 3 lines

It is not clear to me what in this commit makes -DWITH_FFMPEG required. Could you explain?

the commit changes the ffmpeg version check from "at least version x.x" to "exactly version x.x":

https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/
FindFFMPEG.cmake#L40

If a system-provided ffmpeg version > 3.1 is found Kodi will compile ffmpeg itself which is something we do not want:

-- Downloading...
dst='/home/buildroot/br5_next/output/build/kodi-17.4-Krypton/project/
cmake/build/download/ffmpeg-3.1.9-Krypton-17.4.tar.gz'
-- [download 1% complete]
-- [download 2% complete]
-- [download 3% complete]
-- [download 4% complete]
[...]

For details about the change please read https://forum.kodi.tv/
showthread.php?tid=317137&pid=2608648#pid2608648

To avoid the ffmpeg version check we need to use -DWITH_FFMPEG:
https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/
FindFFMPEG.cmake#L49

The original bug which caused the discussion about system-provided ffmpeg vs. Kodi-built ffmpeg was also solved: https://github.com/xbmc/xbmc/
pull/12361 so imho there is no problem to bump Kodi to 17.4. I am using it for months without problems.

Regards, Bernd

Thomas Petazzoni

2017-08-30 21:28 UTC #5 lore raw

PATCH 1/3 package/kodi: bump to version 17.4

In reply to Bernd Kuhls

Hello,

Quoted 7 lines · Bernd Kuhls

Removed patch 0003, applied upstream:
https://github.com/xbmc/xbmc/commit/5fa10ff6b1b60abee172296d9c1dec8dfc10615c
-DWITH_FFMPEG is needed due to commit
https://github.com/xbmc/xbmc/commit/5ba6eb7cadc41d5eb86ef94e3661b833b62953ff
Signed-off-by Bernd Kuhls <[email protected]>

Quoted 8 lines

---
 .../kodi-jsonschemabuilder.mk                      |  2 +-
 package/kodi-texturepacker/kodi-texturepacker.mk   |  2 +-
 .../kodi/0003-FTPParse.cpp-use-std-string.patch    | 91 ----------------------
 package/kodi/kodi.hash                             |  2 +-
 package/kodi/kodi.mk                               |  3 +-
 5 files changed, 5 insertions(+), 95 deletions(-)
 delete mode 100644 package/kodi/0003-FTPParse.cpp-use-std-string.patch

All three patches applied to next. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com