summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-08-22 18:53:33 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-08-22 21:21:13 +0200
commitb258572ce13a8c3399e882c2141571f72c1bf9f3 (patch)
tree25827ec525cce86709770de7a4c80cc74be4beb6
parent5567d0cf73576a6515513d160cd0dae5c1565bf5 (diff)
downloadmedia-b258572ce13a8c3399e882c2141571f72c1bf9f3.tar.gz
media-b258572ce13a8c3399e882c2141571f72c1bf9f3.tar.xz
kodi: version bump to 17.4
Change-Id: I2df79066c9ba84821b372eb8c155aadaf3a382f3 Reviewed-on: https://galileo.mailstation.de/gerrit/9903 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/media/kodi/files/8b2e0d7fd8d1c2e5d01497c0973acd36313b8238.patch55
-rw-r--r--packages/media/kodi/files/xbmc-17.4-use-system-ffmpeg.patch28
-rw-r--r--packages/media/kodi/kodi-17.4.exheres-0 (renamed from packages/media/kodi/kodi-17.3-r1.exheres-0)4
3 files changed, 30 insertions, 57 deletions
diff --git a/packages/media/kodi/files/8b2e0d7fd8d1c2e5d01497c0973acd36313b8238.patch b/packages/media/kodi/files/8b2e0d7fd8d1c2e5d01497c0973acd36313b8238.patch
deleted file mode 100644
index a60ec2c..0000000
--- a/packages/media/kodi/files/8b2e0d7fd8d1c2e5d01497c0973acd36313b8238.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8b2e0d7fd8d1c2e5d01497c0973acd36313b8238 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 21 Jun 2017 12:36:13 -0400
-Subject: [PATCH] Fix "VMSF_DELTA filter in unrar allows arbitrary memory
- write"
-
-See https://bugs.chromium.org/p/project-zero/issues/detail?id=1286
----
- lib/UnrarXLib/rarvm.cpp | 12 +++++++-----
- lib/UnrarXLib/unpack.hpp | 6 ++++++
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/lib/UnrarXLib/rarvm.cpp b/lib/UnrarXLib/rarvm.cpp
-index 901c35dcb459..35126aabfbb7 100644
---- a/lib/UnrarXLib/rarvm.cpp
-+++ b/lib/UnrarXLib/rarvm.cpp
-@@ -873,14 +873,16 @@ void RarVM::ExecuteStandardFilter(VM_StandardFilters FilterType)
- break;
- case VMSF_DELTA:
- {
-- int DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
-- SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
-- if (DataSize>=VM_GLOBALMEMADDR/2)
-+ uint DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
-+ if (DataSize>VM_MEMSIZE/2 || Channels>MAX3_UNPACK_CHANNELS || Channels==0)
- break;
-- for (int CurChannel=0;CurChannel<Channels;CurChannel++)
-+
-+ // Bytes from same channels are grouped to continual data blocks,
-+ // so we need to place them back to their interleaving positions.
-+ for (uint CurChannel=0;CurChannel<Channels;CurChannel++)
- {
- byte PrevByte=0;
-- for (int DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
-+ for (uint DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
- Mem[DestPos]=(PrevByte-=Mem[SrcPos++]);
- }
- }
-diff --git a/lib/UnrarXLib/unpack.hpp b/lib/UnrarXLib/unpack.hpp
-index 83fb0f02541a..36ac30d1819a 100644
---- a/lib/UnrarXLib/unpack.hpp
-+++ b/lib/UnrarXLib/unpack.hpp
-@@ -1,6 +1,12 @@
- #ifndef _RAR_UNPACK_
- #define _RAR_UNPACK_
-
-+// Limit maximum number of channels in RAR3 delta filter to some reasonable
-+// value to prevent too slow processing of corrupt archives with invalid
-+// channels number. Must be equal or larger than v3_MAX_FILTER_CHANNELS.
-+// No need to provide it for RAR5, which uses only 5 bits to store channels.
-+#define MAX3_UNPACK_CHANNELS 1024
-+
- enum BLOCK_TYPES {BLOCK_LZ,BLOCK_PPM};
-
- struct Decode
diff --git a/packages/media/kodi/files/xbmc-17.4-use-system-ffmpeg.patch b/packages/media/kodi/files/xbmc-17.4-use-system-ffmpeg.patch
new file mode 100644
index 0000000..0b82fe1
--- /dev/null
+++ b/packages/media/kodi/files/xbmc-17.4-use-system-ffmpeg.patch
@@ -0,0 +1,28 @@
+Source: Timo Gurr <tgurr@exherbo.org>
+Upstream: No (only ffmpeg 3.1 is supported for Krypton)
+Reason: Use system installed ffmpeg and prevent downloading the bundled one during build
+
+diff -Naur xbmc-17.4-Krypton/project/cmake/modules/FindFFMPEG.cmake xbmc-17.4-Krypton.new/project/cmake/modules/FindFFMPEG.cmake
+--- xbmc-17.4-Krypton/project/cmake/modules/FindFFMPEG.cmake 2017-08-22 09:29:22.000000000 +0200
++++ xbmc-17.4-Krypton.new/project/cmake/modules/FindFFMPEG.cmake 2017-08-22 19:30:48.886176139 +0200
+@@ -37,13 +37,13 @@
+ # only ffmpeg 3.1 is supported for Krypton!
+ # our ffmpeg 3.1 version carries two important patches: https://github.com/xbmc/FFmpeg/commits/release/3.1-xbmc
+ set(REQUIRED_FFMPEG_VERSION 3.1)
+-set(_avcodec_ver "=57.48.101")
+-set(_avfilter_ver "=6.47.100")
+-set(_avformat_ver "=57.41.100")
+-set(_avutil_ver "=55.28.100")
+-set(_swscale_ver "=4.1.100")
+-set(_swresample_ver "=2.1.100")
+-set(_postproc_ver "=54.0.100")
++set(_avcodec_ver ">=57.48.101")
++set(_avfilter_ver ">=6.47.100")
++set(_avformat_ver ">=57.41.100")
++set(_avutil_ver ">=55.28.100")
++set(_swscale_ver ">=4.1.100")
++set(_swresample_ver ">=2.1.100")
++set(_postproc_ver ">=54.0.100")
+
+
+ # Allows building with external ffmpeg not found in system paths,
diff --git a/packages/media/kodi/kodi-17.3-r1.exheres-0 b/packages/media/kodi/kodi-17.4.exheres-0
index ca6badc..93c2de8 100644
--- a/packages/media/kodi/kodi-17.3-r1.exheres-0
+++ b/packages/media/kodi/kodi-17.4.exheres-0
@@ -68,7 +68,7 @@ DEPENDENCIES="
dev-libs/yajl[>=2.0.0]
dev-python/Pillow[python_abis:*(-)?]
fonts/dejavu
- media/ffmpeg[>=3.0][h264]
+ media/ffmpeg[>=3.1][h264]
media-libs/freetype:2
media-libs/giflib:=[>=4.1.6] [[ note = [ for TexturePacker ] ]]
media-libs/glew
@@ -178,7 +178,7 @@ CMAKE_SRC_CONFIGURE_TESTS=( '-DBUILD_TESTING:BOOL=TRUE -DBUILD_TESTING:BOOL=FALS
src_prepare() {
edo pushd ${WORKBASE}/xbmc-${MY_PV}
- expatch "${FILES}"/8b2e0d7fd8d1c2e5d01497c0973acd36313b8238.patch
+ expatch "${FILES}"/xbmc-17.4-use-system-ffmpeg.patch
edo popd
cmake_src_prepare