Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -17,14 +17,17 @@ diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmak
|
||||
index 76626ec..ffb8e1d 100644
|
||||
--- a/project/cmake/kodi-config.cmake.in
|
||||
+++ b/project/cmake/kodi-config.cmake.in
|
||||
@@ -4,12 +4,12 @@ SET(APP_NAME_UC @APP_NAME_UC@)
|
||||
SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
|
||||
SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
|
||||
SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
|
||||
-SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
|
||||
-SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
|
||||
+SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
|
||||
+SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
|
||||
@@ -7,15 +7,15 @@
|
||||
SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
|
||||
ENDIF()
|
||||
IF(NOT @APP_NAME_UC@_INCLUDE_DIR)
|
||||
- SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
|
||||
+ SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
|
||||
ENDIF()
|
||||
IF(NOT @APP_NAME_UC@_LIB_DIR)
|
||||
- SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
|
||||
+ SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
|
||||
ENDIF()
|
||||
IF(NOT WIN32)
|
||||
SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
|
||||
ENDIF()
|
||||
@@ -32,7 +35,7 @@ index 76626ec..ffb8e1d 100644
|
||||
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
|
||||
ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON)
|
||||
|
||||
include(addon-helpers)
|
||||
if(NOT CORE_SYSTEM_NAME)
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
From 2b395fb3f07551ae1ce2e484c14ac59f36e192b0 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Thu, 17 Mar 2016 21:47:53 +0100
|
||||
Subject: [PATCH] native/TexturePacker: fix compilation with gcc 4.6
|
||||
|
||||
Kodi itself depends on gcc >= 4.7 due to its use of the C++11 standard.
|
||||
When cross-compiling the host gcc currently also needs to be >= 4.7 due
|
||||
to the texturepacker tool being needed as native binary to compile
|
||||
Textures.xbt for the target system.
|
||||
|
||||
Cross-compiling on a system where host gcc is at version 4.6 fails atm
|
||||
with this error:
|
||||
|
||||
cc1plus: error: unrecognized command line option '-std=c++11'
|
||||
make[4]: *** [md5.o] Error 1
|
||||
make[4]: *** Waiting for unfinished jobs....
|
||||
cc1plus: error: unrecognized command line option '-std=c++11'
|
||||
cc1plus: error: unrecognized command line option '-std=c++11'
|
||||
|
||||
make[4]: *** [DecoderManager.o] Error 1
|
||||
make[4]: *** [XBTFWriter.o] Error 1
|
||||
cc1plus: error: unrecognized command line option '-std=c++11'
|
||||
make[4]: *** [TexturePacker.o] Error 1
|
||||
cc1plus: error: unrecognized command line option '-std=c++11'
|
||||
make[4]: *** [decoder/PNGDecoder.o] Error 1
|
||||
make[3]: *** [all] Error 2
|
||||
make[2]: *** [native/TexturePacker] Error 2
|
||||
|
||||
Using this patch the problem is fixed and a working TexturePacker host
|
||||
binary is created.
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Patch sent upstream: https://github.com/xbmc/xbmc/pull/9378
|
||||
---
|
||||
tools/depends/native/TexturePacker/src/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/depends/native/TexturePacker/src/Makefile.am b/tools/depends/native/TexturePacker/src/Makefile.am
|
||||
index c1fc8be..d075290 100644
|
||||
--- a/tools/depends/native/TexturePacker/src/Makefile.am
|
||||
+++ b/tools/depends/native/TexturePacker/src/Makefile.am
|
||||
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
AM_CFLAGS = -DTARGET_POSIX -DUSE_LZO_PACKING
|
||||
AM_CFLAGS += @EXTRA_DEFINES@
|
||||
-AM_CXXFLAGS = $(AM_CFLAGS) -std=c++11
|
||||
+AM_CXXFLAGS = $(AM_CFLAGS) -std=c++0x
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I. \
|
||||
--
|
||||
2.7.0
|
||||
|
||||
646
bsp/buildroot/package/kodi/0006-ffmpeg30.patch
Normal file
646
bsp/buildroot/package/kodi/0006-ffmpeg30.patch
Normal file
@@ -0,0 +1,646 @@
|
||||
Add support for ffmpeg 3.0
|
||||
|
||||
Changes from original commit are only in file paths & quilt refresh.
|
||||
|
||||
commit c31b7d374062f87c7512d9872cbceac920465913
|
||||
Author: Philip Langdale <philipl@overt.org>
|
||||
Date: Mon Sep 21 19:49:36 2015 -0700
|
||||
|
||||
ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master
|
||||
|
||||
The deprecated PixelFormat and PIX_FMT_* names have been removed in
|
||||
ffmpeg master.
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Downloaded from
|
||||
https://gitweb.gentoo.org/repo/gentoo.git/tree/media-tv/kodi/files/kodi-16-ffmpeg3.patch]
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "utils/CPUInfo.h"
|
||||
|
||||
extern "C" {
|
||||
-#include "libswscale/swscale.h"
|
||||
#include "libavcodec/avcodec.h"
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavutil/avutil.h"
|
||||
@@ -33,23 +32,6 @@ extern "C" {
|
||||
#include "libpostproc/postprocess.h"
|
||||
}
|
||||
|
||||
-inline int SwScaleCPUFlags()
|
||||
-{
|
||||
- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
|
||||
- int flags = 0;
|
||||
-
|
||||
- if (cpuFeatures & CPU_FEATURE_MMX)
|
||||
- flags |= SWS_CPU_CAPS_MMX;
|
||||
- if (cpuFeatures & CPU_FEATURE_MMX2)
|
||||
- flags |= SWS_CPU_CAPS_MMX2;
|
||||
- if (cpuFeatures & CPU_FEATURE_3DNOW)
|
||||
- flags |= SWS_CPU_CAPS_3DNOW;
|
||||
- if (cpuFeatures & CPU_FEATURE_ALTIVEC)
|
||||
- flags |= SWS_CPU_CAPS_ALTIVEC;
|
||||
-
|
||||
- return flags;
|
||||
-}
|
||||
-
|
||||
inline int PPCPUFlags()
|
||||
{
|
||||
unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
|
||||
@@ -39,7 +39,7 @@ extern "C" {
|
||||
#include "libswscale/swscale.h"
|
||||
}
|
||||
|
||||
-// allocate a new picture (PIX_FMT_YUV420P)
|
||||
+// allocate a new picture (AV_PIX_FMT_YUV420P)
|
||||
DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight)
|
||||
{
|
||||
DVDVideoPicture* pPicture = new DVDVideoPicture;
|
||||
@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert
|
||||
|
||||
int dstformat;
|
||||
if (format == RENDER_FMT_UYVY422)
|
||||
- dstformat = PIX_FMT_UYVY422;
|
||||
+ dstformat = AV_PIX_FMT_UYVY422;
|
||||
else
|
||||
- dstformat = PIX_FMT_YUYV422;
|
||||
+ dstformat = AV_PIX_FMT_YUYV422;
|
||||
|
||||
- struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P,
|
||||
+ struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P,
|
||||
pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat,
|
||||
- SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ SWS_BILINEAR, NULL, NULL, NULL);
|
||||
sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride);
|
||||
sws_freeContext(ctx);
|
||||
}
|
||||
@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur
|
||||
}
|
||||
|
||||
struct EFormatMap {
|
||||
- PixelFormat pix_fmt;
|
||||
+ AVPixelFormat pix_fmt;
|
||||
ERenderFormat format;
|
||||
};
|
||||
|
||||
static const EFormatMap g_format_map[] = {
|
||||
- { PIX_FMT_YUV420P, RENDER_FMT_YUV420P }
|
||||
-, { PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P }
|
||||
-, { PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 }
|
||||
-, { PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 }
|
||||
-, { PIX_FMT_UYVY422, RENDER_FMT_UYVY422 }
|
||||
-, { PIX_FMT_YUYV422, RENDER_FMT_YUYV422 }
|
||||
-, { PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI }
|
||||
-, { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA }
|
||||
-, { PIX_FMT_NONE , RENDER_FMT_NONE }
|
||||
+ { AV_PIX_FMT_YUV420P, RENDER_FMT_YUV420P }
|
||||
+, { AV_PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P }
|
||||
+, { AV_PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 }
|
||||
+, { AV_PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 }
|
||||
+, { AV_PIX_FMT_UYVY422, RENDER_FMT_UYVY422 }
|
||||
+, { AV_PIX_FMT_YUYV422, RENDER_FMT_YUYV422 }
|
||||
+, { AV_PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI }
|
||||
+, { AV_PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA }
|
||||
+, { AV_PIX_FMT_NONE , RENDER_FMT_NONE }
|
||||
};
|
||||
|
||||
ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt)
|
||||
{
|
||||
- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
|
||||
+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
|
||||
{
|
||||
if(p->pix_fmt == fmt)
|
||||
return p->format;
|
||||
@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro
|
||||
|
||||
int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt)
|
||||
{
|
||||
- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
|
||||
+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
|
||||
{
|
||||
if(p->format == fmt)
|
||||
return p->pix_fmt;
|
||||
}
|
||||
- return PIX_FMT_NONE;
|
||||
+ return AV_PIX_FMT_NONE;
|
||||
}
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
|
||||
@@ -77,8 +77,8 @@ enum DecoderState
|
||||
STATE_SW_MULTI
|
||||
};
|
||||
|
||||
-enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
|
||||
- , const PixelFormat * fmt )
|
||||
+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
|
||||
+ , const AVPixelFormat * fmt )
|
||||
{
|
||||
CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque;
|
||||
|
||||
@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
|
||||
avctx->hwaccel_context = 0;
|
||||
}
|
||||
|
||||
- const PixelFormat * cur = fmt;
|
||||
- while(*cur != PIX_FMT_NONE)
|
||||
+ const AVPixelFormat * cur = fmt;
|
||||
+ while(*cur != AV_PIX_FMT_NONE)
|
||||
{
|
||||
#ifdef HAVE_LIBVDPAU
|
||||
if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))
|
||||
@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
|
||||
#endif
|
||||
#ifdef HAVE_LIBVA
|
||||
// mpeg4 vaapi decoding is disabled
|
||||
- if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
|
||||
+ if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
|
||||
{
|
||||
VAAPI::CDecoder* dec = new VAAPI::CDecoder();
|
||||
if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true)
|
||||
@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre
|
||||
|
||||
for(std::vector<ERenderFormat>::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it)
|
||||
{
|
||||
- m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
|
||||
+ m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
|
||||
if(*it == RENDER_FMT_YUV420P)
|
||||
- m_formats.push_back(PIX_FMT_YUVJ420P);
|
||||
+ m_formats.push_back(AV_PIX_FMT_YUVJ420P);
|
||||
}
|
||||
- m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
|
||||
+ m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
|
||||
|
||||
pCodec = avcodec_find_decoder(hints.codec);
|
||||
|
||||
@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom
|
||||
pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc;
|
||||
pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace;
|
||||
if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG
|
||||
- || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P)
|
||||
+ || m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P)
|
||||
pDvdVideoPicture->color_range = 1;
|
||||
else
|
||||
pDvdVideoPicture->color_range = 0;
|
||||
@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV
|
||||
pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED;
|
||||
pDvdVideoPicture->extended_format = 0;
|
||||
|
||||
- PixelFormat pix_fmt;
|
||||
- pix_fmt = (PixelFormat)m_pFrame->format;
|
||||
+ AVPixelFormat pix_fmt;
|
||||
+ pix_fmt = (AVPixelFormat)m_pFrame->format;
|
||||
|
||||
pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt);
|
||||
return true;
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
public:
|
||||
IHardwareDecoder() {}
|
||||
virtual ~IHardwareDecoder() {};
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0;
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0;
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0;
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0;
|
||||
virtual int Check (AVCodecContext* avctx) = 0;
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
void SetHardware(IHardwareDecoder* hardware);
|
||||
|
||||
protected:
|
||||
- static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt);
|
||||
+ static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt);
|
||||
|
||||
int FilterOpen(const std::string& filters, bool scale);
|
||||
void FilterClose();
|
||||
@@ -119,7 +119,7 @@ protected:
|
||||
int m_iLastKeyframe;
|
||||
double m_dts;
|
||||
bool m_started;
|
||||
- std::vector<PixelFormat> m_formats;
|
||||
+ std::vector<AVPixelFormat> m_formats;
|
||||
double m_decoderPts;
|
||||
int m_skippedDeint;
|
||||
bool m_requestSkipDeint;
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
|
||||
@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop(
|
||||
|
||||
void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture)
|
||||
{
|
||||
- // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P.
|
||||
+ // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P.
|
||||
struct SwsContext *swcontext = sws_getContext(
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422,
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422,
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
if (swcontext)
|
||||
{
|
||||
uint8_t *src[] = { yuv422_ptr, 0, 0, 0 };
|
||||
@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42
|
||||
|
||||
void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture)
|
||||
{
|
||||
- // convert PIX_FMT_BGRA to PIX_FMT_YUV420P.
|
||||
+ // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P.
|
||||
struct SwsContext *swcontext = sws_getContext(
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA,
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA,
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
if (swcontext)
|
||||
{
|
||||
uint8_t *src[] = { bgra_ptr, 0, 0, 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
|
||||
@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo
|
||||
return true;
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
if (!CheckCompatibility(avctx))
|
||||
return false;
|
||||
@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder()
|
||||
return true;
|
||||
}
|
||||
|
||||
-bool CDecoder::Supports(enum PixelFormat fmt)
|
||||
+bool CDecoder::Supports(enum AVPixelFormat fmt)
|
||||
{
|
||||
- if(fmt == PIX_FMT_DXVA2_VLD)
|
||||
+ if(fmt == AV_PIX_FMT_DXVA2_VLD)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
|
||||
@@ -141,7 +141,7 @@ class CDecoder
|
||||
public:
|
||||
CDecoder();
|
||||
~CDecoder();
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces);
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces);
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual int Check (AVCodecContext* avctx);
|
||||
@@ -154,7 +154,7 @@ public:
|
||||
int GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
|
||||
void RelBuffer(uint8_t *data);
|
||||
|
||||
- static bool Supports(enum PixelFormat fmt);
|
||||
+ static bool Supports(enum AVPixelFormat fmt);
|
||||
|
||||
void CloseDXVADecoder();
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
@@ -479,7 +479,7 @@ CDecoder::~CDecoder()
|
||||
Close();
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
// don't support broken wrappers by default
|
||||
// nvidia cards with a vaapi to vdpau wrapper
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
|
||||
@@ -406,7 +406,7 @@ public:
|
||||
CDecoder();
|
||||
virtual ~CDecoder();
|
||||
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual void Reset();
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
|
||||
@@ -186,7 +186,7 @@ void CDecoder::Close()
|
||||
m_bitstream = NULL;
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
Close();
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
|
||||
@@ -35,7 +35,7 @@ class CDecoder
|
||||
public:
|
||||
CDecoder();
|
||||
~CDecoder();
|
||||
- virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
|
||||
+ virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
|
||||
virtual int Decode(AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual int Check(AVCodecContext* avctx);
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_
|
||||
m_vdpauConfig.context = 0;
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
// check if user wants to decode this format with VDPAU
|
||||
std::string gpuvendor = g_Windowing.GetRenderVendor();
|
||||
@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct
|
||||
return 0;
|
||||
}
|
||||
|
||||
-bool CDecoder::IsVDPAUFormat(PixelFormat format)
|
||||
+bool CDecoder::IsVDPAUFormat(AVPixelFormat format)
|
||||
{
|
||||
if (format == AV_PIX_FMT_VDPAU)
|
||||
return true;
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
|
||||
@@ -556,7 +556,7 @@ public:
|
||||
CDecoder();
|
||||
virtual ~CDecoder();
|
||||
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual void Reset();
|
||||
@@ -571,7 +571,7 @@ public:
|
||||
bool Supports(VdpVideoMixerFeature feature);
|
||||
bool Supports(EINTERLACEMETHOD method);
|
||||
EINTERLACEMETHOD AutoInterlaceMethod();
|
||||
- static bool IsVDPAUFormat(PixelFormat fmt);
|
||||
+ static bool IsVDPAUFormat(AVPixelFormat fmt);
|
||||
|
||||
static void FFReleaseBuffer(void *opaque, uint8_t *data);
|
||||
static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
||||
@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack
|
||||
|
||||
// for video we need a decoder to get desired information into codec context
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata &&
|
||||
- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
|
||||
+ (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE))
|
||||
{
|
||||
// open a decoder, it will be cleared down by ffmpeg on closing the stream
|
||||
if (!st->codec->codec)
|
||||
@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
|
||||
st = m_pFormatContext->streams[idx];
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
|
||||
{
|
||||
- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
|
||||
+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
|
||||
return true;
|
||||
hasVideo = true;
|
||||
}
|
||||
@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
|
||||
st = m_pFormatContext->streams[i];
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
|
||||
{
|
||||
- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
|
||||
+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
|
||||
return true;
|
||||
hasVideo = true;
|
||||
}
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
|
||||
@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st
|
||||
|
||||
uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4];
|
||||
struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight,
|
||||
- PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
if (context)
|
||||
{
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
|
||||
@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
|
||||
}
|
||||
else if (m_format == RENDER_FMT_NV12)
|
||||
{
|
||||
- srcFormat = PIX_FMT_NV12;
|
||||
+ srcFormat = AV_PIX_FMT_NV12;
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
src[i] = im->plane[i];
|
||||
@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
|
||||
}
|
||||
else if (m_format == RENDER_FMT_YUYV422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_YUYV422;
|
||||
+ srcFormat = AV_PIX_FMT_YUYV422;
|
||||
src[0] = im->plane[0];
|
||||
srcStride[0] = im->stride[0];
|
||||
}
|
||||
else if (m_format == RENDER_FMT_UYVY422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_UYVY422;
|
||||
+ srcFormat = AV_PIX_FMT_UYVY422;
|
||||
src[0] = im->plane[0];
|
||||
srcStride[0] = im->stride[0];
|
||||
}
|
||||
@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
|
||||
|
||||
m_context = sws_getCachedContext(m_context,
|
||||
im->width, im->height, (AVPixelFormat)srcFormat,
|
||||
- im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
uint8_t *dst[] = { m_rgbBuffer, 0, 0, 0 };
|
||||
int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
|
||||
@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
|
||||
if (m_format == RENDER_FMT_YUV420P)
|
||||
{
|
||||
- srcFormat = PIX_FMT_YUV420P;
|
||||
+ srcFormat = AV_PIX_FMT_YUV420P;
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
srcTop[i] = im->plane[i];
|
||||
@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
}
|
||||
else if (m_format == RENDER_FMT_NV12)
|
||||
{
|
||||
- srcFormat = PIX_FMT_NV12;
|
||||
+ srcFormat = AV_PIX_FMT_NV12;
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
srcTop[i] = im->plane[i];
|
||||
@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
}
|
||||
else if (m_format == RENDER_FMT_YUYV422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_YUYV422;
|
||||
+ srcFormat = AV_PIX_FMT_YUYV422;
|
||||
srcTop[0] = im->plane[0];
|
||||
srcStrideTop[0] = im->stride[0] * 2;
|
||||
srcBot[0] = im->plane[0] + im->stride[0];
|
||||
@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
}
|
||||
else if (m_format == RENDER_FMT_UYVY422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_UYVY422;
|
||||
+ srcFormat = AV_PIX_FMT_UYVY422;
|
||||
srcTop[0] = im->plane[0];
|
||||
srcStrideTop[0] = im->stride[0] * 2;
|
||||
srcBot[0] = im->plane[0] + im->stride[0];
|
||||
@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
|
||||
m_context = sws_getCachedContext(m_context,
|
||||
im->width, im->height >> 1, (AVPixelFormat)srcFormat,
|
||||
- im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
uint8_t *dstTop[] = { m_rgbBuffer, 0, 0, 0 };
|
||||
uint8_t *dstBot[] = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 };
|
||||
int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu
|
||||
#endif
|
||||
{
|
||||
m_sw_context = sws_getCachedContext(m_sw_context,
|
||||
- im->width, im->height, PIX_FMT_YUV420P,
|
||||
- im->width, im->height, PIX_FMT_RGBA,
|
||||
+ im->width, im->height, AV_PIX_FMT_YUV420P,
|
||||
+ im->width, im->height, AV_PIX_FMT_RGBA,
|
||||
SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
uint8_t *src[] = { im->plane[0], im->plane[1], im->plane[2], 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
|
||||
@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer()
|
||||
UnInit();
|
||||
}
|
||||
|
||||
-static enum PixelFormat PixelFormatFromFormat(ERenderFormat format)
|
||||
+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format)
|
||||
{
|
||||
- if (format == RENDER_FMT_DXVA) return PIX_FMT_NV12;
|
||||
- if (format == RENDER_FMT_YUV420P) return PIX_FMT_YUV420P;
|
||||
- if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10;
|
||||
- if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16;
|
||||
- if (format == RENDER_FMT_NV12) return PIX_FMT_NV12;
|
||||
- if (format == RENDER_FMT_UYVY422) return PIX_FMT_UYVY422;
|
||||
- if (format == RENDER_FMT_YUYV422) return PIX_FMT_YUYV422;
|
||||
- return PIX_FMT_NONE;
|
||||
+ if (format == RENDER_FMT_DXVA) return AV_PIX_FMT_NV12;
|
||||
+ if (format == RENDER_FMT_YUV420P) return AV_PIX_FMT_YUV420P;
|
||||
+ if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10;
|
||||
+ if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16;
|
||||
+ if (format == RENDER_FMT_NV12) return AV_PIX_FMT_NV12;
|
||||
+ if (format == RENDER_FMT_UYVY422) return AV_PIX_FMT_UYVY422;
|
||||
+ if (format == RENDER_FMT_YUYV422) return AV_PIX_FMT_YUYV422;
|
||||
+ return AV_PIX_FMT_NONE;
|
||||
}
|
||||
|
||||
void CWinRenderer::ManageTextures()
|
||||
@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags)
|
||||
|
||||
void CWinRenderer::RenderSW()
|
||||
{
|
||||
- enum PixelFormat format = PixelFormatFromFormat(m_format);
|
||||
+ enum AVPixelFormat format = PixelFormatFromFormat(m_format);
|
||||
|
||||
// 1. convert yuv to rgb
|
||||
m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx,
|
||||
m_sourceWidth, m_sourceHeight, format,
|
||||
- m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer];
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
|
||||
@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi
|
||||
uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch,
|
||||
CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */)
|
||||
{
|
||||
- struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA,
|
||||
- out_width, out_height, PIX_FMT_BGRA,
|
||||
- CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA,
|
||||
+ out_width, out_height, AV_PIX_FMT_BGRA,
|
||||
+ CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL);
|
||||
|
||||
uint8_t *src[] = { in_pixels, 0, 0, 0 };
|
||||
int srcStride[] = { (int)in_pitch, 0, 0, 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
|
||||
@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
|
||||
return false;
|
||||
|
||||
// Due to a bug in swsscale we need to allocate one extra line of data
|
||||
- if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
|
||||
+ if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
|
||||
|
||||
// We got the video frame, render it into the picture buffer
|
||||
struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt,
|
||||
- m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
|
||||
+ m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
|
||||
|
||||
sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height,
|
||||
m_pFrameRGB->data, m_pFrameRGB->linesize );
|
||||
@@ -0,0 +1,45 @@
|
||||
From f63563615e357b7d794a38e1d37276c325d1466f Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sat, 7 May 2016 13:47:42 +0100
|
||||
Subject: [PATCH] [exif] Fix for out-of-memory errors with large numbers
|
||||
of jpegs
|
||||
|
||||
This reverts part of https://github.com/xbmc/xbmc/pull/7472
|
||||
|
||||
Basically the commit made the 4 comments in the exif block increase
|
||||
from 2K to 64K each, so you now need 256K per photo.
|
||||
|
||||
When opening a folder exif information for all photos is extracted.
|
||||
So, for a folder of 5000 jpegs, 1.2GB of RAM is needed just for
|
||||
the comments.
|
||||
|
||||
As a 64K comment string is of no use to kodi, just truncate them to 2K
|
||||
like we used to.
|
||||
|
||||
See:
|
||||
http://trac.kodi.tv/ticket/16193
|
||||
http://forum.kodi.tv/showthread.php?tid=251908
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
(backported from upstream commit in master branch:
|
||||
https://github.com/xbmc/xbmc/commit/f63563615e357b7d794a38e1d37276c325d1466f)
|
||||
---
|
||||
lib/libexif/libexif.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/libexif/libexif.h b/lib/libexif/libexif.h
|
||||
index aa8da07..519ac30 100644
|
||||
--- a/lib/libexif/libexif.h
|
||||
+++ b/lib/libexif/libexif.h
|
||||
@@ -81,7 +81,7 @@ typedef struct {
|
||||
#define EXIF_COMMENT_CHARSET_UNICODE 3 // Exif: Unicode (UTF-16)
|
||||
#define EXIF_COMMENT_CHARSET_JIS 4 // Exif: JIS X208-1990
|
||||
|
||||
-#define MAX_COMMENT 65533 // 2 bytes - 2 for the length param
|
||||
+#define MAX_COMMENT 2000
|
||||
#define MAX_DATE_COPIES 10
|
||||
|
||||
typedef struct {
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
From 78571ed421e3fd3d5244cd76670e4e1bab69132f Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Fri, 27 May 2016 17:30:28 +0200
|
||||
Subject: [PATCH 1/1] Fix nullpadding issue when reading certain id3v1 tags
|
||||
|
||||
backported from upstream commit to master branch:
|
||||
|
||||
https://github.com/xbmc/xbmc/commit/cdabf9dd9e82f4b2d639fb769db08227a7c52046
|
||||
|
||||
to fix problems with taglib-1.11:
|
||||
|
||||
http://trac.kodi.tv/ticket/16454
|
||||
https://github.com/taglib/taglib/issues/741#issuecomment-218059031
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
xbmc/music/tags/TagLoaderTagLib.cpp | 21 ---------------------
|
||||
xbmc/music/tags/TagLoaderTagLib.h | 3 +++
|
||||
2 files changed, 3 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp
|
||||
index b78a591..0fc346a 100644
|
||||
--- a/xbmc/music/tags/TagLoaderTagLib.cpp
|
||||
+++ b/xbmc/music/tags/TagLoaderTagLib.cpp
|
||||
@@ -46,31 +46,12 @@
|
||||
#include "utils/URIUtils.h"
|
||||
#include "utils/log.h"
|
||||
#include "utils/StringUtils.h"
|
||||
-#include "utils/CharsetConverter.h"
|
||||
#include "utils/Base64.h"
|
||||
#include "settings/AdvancedSettings.h"
|
||||
|
||||
using namespace TagLib;
|
||||
using namespace MUSIC_INFO;
|
||||
|
||||
-template<class T>
|
||||
-class TagStringHandler : public T
|
||||
-{
|
||||
-public:
|
||||
- TagStringHandler() {}
|
||||
- virtual ~TagStringHandler() {}
|
||||
- virtual String parse(const ByteVector &data) const
|
||||
- {
|
||||
- std::string strSource(data.data(), data.size());
|
||||
- std::string strUTF8;
|
||||
- g_charsetConverter.unknownToUTF8(strSource, strUTF8);
|
||||
- return String(strUTF8, String::UTF8);
|
||||
- }
|
||||
-};
|
||||
-
|
||||
-static const TagStringHandler<ID3v1::StringHandler> ID3v1StringHandler;
|
||||
-static const TagStringHandler<ID3v2::Latin1StringHandler> ID3v2StringHandler;
|
||||
-
|
||||
CTagLoaderTagLib::CTagLoaderTagLib()
|
||||
{
|
||||
}
|
||||
@@ -824,8 +805,6 @@ bool CTagLoaderTagLib::Load(const std::string& strFileName, CMusicInfoTag& tag,
|
||||
return false;
|
||||
}
|
||||
|
||||
- ID3v1::Tag::setStringHandler(&ID3v1StringHandler);
|
||||
- ID3v2::Tag::setLatin1StringHandler(&ID3v2StringHandler);
|
||||
TagLib::File* file = NULL;
|
||||
TagLib::APE::File* apeFile = NULL;
|
||||
TagLib::ASF::File* asfFile = NULL;
|
||||
diff --git a/xbmc/music/tags/TagLoaderTagLib.h b/xbmc/music/tags/TagLoaderTagLib.h
|
||||
index f83ea4f..0edb84f 100644
|
||||
--- a/xbmc/music/tags/TagLoaderTagLib.h
|
||||
+++ b/xbmc/music/tags/TagLoaderTagLib.h
|
||||
@@ -44,6 +44,9 @@
|
||||
#include <taglib/mp4tag.h>
|
||||
#include "ImusicInfoTagLoader.h"
|
||||
|
||||
+#include <string>
|
||||
+#include <vector>
|
||||
+
|
||||
namespace MUSIC_INFO
|
||||
{
|
||||
class CMusicInfoTag;
|
||||
--
|
||||
2.8.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,34 @@
|
||||
From 7d3c70b163bc67aeb1fdef8fd2347b39f311c584 Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <peter.fruehberger@gmail.com>
|
||||
Date: Sun, 24 Jul 2016 20:24:07 +0200
|
||||
Subject: [PATCH] Curl: Adjust multi_cleanup method which returns CURLMcode
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
(backported from upstream commit:
|
||||
https://github.com/xbmc/xbmc/commit/2a8d3e7f6cffea52740b8392a3be8ec251d5ff70)
|
||||
---
|
||||
xbmc/filesystem/DllLibCurl.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/xbmc/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h
|
||||
index db97f92..9e78a91 100644
|
||||
--- a/xbmc/filesystem/DllLibCurl.h
|
||||
+++ b/xbmc/filesystem/DllLibCurl.h
|
||||
@@ -52,7 +52,7 @@ namespace XCURL
|
||||
virtual CURLMcode multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)=0;
|
||||
virtual CURLMcode multi_timeout(CURLM *multi_handle, long *timeout)=0;
|
||||
virtual CURLMsg* multi_info_read(CURLM *multi_handle, int *msgs_in_queue)=0;
|
||||
- virtual void multi_cleanup(CURL_HANDLE * handle )=0;
|
||||
+ virtual CURLMcode multi_cleanup(CURLM * handle )=0;
|
||||
virtual struct curl_slist* slist_append(struct curl_slist *, const char *)=0;
|
||||
virtual void slist_free_all(struct curl_slist *)=0;
|
||||
};
|
||||
@@ -77,7 +77,7 @@ namespace XCURL
|
||||
DEFINE_METHOD5(CURLMcode, multi_fdset, (CURLM *p1, fd_set *p2, fd_set *p3, fd_set *p4, int *p5))
|
||||
DEFINE_METHOD2(CURLMcode, multi_timeout, (CURLM *p1, long *p2))
|
||||
DEFINE_METHOD2(CURLMsg*, multi_info_read, (CURLM *p1, int *p2))
|
||||
- DEFINE_METHOD1(void, multi_cleanup, (CURLM *p1))
|
||||
+ DEFINE_METHOD1(CURLMcode, multi_cleanup, (CURLM *p1))
|
||||
DEFINE_METHOD2(struct curl_slist*, slist_append, (struct curl_slist * p1, const char * p2))
|
||||
DEFINE_METHOD1(void, slist_free_all, (struct curl_slist * p1))
|
||||
DEFINE_METHOD1(const char *, easy_strerror, (CURLcode p1))
|
||||
@@ -1,11 +1,16 @@
|
||||
config BR2_PACKAGE_KODI_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS
|
||||
default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \
|
||||
&& BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
|
||||
&& BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
|
||||
comment "kodi needs a toolchain w/ C++, threads, wchar, dynamic library"
|
||||
comment "kodi needs a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6"
|
||||
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
|
||||
|| !BR2_USE_WCHAR || BR2_STATIC_LIBS
|
||||
|| !BR2_USE_WCHAR || BR2_STATIC_LIBS \
|
||||
|| !BR2_HOST_GCC_AT_LEAST_4_6 \
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
|
||||
|| BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
config BR2_PACKAGE_KODI_EGL_GLES
|
||||
@@ -31,6 +36,16 @@ comment "kodi requires an OpenGL ES and EGL backend"
|
||||
|
||||
menuconfig BR2_PACKAGE_KODI
|
||||
bool "kodi"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_6
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL
|
||||
depends on BR2_USE_MMU # python
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on !BR2_STATIC_LIBS # python
|
||||
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
|
||||
select BR2_NEEDS_HOST_JAVA
|
||||
select BR2_PACKAGE_BOOST
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
@@ -42,11 +57,14 @@ menuconfig BR2_PACKAGE_KODI
|
||||
select BR2_PACKAGE_FFMPEG_SWSCALE
|
||||
select BR2_PACKAGE_FONTCONFIG
|
||||
select BR2_PACKAGE_FREETYPE
|
||||
select BR2_PACKAGE_GIFLIB
|
||||
select BR2_PACKAGE_JASPER
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_LIBASS
|
||||
select BR2_PACKAGE_LIBCDIO
|
||||
select BR2_PACKAGE_LIBCROSSGUID
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
select BR2_PACKAGE_LIBDCADEC
|
||||
select BR2_PACKAGE_LIBFRIBIDI
|
||||
select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_KODI_GL
|
||||
select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL
|
||||
@@ -81,19 +99,10 @@ menuconfig BR2_PACKAGE_KODI
|
||||
select BR2_PACKAGE_TIFF
|
||||
select BR2_PACKAGE_TINYXML
|
||||
select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL
|
||||
select BR2_PACKAGE_XLIB_LIBXMU if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver
|
||||
select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL
|
||||
select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver
|
||||
select BR2_PACKAGE_YAJL
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL
|
||||
depends on BR2_USE_MMU # python
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on !BR2_STATIC_LIBS # python
|
||||
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
|
||||
help
|
||||
Kodi is an award-winning free and open source (GPL) software
|
||||
media player and entertainment hub for digital media.
|
||||
@@ -112,7 +121,6 @@ config BR2_PACKAGE_KODI_ALSA_LIB
|
||||
|
||||
config BR2_PACKAGE_KODI_AVAHI
|
||||
bool "avahi"
|
||||
depends on !BR2_STATIC_LIBS # avahi
|
||||
select BR2_PACKAGE_AVAHI
|
||||
select BR2_PACKAGE_AVAHI_DAEMON
|
||||
help
|
||||
@@ -128,45 +136,20 @@ config BR2_PACKAGE_KODI_DBUS
|
||||
config BR2_PACKAGE_KODI_LIBBLURAY
|
||||
bool "blu-ray"
|
||||
select BR2_PACKAGE_LIBBLURAY
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
Enable Blu-ray input support.
|
||||
Select this if you want to play back Blu-ray content.
|
||||
|
||||
comment "libbluray support needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_KODI_GOOM
|
||||
bool "goom screensaver"
|
||||
depends on BR2_PACKAGE_KODI_GL
|
||||
help
|
||||
Enable goom screensaver
|
||||
|
||||
comment "goom needs an OpenGL backend"
|
||||
depends on !BR2_PACKAGE_KODI_GL
|
||||
|
||||
config BR2_PACKAGE_KODI_RSXS
|
||||
bool "rsxs screensaver"
|
||||
depends on BR2_PACKAGE_KODI_GL
|
||||
help
|
||||
Enable goom screensaver
|
||||
|
||||
comment "rsxs needs an OpenGL backend"
|
||||
depends on !BR2_PACKAGE_KODI_GL
|
||||
|
||||
config BR2_PACKAGE_KODI_LIBCEC
|
||||
bool "hdmi cec"
|
||||
depends on !BR2_STATIC_LIBS # libcec
|
||||
depends on BR2_PACKAGE_HAS_UDEV
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # libcec
|
||||
select BR2_PACKAGE_LIBCEC
|
||||
help
|
||||
Enable CEC (Consumer Electronics Control) support.
|
||||
Select this if you want Kodi to support HDMI CEC.
|
||||
|
||||
comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|
||||
comment "hdmi cec support needs udev /dev management"
|
||||
depends on !BR2_PACKAGE_HAS_UDEV
|
||||
|
||||
config BR2_PACKAGE_KODI_LIRC
|
||||
bool "lirc"
|
||||
@@ -175,6 +158,7 @@ config BR2_PACKAGE_KODI_LIRC
|
||||
|
||||
config BR2_PACKAGE_KODI_LIBMICROHTTPD
|
||||
bool "web server"
|
||||
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd
|
||||
select BR2_PACKAGE_LIBMICROHTTPD
|
||||
help
|
||||
Enable webserver feature
|
||||
@@ -190,6 +174,18 @@ config BR2_PACKAGE_KODI_LIBNFS
|
||||
comment "nfs support needs a toolchain w/ threads support"
|
||||
depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
|
||||
|
||||
config BR2_PACKAGE_KODI_MYSQL
|
||||
bool "mysql"
|
||||
select BR2_PACKAGE_MYSQL
|
||||
help
|
||||
Enable MySQL support
|
||||
|
||||
config BR2_PACKAGE_KODI_NONFREE
|
||||
bool "nonfree components"
|
||||
help
|
||||
Enable components with non-free licenses. This option
|
||||
currently only controls support for RAR archives.
|
||||
|
||||
config BR2_PACKAGE_KODI_RTMPDUMP
|
||||
bool "rtmp"
|
||||
select BR2_PACKAGE_RTMPDUMP
|
||||
@@ -199,21 +195,18 @@ config BR2_PACKAGE_KODI_RTMPDUMP
|
||||
|
||||
config BR2_PACKAGE_KODI_LIBSHAIRPLAY
|
||||
bool "shairport"
|
||||
depends on !BR2_STATIC_LIBS # libshairplay -> avahi
|
||||
select BR2_PACKAGE_LIBSHAIRPLAY
|
||||
help
|
||||
Enable Shairport support.
|
||||
Select this if you want to stream content from an Apple device.
|
||||
|
||||
comment "shairport support needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
comment "samba support needs an (e)glibc toolchain w/ RPC"
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
comment "samba support needs a glibc or uClibc toolchain w/ RPC"
|
||||
depends on (!BR2_TOOLCHAIN_USES_GLIBC && \
|
||||
!BR2_TOOLCHAIN_USES_UCLIBC) || !BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
|
||||
config BR2_PACKAGE_KODI_LIBSMBCLIENT
|
||||
bool "samba"
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
select BR2_PACKAGE_SAMBA4
|
||||
@@ -235,6 +228,9 @@ config BR2_PACKAGE_KODI_LIBTHEORA
|
||||
|
||||
config BR2_PACKAGE_KODI_LIBUSB
|
||||
bool "usb"
|
||||
# https://github.com/xbmc/xbmc/blob/Jarvis/configure.ac#L1554
|
||||
# "if libudev is available, we don't need libusb"
|
||||
depends on !BR2_PACKAGE_HAS_UDEV
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
select BR2_PACKAGE_LIBUSB_COMPAT
|
||||
help
|
||||
@@ -243,19 +239,23 @@ config BR2_PACKAGE_KODI_LIBUSB
|
||||
config BR2_PACKAGE_KODI_LIBVA
|
||||
bool "va"
|
||||
select BR2_PACKAGE_LIBVA
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
Enable libva support.
|
||||
|
||||
comment "libva support needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_KODI_WAVPACK
|
||||
bool "wavpack"
|
||||
select BR2_PACKAGE_WAVPACK
|
||||
config BR2_PACKAGE_KODI_LIBVDPAU
|
||||
bool "vdpau"
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_LIBVDPAU
|
||||
help
|
||||
Enable WAV input support.
|
||||
Select this if you want to play back WV files.
|
||||
Enable libvdpau support.
|
||||
|
||||
comment "libvdpau support needs X.org"
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
|
||||
config BR2_PACKAGE_KODI_UPNP
|
||||
bool "upnp"
|
||||
help
|
||||
Enable UPnP support
|
||||
|
||||
config BR2_PACKAGE_KODI_OPTICALDRIVE
|
||||
bool
|
||||
@@ -263,6 +263,7 @@ config BR2_PACKAGE_KODI_OPTICALDRIVE
|
||||
menu "Audio decoder addons"
|
||||
source "package/kodi-audiodecoder-modplug/Config.in"
|
||||
source "package/kodi-audiodecoder-nosefart/Config.in"
|
||||
source "package/kodi-audiodecoder-opus/Config.in"
|
||||
source "package/kodi-audiodecoder-sidplay/Config.in"
|
||||
source "package/kodi-audiodecoder-snesapu/Config.in"
|
||||
source "package/kodi-audiodecoder-stsound/Config.in"
|
||||
@@ -270,6 +271,11 @@ menu "Audio decoder addons"
|
||||
source "package/kodi-audiodecoder-vgmstream/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Audio DSP addons"
|
||||
source "package/kodi-adsp-basic/Config.in"
|
||||
source "package/kodi-adsp-freesurround/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Audio encoder addons"
|
||||
source "package/kodi-audioencoder-flac/Config.in"
|
||||
source "package/kodi-audioencoder-lame/Config.in"
|
||||
@@ -283,6 +289,7 @@ menu "PVR addons"
|
||||
source "package/kodi-pvr-dvblink/Config.in"
|
||||
source "package/kodi-pvr-dvbviewer/Config.in"
|
||||
source "package/kodi-pvr-filmon/Config.in"
|
||||
source "package/kodi-pvr-hdhomerun/Config.in"
|
||||
source "package/kodi-pvr-hts/Config.in"
|
||||
source "package/kodi-pvr-iptvsimple/Config.in"
|
||||
source "package/kodi-pvr-mediaportal-tvserver/Config.in"
|
||||
@@ -299,15 +306,23 @@ endmenu
|
||||
|
||||
menu "Screensavers"
|
||||
source "package/kodi-screensaver-asteroids/Config.in"
|
||||
source "package/kodi-screensaver-asterwave/Config.in"
|
||||
source "package/kodi-screensaver-biogenesis/Config.in"
|
||||
source "package/kodi-screensaver-cpblobs/Config.in"
|
||||
source "package/kodi-screensaver-crystalmorph/Config.in"
|
||||
source "package/kodi-screensaver-greynetic/Config.in"
|
||||
source "package/kodi-screensaver-matrixtrails/Config.in"
|
||||
source "package/kodi-screensaver-pingpong/Config.in"
|
||||
source "package/kodi-screensaver-planestate/Config.in"
|
||||
source "package/kodi-screensaver-pyro/Config.in"
|
||||
source "package/kodi-screensaver-rsxs/Config.in"
|
||||
source "package/kodi-screensaver-stars/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Visualisations"
|
||||
source "package/kodi-visualisation-fishbmc/Config.in"
|
||||
source "package/kodi-visualisation-fountain/Config.in"
|
||||
source "package/kodi-visualisation-goom/Config.in"
|
||||
source "package/kodi-visualisation-shadertoy/Config.in"
|
||||
source "package/kodi-visualisation-spectrum/Config.in"
|
||||
source "package/kodi-visualisation-waveforhue/Config.in"
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 kodi-15.2-Isengard.tar.gz
|
||||
sha256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 kodi-16.1-Jarvis.tar.gz
|
||||
|
||||
@@ -4,19 +4,60 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KODI_VERSION = 15.2-Isengard
|
||||
KODI_VERSION = 16.1-Jarvis
|
||||
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
|
||||
KODI_LICENSE = GPLv2
|
||||
KODI_LICENSE_FILES = LICENSE.GPL
|
||||
# needed for binary addons
|
||||
KODI_INSTALL_STAGING = YES
|
||||
KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-zip host-giflib \
|
||||
host-libjpeg host-lzo host-nasm host-libpng host-swig
|
||||
KODI_DEPENDENCIES += boost bzip2 expat ffmpeg fontconfig freetype jasper jpeg \
|
||||
libass libcdio libcurl libfribidi libgcrypt libmpeg2 \
|
||||
libogg libplist libpng libsamplerate libsquish libvorbis libxml2 \
|
||||
libxslt lzo ncurses openssl pcre python readline sqlite taglib tiff \
|
||||
tinyxml yajl zlib
|
||||
KODI_DEPENDENCIES = \
|
||||
boost \
|
||||
bzip2 \
|
||||
expat \
|
||||
ffmpeg \
|
||||
fontconfig \
|
||||
freetype \
|
||||
giflib \
|
||||
host-gawk \
|
||||
host-gettext \
|
||||
host-giflib \
|
||||
host-gperf \
|
||||
host-libjpeg \
|
||||
host-libpng \
|
||||
host-lzo \
|
||||
host-nasm \
|
||||
host-swig \
|
||||
host-zip \
|
||||
jasper \
|
||||
jpeg \
|
||||
libass \
|
||||
libcdio \
|
||||
libcrossguid \
|
||||
libcurl \
|
||||
libdcadec \
|
||||
libfribidi \
|
||||
libgcrypt \
|
||||
libmpeg2 \
|
||||
libogg \
|
||||
libplist \
|
||||
libpng \
|
||||
libsamplerate \
|
||||
libsquish \
|
||||
libvorbis \
|
||||
libxml2 \
|
||||
libxslt \
|
||||
lzo \
|
||||
ncurses \
|
||||
openssl \
|
||||
pcre \
|
||||
python \
|
||||
readline \
|
||||
sqlite \
|
||||
taglib \
|
||||
tiff \
|
||||
tinyxml \
|
||||
yajl \
|
||||
zlib
|
||||
|
||||
KODI_CONF_ENV = \
|
||||
PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \
|
||||
@@ -32,13 +73,11 @@ KODI_CONF_OPTS += \
|
||||
--with-ffmpeg=shared \
|
||||
--disable-joystick \
|
||||
--disable-openmax \
|
||||
--disable-projectm \
|
||||
--disable-pulse \
|
||||
--disable-vdpau \
|
||||
--disable-vtbdecoder \
|
||||
--enable-optimizations
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MYSQL),y)
|
||||
ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
|
||||
KODI_CONF_OPTS += --enable-mysql
|
||||
KODI_CONF_ENV += ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
|
||||
KODI_DEPENDENCIES += mysql
|
||||
@@ -46,6 +85,14 @@ else
|
||||
KODI_CONF_OPTS += --disable-mysql
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_NONFREE),y)
|
||||
KODI_CONF_OPTS += --enable-non-free
|
||||
KODI_LICENSE := $(KODI_LICENSE), unrar
|
||||
KODI_LICENSE_FILES += lib/UnrarXLib/license.txt
|
||||
else
|
||||
KODI_CONF_OPTS += --disable-non-free
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
|
||||
KODI_DEPENDENCIES += rpi-userland
|
||||
KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
|
||||
@@ -54,8 +101,15 @@ KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads
|
||||
LIBS="-lvcos -lvchostif"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBFSLVPUWRAP),y)
|
||||
KODI_DEPENDENCIES += libfslvpuwrap
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
KODI_DEPENDENCIES += udev
|
||||
KODI_CONF_OPTS += --enable-udev
|
||||
else
|
||||
KODI_CONF_OPTS += --disable-udev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_IMX_VPUWRAP),y)
|
||||
KODI_DEPENDENCIES += imx-vpuwrap
|
||||
KODI_CONF_OPTS += --enable-codec=imxvpu
|
||||
endif
|
||||
|
||||
@@ -88,24 +142,8 @@ ifeq ($(BR2_PACKAGE_KODI_GL),y)
|
||||
KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \
|
||||
xlib_libXmu xlib_libXrandr xlib_libXt libdrm
|
||||
KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles
|
||||
ifeq ($(BR2_PACKAGE_KODI_RSXS),y)
|
||||
# fix rsxs compile
|
||||
# gcc5: http://trac.kodi.tv/ticket/16006#comment:6
|
||||
# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4
|
||||
KODI_CONF_ENV += \
|
||||
ac_cv_type__Bool=yes \
|
||||
jm_cv_func_gettimeofday_clobber=no \
|
||||
mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \
|
||||
mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \
|
||||
mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \
|
||||
mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \
|
||||
mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
|
||||
KODI_CONF_OPTS += --enable-rsxs
|
||||
else
|
||||
KODI_CONF_OPTS += --disable-rsxs
|
||||
endif
|
||||
else
|
||||
KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-x11
|
||||
KODI_CONF_OPTS += --disable-gl --disable-x11
|
||||
ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
|
||||
KODI_DEPENDENCIES += libegl libgles
|
||||
KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
|
||||
@@ -116,12 +154,6 @@ KODI_CONF_OPTS += --disable-gles
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_GOOM),y)
|
||||
KODI_CONF_OPTS += --enable-goom
|
||||
else
|
||||
KODI_CONF_OPTS += --disable-goom
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y)
|
||||
KODI_DEPENDENCIES += libusb-compat
|
||||
KODI_CONF_OPTS += --enable-libusb
|
||||
@@ -198,10 +230,6 @@ else
|
||||
KODI_CONF_OPTS += --disable-lirc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_WAVPACK),y)
|
||||
KODI_DEPENDENCIES += wavpack
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y)
|
||||
KODI_DEPENDENCIES += libtheora
|
||||
endif
|
||||
@@ -214,6 +242,19 @@ else
|
||||
KODI_CONF_OPTS += --disable-vaapi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_LIBVDPAU),y)
|
||||
KODI_DEPENDENCIES += libvdpau
|
||||
KODI_CONF_OPTS += --enable-vdpau
|
||||
else
|
||||
KODI_CONF_OPTS += --disable-vdpau
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_UPNP),y)
|
||||
KODI_CONF_OPTS += --enable-upnp
|
||||
else
|
||||
KODI_CONF_OPTS += --disable-upnp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KODI_OPTICALDRIVE),y)
|
||||
KODI_CONF_OPTS += --enable-optical-drive --enable-dvdcss
|
||||
else
|
||||
@@ -229,7 +270,6 @@ endef
|
||||
KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP
|
||||
|
||||
define KODI_CLEAN_UNUSED_ADDONS
|
||||
rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma
|
||||
rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop
|
||||
rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm
|
||||
rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes
|
||||
|
||||
Reference in New Issue
Block a user