commit: de8659db6cdfc6ca835d142f1821cdb5f3017ec3 Author: Craig Andrews <candrews <AT> integralblue <DOT> com> AuthorDate: Sun Jun 4 01:22:00 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Tue Jun 6 21:48:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8659db
media-tv/kodi and media-libs/kodi-platform: Drop old versions Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4845 media-libs/kodi-platform/Manifest | 1 - .../kodi-platform/kodi-platform-16.9999.ebuild | 24 - .../kodi-platform-16_p20150805.ebuild | 24 - media-tv/kodi/Manifest | 9 - media-tv/kodi/files/kodi-14.1-no-arm-flags.patch | 16 - media-tv/kodi/files/kodi-16-ffmpeg3.patch | 641 --------------------- .../kodi-16.1-GUIFontTTFGL-loses-precision.patch | 63 -- media-tv/kodi/files/kodi-9999-no-arm-flags.patch | 16 - media-tv/kodi/files/kodi-9999-texturepacker.patch | 17 - media-tv/kodi/kodi-16.1-r4.ebuild | 309 ---------- media-tv/kodi/kodi-16.1.ebuild | 297 ---------- media-tv/kodi/kodi-17.0-r4.ebuild | 279 --------- media-tv/kodi/kodi-17.1-r3.ebuild | 279 --------- media-tv/kodi/kodi-17.2.ebuild | 279 --------- media-tv/kodi/metadata.xml | 3 - 15 files changed, 2257 deletions(-) diff --git a/media-libs/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest index 0916a04c850..3f925cf4e27 100644 --- a/media-libs/kodi-platform/Manifest +++ b/media-libs/kodi-platform/Manifest @@ -1,2 +1 @@ -DIST kodi-platform-16_p20150805.tar.gz 8389 SHA256 158b083f5c18ca17a939e6858efd09959b9416e56b42ca884aa35f2ddae9fd2d SHA512 6668735206124a2942d8f3138b9e1eafeb2c97c5a81a6fd3e80e3d4ced676993d629f3dc7683ad226fd1665232c7c2cc062a3b52e8d0efcb9a7583506a29890d WHIRLPOOL 6b0bafb93cbb9a421d4f5d3d578c41899488a05f654f517da308a3f5b85b71267a011771906f97141a9b83ebcc153d7bf9e3c18391849865f13618ef48e508e6 DIST kodi-platform-17.1.0.1.tar.gz 8538 SHA256 972dff4acc9580551113da8d5895f9aedd27c3579e8e48126303384a54424f94 SHA512 c3501b30d6e643239d1a5726eae79d734392709240b21fd314c97fa8a98b0c4ba912c8a246bd53e7049fadde0f695274ae4d1920442ab9a22337258388f80bcb WHIRLPOOL 088658b114fe62e5941b389c33b1acc887d757ce109f1a83c57ce21748b7da73d69bd87baaf96aa82ce5aed70bb725cb31699851e5441b5f6e31b51cb632f7da diff --git a/media-libs/kodi-platform/kodi-platform-16.9999.ebuild b/media-libs/kodi-platform/kodi-platform-16.9999.ebuild deleted file mode 100644 index a00432da5e8..00000000000 --- a/media-libs/kodi-platform/kodi-platform-16.9999.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit git-2 cmake-utils - -EGIT_REPO_URI="https://github.com/xbmc/kodi-platform"; -EGIT_BRANCH="Jarvis" - -DESCRIPTION="Kodi platform support library" -HOMEPAGE="https://github.com/xbmc/kodi-platform"; -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -# libplatform changed in version 2 from platform to p8-platform which makes it incompatible -DEPEND="=dev-libs/libplatform-1* - dev-libs/tinyxml - =media-tv/kodi-16*" -RDEPEND="${DEPEND}" diff --git a/media-libs/kodi-platform/kodi-platform-16_p20150805.ebuild b/media-libs/kodi-platform/kodi-platform-16_p20150805.ebuild deleted file mode 100644 index bb268beb9c1..00000000000 --- a/media-libs/kodi-platform/kodi-platform-16_p20150805.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -GIT_COMMIT="15edaf7" -DESCRIPTION="Kodi platform support library" -HOMEPAGE="https://github.com/xbmc/kodi-platform"; -SRC_URI="https://github.com/xbmc/kodi-platform/tarball/${GIT_COMMIT} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -# libplatform changed in version 2 from platform to p8-platform which makes it incompatible -DEPEND="=dev-libs/libplatform-1* - dev-libs/tinyxml - =media-tv/kodi-16*" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}" diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 350d870f4b7..922f625ad12 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,13 +1,4 @@ DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 SHA256 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1 WHIRLPOOL ae6f0b3b798e92cd72aed8eb3e6dc82708c86052590b30ae93e1b8275dca89c5a4470dbc8ff51bfefd72bd40036b7bd1b7695ee77e90bab35b5e80bcb8b79826 -DIST kodi-16.1-gcc-6.patch 63436 SHA256 cc4d730f163fcc3a99cb67480953cb043c17097d815bf41da441c7e66caaa0dc SHA512 9236608e26685feccd4492c58e7b5c4262e0ac100aabda46a565685eaa19af5b9bbe11f59cecc91de33474ac024ff74d670fe137fa2490f4ec1207817fb7fd23 WHIRLPOOL 336ba43387c154e67a5a3592675f802a50771e3bac14af79f9413773185f6b35e85a1af10988b96238a00e6a9c300caf856435f356572b7fb441e652164c8917 -DIST kodi-16.1-generated-addons-r1.tar.xz 54528 SHA256 ffa06845ed95597b46a178575e361f0641f78778be553d7a9f51b4cc190d2629 SHA512 32c9a5bb6ed5f5d8e73a37c35268c1a7176c6a4c52c5b5e8f6c5c76a3c51445ff0a5b8802be94ada5d63ecbea4d7e69b61d579c931900f6ba6abb583bbe542d9 WHIRLPOOL 3cd62abee6854efbee0070d811d0ef03f7b2d1d629c91d43fb2a2883c83733267affef60339459ce1ca7e30b1b856e20b929883cd12958348803c428d69e142e -DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d -DIST kodi-17.0-generated-addons.tar.xz 57552 SHA256 89f7b681e920cec5974ec133e7c895ae2d2372d006e25dc4085668f2e9784813 SHA512 87e1610456c6c21193bc88dc9e62b941ec2caadcac42f9fae13abff193d446452f8ac007810d88990d7549039713ed970d9ac6436fe730794c669cab19fac5b7 WHIRLPOOL 7bf3176511da59226a7974d22cc28d614b16f5db2904ae4b5c6d4ed668808a0fca8440a264bef882091ec1312c3fc83abe99c9dab821fb2d990d28766af68646 -DIST kodi-17.0.tar.gz 58449501 SHA256 4bfffa2493973ae15ab1d922632c09a2583908d6140bc4f58ec8f9314e4f6545 SHA512 ca0d812bcbcc58b74542872365244c5b937803c5618d2277e85a8cb805820ddb22886233d1417fa0e7532c9909749e632e276f8da51d86e1f5f060b2d1ad6a12 WHIRLPOOL f26cc7908c0618904586e255244c7f42814a52d65399a7bb16ba42f4c5079bb82176eb8035af9bf5c56469249dd4af53c161899d276f44634946333440313c53 -DIST kodi-17.1-generated-addons.tar.xz 57560 SHA256 a92a8222444a123e4876e835238ce5ddf9cfed967c07b7af17cfdd82421196ac SHA512 b3d313aceecad16c0dcf1cddeee459155b94aad4137cb74b405c0634b85f8a6819f90d3d9dad9d528ad4a39909ca7eb5ae73ed4c40c13aaa573494be2b990cd8 WHIRLPOOL b1193338224408f948175ad7ee100c9d27c45e8e07dc72adcb846e4ee2ea1febe6f605af4bfb22649dcfed95e4b16385276dbf8870f7da0f9c9886dc9ba5136d -DIST kodi-17.1.tar.gz 58457875 SHA256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee SHA512 5093fe7dcdf22e2604ea93696c909028c00a8b0c858e7b25f55dade6c3423b4a68f5a49a8a0dd5238b10f4a7dd5e815a82251949ce7adb8a8f8cf5d58fc7bd41 WHIRLPOOL a2f3ce757383b1e3ac40c91574a873cf23c3f10e944e5d74228a0bec287f919bcd0b1251d89c6dd33eea847a34a4149e26e8d464169538601ff9be0f817539c6 -DIST kodi-17.2-generated-addons.tar.xz 57556 SHA256 c04c610fec8345ed383afccdb0e9eb04d6327682169dd236ca36291e866f2cab SHA512 46a41f1eb45a7d2680e0c07e71073c929881a324c91d2fea0871aa31cba00296fe0b835481411a213921c7813ac75b629ff3e9d941f5ca0ad72c0d1dcf861a21 WHIRLPOOL 45372116099402dae63a51117d93f08852416ff7cad4ecf7a969a1a70d42460e9681338bf69803291774a0e6d130166e5136f0692d086eded1d7b69e527db872 -DIST kodi-17.2.tar.gz 58465212 SHA256 aed9236c5a0074a4dfc775c111d362e4358daa0030d7e8ba38fbb6d58ae1affe SHA512 79aaaaaab21dac1831f5da4f0f773a0ab7e997347a423ee42d19ba511523d21c5a16f2c924502bd8dd9000827f50e87361a0440503a6278463cddf30170ba980 WHIRLPOOL 345e2bdf58c99f4134a4010a5f9afb9d206aeaebe60cc54b30632957f416a7408f140319ff6b2558951d3a22e049d7900ec9f63064d0e90a045f5bb9d50e91d9 DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3 DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a diff --git a/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch b/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch deleted file mode 100644 index 82a738356ff..00000000000 --- a/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/400617 - -do not force any particular ABI or FPU or SIMD compiler flags for arm -targets. let the toolchain and user CFLAGS control that. - ---- a/configure.in -+++ b/configure.in -@@ -571,7 +571,7 @@ - elif test "$target_platform" = "target_raspberry_pi"; then - ARCH="arm" - use_arch="arm" --elif test "$use_arch" = "arm"; then -+elif false; then - CFLAGS="$CFLAGS -mno-apcs-stack-check" - CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check" - FFMPEG_EXTRACFLAGS="" diff --git a/media-tv/kodi/files/kodi-16-ffmpeg3.patch b/media-tv/kodi/files/kodi-16-ffmpeg3.patch deleted file mode 100644 index 755af69f8f4..00000000000 --- a/media-tv/kodi/files/kodi-16-ffmpeg3.patch +++ /dev/null @@ -1,641 +0,0 @@ - -Changes from original commit are only in file paths & quilt refresh. - -commit c31b7d374062f87c7512d9872cbceac920465913 -Author: Philip Langdale <[email protected]> -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. - -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 ); diff --git a/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch b/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch deleted file mode 100644 index 30ed1e06793..00000000000 --- a/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch +++ /dev/null @@ -1,63 +0,0 @@ -From fa6f5d761b600b0a8b52db18168e540b03f79ceb Mon Sep 17 00:00:00 2001 -From: Memphiz <[email protected]> -Date: Mon, 21 Dec 2015 11:29:23 +0100 -Subject: [PATCH] [GUIFont] - the BufferHandle is a GLUInt for gl and gles and - a void * for dx - ---- - xbmc/guilib/GUIFontCache.h | 10 ++++++++-- - xbmc/guilib/GUIFontTTFGL.cpp | 4 ++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/xbmc/guilib/GUIFontCache.h b/xbmc/guilib/GUIFontCache.h -index 7cbe91d..ab35919 100644 ---- a/xbmc/guilib/GUIFontCache.h -+++ b/xbmc/guilib/GUIFontCache.h -@@ -37,6 +37,7 @@ - #include <cassert> - - #include "TransformMatrix.h" -+#include "system.h" - - #define FONT_CACHE_TIME_LIMIT (1000) - #define FONT_CACHE_DIST_LIMIT (0.01f) -@@ -231,10 +232,15 @@ struct CGUIFontCacheDynamicPosition - - struct CVertexBuffer - { -- void *bufferHandle; -+#if defined(HAS_GL) || defined(HAS_GLES) -+ typedef unsigned int BufferHandleType; -+#elif defined(HAS_DX) -+ typedef void* BufferHandleType; -+#endif -+ BufferHandleType bufferHandle; // this is really a GLuint - size_t size; - CVertexBuffer() : bufferHandle(NULL), size(0), m_font(NULL) {} -- CVertexBuffer(void *bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} -+ CVertexBuffer(BufferHandleType bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} - CVertexBuffer(const CVertexBuffer &other) : bufferHandle(other.bufferHandle), size(other.size), m_font(other.m_font) - { - /* In practice, the copy constructor is only called before a vertex buffer -diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp -index f2f3a41..c4aaa3b 100644 ---- a/xbmc/guilib/GUIFontTTFGL.cpp -+++ b/xbmc/guilib/GUIFontTTFGL.cpp -@@ -232,7 +232,7 @@ void CGUIFontTTFGL::LastEnd() - glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glMatrixModview.Get()); - - // Bind the buffer to the OpenGL context's GL_ARRAY_BUFFER binding point -- glBindBuffer(GL_ARRAY_BUFFER, (GLuint) m_vertexTrans[i].vertexBuffer->bufferHandle); -+ glBindBuffer(GL_ARRAY_BUFFER, m_vertexTrans[i].vertexBuffer->bufferHandle); - - // Do the actual drawing operation, split into groups of characters no - // larger than the pre-determined size of the element array -@@ -285,7 +285,7 @@ CVertexBuffer CGUIFontTTFGL::CreateVertexBuffer(const std::vector<SVertex> &vert - // Unbind GL_ARRAY_BUFFER - glBindBuffer(GL_ARRAY_BUFFER, 0); - -- return CVertexBuffer((void *) bufferHandle, vertices.size() / 4, this); -+ return CVertexBuffer(bufferHandle, vertices.size() / 4, this); - } - - void CGUIFontTTFGL::DestroyVertexBuffer(CVertexBuffer &buffer) const diff --git a/media-tv/kodi/files/kodi-9999-no-arm-flags.patch b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch deleted file mode 100644 index 64c1cfbc8fe..00000000000 --- a/media-tv/kodi/files/kodi-9999-no-arm-flags.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/400617 - -do not force any particular ABI or FPU or SIMD compiler flags for arm -targets. let the toolchain and user CFLAGS control that. - ---- a/configure.ac -+++ b/configure.ac -@@ -571,7 +571,7 @@ - elif test "$target_platform" = "target_raspberry_pi"; then - ARCH="arm" - use_arch="arm" --elif test "$use_arch" = "arm"; then -+elif false; then - CFLAGS="$CFLAGS -mno-apcs-stack-check" - CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check" - FFMPEG_EXTRACFLAGS="" diff --git a/media-tv/kodi/files/kodi-9999-texturepacker.patch b/media-tv/kodi/files/kodi-9999-texturepacker.patch deleted file mode 100644 index a39244312a4..00000000000 --- a/media-tv/kodi/files/kodi-9999-texturepacker.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:18.880029509 +0100 -+++ b/tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:41.459671679 +0100 -@@ -9,14 +9,10 @@ - - ifeq ($(NATIVEPLATFORM),) - PLATFORM = native -- EXTRA_CONFIGURE = --enable-static - else - PLATFORM = $(NATIVEPLATFORM) - endif - --ifeq ($(NATIVE_OS), linux) -- EXTRA_CONFIGURE = --enable-static --endif - ifeq ($(NATIVE_OS), android) - EXTRA_CONFIGURE = --enable-static - endif diff --git a/media-tv/kodi/kodi-16.1-r4.ebuild b/media-tv/kodi/kodi-16.1-r4.ebuild deleted file mode 100644 index 1b322cb36f6..00000000000 --- a/media-tv/kodi/kodi-16.1-r4.ebuild +++ /dev/null @@ -1,309 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs - -CODENAME="Jarvis" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-r3 - ;; -*) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV//_alpha/a} - MY_PV=${MY_PV//_beta/b} - MY_PV=${MY_PV//_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz - https://dev.gentoo.org/~soap/distfiles/${PN}-${PV}-gcc-6.patch - !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons-r1.tar.xz )" - KEYWORDS="~amd64 ~x86" - - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} - ;; -esac - -DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="airplay alsa bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp systemd test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X zeroconf" -# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - ?? ( gles vaapi ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-i18n/enca - airplay? ( - app-pda/libplist - net-libs/shairplay - ) - dev-libs/boost:= - dev-libs/expat - dev-libs/fribidi - dev-libs/libcdio[-minimal] - cec? ( >=dev-libs/libcec-3.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/simplejson[${PYTHON_USEDEP}] - media-fonts/corefonts - media-fonts/roboto - alsa? ( media-libs/alsa-lib ) - media-libs/flac - media-libs/fontconfig - media-libs/freetype - media-libs/jasper:= - media-libs/jbigkit - >=media-libs/libass-0.9.7 - bluray? ( >=media-libs/libbluray-0.7.0 ) - css? ( media-libs/libdvdcss ) - media-libs/libmad - media-libs/libmodplug - media-libs/libmpeg2 - media-libs/libogg - media-libs/libpng:0= - media-libs/libsamplerate - joystick? ( media-libs/libsdl2 ) - >=media-libs/taglib-1.8 - media-libs/libvorbis - media-libs/tiff:0= - media-sound/dcadec - pulseaudio? ( media-sound/pulseaudio ) - media-sound/wavpack - >=media-video/ffmpeg-2.6:=[encode,postproc] - rtmp? ( media-video/rtmpdump ) - nfs? ( net-fs/libnfs:= ) - webserver? ( net-libs/libmicrohttpd[messages] ) - sftp? ( net-libs/libssh[sftp] ) - net-misc/curl - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - bluetooth? ( net-wireless/bluez ) - dbus? ( sys-apps/dbus ) - caps? ( sys-libs/libcap ) - sys-libs/zlib - virtual/jpeg:0= - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - opengl? ( - virtual/glu - virtual/opengl - >=media-libs/glew-1.5.6:= - ) - gles? ( - media-libs/mesa[gles2] - ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] - ) - X? ( - x11-apps/xdpyinfo - x11-apps/mesa-progs - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( - systemd? ( sys-power/upower ) - !systemd? ( - || ( sys-power/upower-pm-utils sys-power/upower ) - ) - )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-lang/swig - dev-libs/crossguid - dev-util/gperf - texturepacker? ( media-libs/giflib ) - X? ( x11-proto/xineramaproto ) - dev-util/cmake - x86? ( dev-lang/nasm ) - java? ( virtual/jre ) - test? ( dev-cpp/gtest ) - virtual/pkgconfig" -# Force java for latest git version to avoid having to hand maintain the -# generated addons package. #488118 -[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887 - "${FILESDIR}"/${PN}-9999-texturepacker.patch - "${FILESDIR}"/${PN}-16-ffmpeg3.patch - "${DISTDIR}"/${PN}-${PV}-gcc-6.patch #592446 - "${FILESDIR}"/${PN}-${PV}-GUIFontTTFGL-loses-precision.patch -) - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_unpack() { - [[ ${PV} == "9999" ]] && git-r3_src_unpack || default -} - -src_prepare() { - default - - # some dirs ship generated autotools, some dont - multijob_init - local d dirs=( - tools/depends/native/TexturePacker/src/configure - $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) - ) - for d in "${dirs[@]}" ; do - [[ -e ${d} ]] && continue - pushd ${d/%configure/.} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ - multijob_child_init eautoreconf - popd >/dev/null || die - done - multijob_finish - elibtoolize - - # Cross-compiler support - # We need JsonSchemaBuilder and TexturePacker binaries for the host system - # Later we need libsquish for the target system - if tc-is-cross-compiler ; then - mkdir "${WORKDIR}"/${CBUILD} || die - pushd "${WORKDIR}"/${CBUILD} >/dev/null || die - einfo "Building host tools" - cp -a "$S"/{tools,xbmc} ./ || die - local tools=( JsonSchemaBuilder ) - use texturepacker && tools+=( TexturePacker ) - for tool in "${tools[@]}" ; do - tc-env_build emake -C tools/depends/native/$tool - mkdir "$S"/tools/depends/native/$tool/bin || die - ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die - done - popd >/dev/null || die - - emake -f codegenerator.mk - - # Binary kodi.bin links against libsquish, - # so we need libsquish compiled for the target system - emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX) - elif [[ ${PV} == "9999" ]] || use java ; then #558798 - tc-env_build emake -f codegenerator.mk - fi - - # Disable internal func checks as our USE/DEPEND - # stuff handles this just fine already #408395 - export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes - - # Fix the final version string showing as "exported" - # instead of the SVN revision number. - export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/linux/*.cpp || die - - # Tweak autotool timestamps to avoid regeneration - find . -type f -exec touch -r configure {} + || die -} - -src_configure() { - # Disable documentation generation - export ac_cv_path_LATEX=no - # Avoid help2man - export HELP2MAN=$(type -P help2man || echo true) - # No configure flage for this #403561 - export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) - # Requiring java is asine #434662 - [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) - - econf \ - --disable-ccache \ - --disable-optimizations \ - --with-ffmpeg=shared \ - $(use_enable alsa) \ - $(use_enable airplay) \ - $(use_enable airplay airtunes) \ - $(use_enable bluray libbluray) \ - $(use_enable caps libcap) \ - $(use_enable cec libcec) \ - $(use_enable css dvdcss) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable gles) \ - $(use_enable joystick) \ - $(use_enable midi mid) \ - $(use_enable mysql) \ - $(use_enable nfs) \ - $(use_enable opengl gl) \ - $(use_enable profile profiling) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rtmp) \ - $(use_enable samba) \ - $(use_enable sftp ssh) \ - $(use_enable usb libusb) \ - $(use_enable test gtest) \ - $(use_enable texturepacker) \ - $(use_enable upnp) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable webserver) \ - $(use_enable X x11) \ - $(use_enable zeroconf avahi) -} - -src_compile() { - emake V=1 -} - -src_install() { - default - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - domenu tools/Linux/kodi.desktop - newicon media/icon48x48.png kodi.png - - # Remove fontconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die - dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf - dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/kodi-16.1.ebuild b/media-tv/kodi/kodi-16.1.ebuild deleted file mode 100644 index 6cb080e663a..00000000000 --- a/media-tv/kodi/kodi-16.1.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs - -CODENAME="Jarvis" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-r3 - ;; -*) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV//_alpha/a} - MY_PV=${MY_PV//_beta/b} - MY_PV=${MY_PV//_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz - !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons-r1.tar.xz )" - KEYWORDS="amd64 x86" - - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} - ;; -esac - -DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="airplay alsa bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X zeroconf" -# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - ?? ( gles vaapi ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-i18n/enca - airplay? ( app-pda/libplist ) - dev-libs/boost:= - dev-libs/expat - dev-libs/fribidi - dev-libs/libcdio[-minimal] - cec? ( >=dev-libs/libcec-3.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/simplejson[${PYTHON_USEDEP}] - media-fonts/corefonts - media-fonts/roboto - alsa? ( media-libs/alsa-lib ) - media-libs/flac - media-libs/fontconfig - media-libs/freetype - media-libs/jasper:= - media-libs/jbigkit - >=media-libs/libass-0.9.7 - bluray? ( >=media-libs/libbluray-0.7.0 ) - css? ( media-libs/libdvdcss ) - media-libs/libmad - media-libs/libmodplug - media-libs/libmpeg2 - media-libs/libogg - media-libs/libpng:0= - media-libs/libsamplerate - joystick? ( media-libs/libsdl2 ) - >=media-libs/taglib-1.8 - media-libs/libvorbis - media-libs/tiff:0= - media-sound/dcadec - pulseaudio? ( media-sound/pulseaudio ) - media-sound/wavpack - >=media-video/ffmpeg-2.6:=[encode] - rtmp? ( media-video/rtmpdump ) - nfs? ( net-fs/libnfs:= ) - webserver? ( net-libs/libmicrohttpd[messages] ) - sftp? ( net-libs/libssh[sftp] ) - net-misc/curl - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - bluetooth? ( net-wireless/bluez ) - dbus? ( sys-apps/dbus ) - caps? ( sys-libs/libcap ) - sys-libs/zlib - virtual/jpeg:0= - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - opengl? ( - virtual/glu - virtual/opengl - >=media-libs/glew-1.5.6:= - ) - gles? ( - media-libs/mesa[gles2] - ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] - ) - X? ( - x11-apps/xdpyinfo - x11-apps/mesa-progs - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - ) - zeroconf? ( net-dns/avahi ) -" -RDEPEND="${COMMON_DEPEND} - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-lang/swig - dev-libs/crossguid - dev-util/gperf - texturepacker? ( media-libs/giflib ) - X? ( x11-proto/xineramaproto ) - dev-util/cmake - x86? ( dev-lang/nasm ) - java? ( virtual/jre ) - test? ( dev-cpp/gtest ) - virtual/pkgconfig" -# Force java for latest git version to avoid having to hand maintain the -# generated addons package. #488118 -[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887 - "${FILESDIR}"/${PN}-9999-texturepacker.patch - "${FILESDIR}"/${PN}-16-ffmpeg3.patch -) - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_unpack() { - [[ ${PV} == "9999" ]] && git-r3_src_unpack || default -} - -src_prepare() { - default - - # some dirs ship generated autotools, some dont - multijob_init - local d dirs=( - tools/depends/native/TexturePacker/src/configure - $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) - ) - for d in "${dirs[@]}" ; do - [[ -e ${d} ]] && continue - pushd ${d/%configure/.} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ - multijob_child_init eautoreconf - popd >/dev/null || die - done - multijob_finish - elibtoolize - - # Cross-compiler support - # We need JsonSchemaBuilder and TexturePacker binaries for the host system - # Later we need libsquish for the target system - if tc-is-cross-compiler ; then - mkdir "${WORKDIR}"/${CBUILD} || die - pushd "${WORKDIR}"/${CBUILD} >/dev/null || die - einfo "Building host tools" - cp -a "$S"/{tools,xbmc} ./ || die - local tools=( JsonSchemaBuilder ) - use texturepacker && tools+=( TexturePacker ) - for tool in "${tools[@]}" ; do - tc-env_build emake -C tools/depends/native/$tool - mkdir "$S"/tools/depends/native/$tool/bin || die - ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die - done - popd >/dev/null || die - - emake -f codegenerator.mk - - # Binary kodi.bin links against libsquish, - # so we need libsquish compiled for the target system - emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX) - elif [[ ${PV} == "9999" ]] || use java ; then #558798 - tc-env_build emake -f codegenerator.mk - fi - - # Disable internal func checks as our USE/DEPEND - # stuff handles this just fine already #408395 - export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes - - # Fix the final version string showing as "exported" - # instead of the SVN revision number. - export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/linux/*.cpp || die - - # Tweak autotool timestamps to avoid regeneration - find . -type f -exec touch -r configure {} + || die -} - -src_configure() { - # Disable documentation generation - export ac_cv_path_LATEX=no - # Avoid help2man - export HELP2MAN=$(type -P help2man || echo true) - # No configure flage for this #403561 - export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) - # Requiring java is asine #434662 - [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) - - econf \ - --disable-ccache \ - --disable-optimizations \ - --with-ffmpeg=shared \ - $(use_enable alsa) \ - $(use_enable airplay) \ - $(use_enable bluray libbluray) \ - $(use_enable caps libcap) \ - $(use_enable cec libcec) \ - $(use_enable css dvdcss) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable gles) \ - $(use_enable joystick) \ - $(use_enable midi mid) \ - $(use_enable mysql) \ - $(use_enable nfs) \ - $(use_enable opengl gl) \ - $(use_enable profile profiling) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rtmp) \ - $(use_enable samba) \ - $(use_enable sftp ssh) \ - $(use_enable usb libusb) \ - $(use_enable test gtest) \ - $(use_enable texturepacker) \ - $(use_enable upnp) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable webserver) \ - $(use_enable X x11) \ - $(use_enable zeroconf avahi) -} - -src_compile() { - emake V=1 -} - -src_install() { - default - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - domenu tools/Linux/kodi.desktop - newicon media/icon48x48.png kodi.png - - # Remove fontconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die - dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf - dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/kodi-17.0-r4.ebuild b/media-tv/kodi/kodi-17.0-r4.ebuild deleted file mode 100644 index 719b9853100..00000000000 --- a/media-tv/kodi/kodi-17.0-r4.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 cmake-utils autotools - -LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" -LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" -LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" -FFMPEG_VERSION="3.1.6" -CODENAME="Krypton" -SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz - !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )" - -DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"; - -LICENSE="GPL-2" -SLOT="0" -# use flag is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - gles? ( X ) - opengl? ( X ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( - app-pda/libplist - net-libs/shairplay - ) - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-0.7.0 ) - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - dev-db/sqlite - dev-libs/expat - dev-libs/fribidi - cec? ( >=dev-libs/libcec-4.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/pillow[${PYTHON_USEDEP}] - dev-libs/libcdio - gles? ( media-libs/mesa[gles2] ) - libusb? ( virtual/libusb:1 ) - media-fonts/corefonts - >=media-fonts/noto-20160531 - media-fonts/roboto - media-libs/fontconfig - media-libs/freetype - >=media-libs/libass-0.13.4 - media-libs/mesa[egl] - >=media-libs/taglib-1.11.1 - system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] ) - mysql? ( virtual/mysql ) - >=net-misc/curl-7.51.0 - nfs? ( net-fs/libnfs:= ) - opengl? ( media-libs/glu ) - !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) - libressl? ( dev-libs/libressl:0= ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - sftp? ( net-libs/libssh[sftp] ) - sys-libs/zlib - udev? ( virtual/udev ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) - ) - webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) - X? ( - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - ) - xslt? ( dev-libs/libxslt ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - lirc? ( - || ( app-misc/lirc app-misc/inputlircd ) - ) - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( - systemd? ( sys-power/upower ) - !systemd? ( - || ( sys-power/upower-pm-utils sys-power/upower ) - ) - ) -" -DEPEND="${COMMON_DEPEND} - app-arch/bzip2 - app-arch/unzip - app-arch/xz-utils - app-arch/zip - dev-lang/swig - dev-libs/crossguid - dev-util/cmake - dev-util/gperf - media-libs/giflib - >=media-libs/libjpeg-turbo-1.5.1:= - >=media-libs/libpng-1.6.26:0= - test? ( dev-cpp/gtest ) - virtual/pkgconfig - x86? ( dev-lang/nasm ) -" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-r3 - # Force java for latest git version to avoid having to hand maintain the - # generated addons package. #488118 - DEPEND+=" - virtual/jre - " - ;; -*) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz - !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )" - KEYWORDS="~amd64 ~x86" - IUSE+=" java" - DEPEND+=" - java? ( virtual/jre ) - " - - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} - ;; -esac - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -CMAKE_USE_DIR=${S}/project/cmake/ - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_prepare() { - if in_iuse java && use !java; then - eapply "${FILESDIR}"/${PN}-cmake-no-java.patch - fi - cmake-utils_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/linux/*.cpp || die - - # Prepare tools and libs witch are configured with autotools during compile time - AUTOTOOLS_DIRS=( - "${S}"/lib/cpluff - "${S}"/tools/depends/native/TexturePacker/src - "${S}"/tools/depends/native/JsonSchemaBuilder/src - ) - - local d - for d in "${AUTOTOOLS_DIRS[@]}" ; do - pushd ${d} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die - done - elibtoolize - - # Prevent autoreconf rerun - sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/project/cmake/modules/FindCpluff.cmake \ - "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ - "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh -} - -src_configure() { - local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) - - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=$(usex airplay) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_BLUETOOTH=$(usex bluetooth) - -DENABLE_BLURAY=$(usex bluray) - -DENABLE_CCACHE=OFF - -DENABLE_CEC=$(usex cec) - -DENABLE_DBUS=$(usex dbus) - -DENABLE_DVDCSS=$(usex css) - -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" - -DENABLE_CAP=$(usex caps) - -DENABLE_LIRC=$(usex lirc) - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_NONFREE=$(usex nonfree) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPENSSL=ON - -DENABLE_OPTICAL=$(usex dvd) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_SSH=$(usex sftp) - -DENABLE_UDEV=$(usex udev) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_X11=$(usex X) - -DENABLE_XSLT=$(usex xslt) - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" - ) - - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - - use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usev test) -} - -src_install() { - cmake-utils_src_install - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - newicon media/icon48x48.png kodi.png - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die - dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ - usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf - - local f - for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do - rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die - dosym /usr/share/fonts/noto/"${f}" \ - usr/share/kodi/addons/skin.estuary/fonts/"${f}" - done - - rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/kodi-17.1-r3.ebuild b/media-tv/kodi/kodi-17.1-r3.ebuild deleted file mode 100644 index 719b9853100..00000000000 --- a/media-tv/kodi/kodi-17.1-r3.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 cmake-utils autotools - -LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" -LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" -LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" -FFMPEG_VERSION="3.1.6" -CODENAME="Krypton" -SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz - !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )" - -DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"; - -LICENSE="GPL-2" -SLOT="0" -# use flag is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - gles? ( X ) - opengl? ( X ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( - app-pda/libplist - net-libs/shairplay - ) - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-0.7.0 ) - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - dev-db/sqlite - dev-libs/expat - dev-libs/fribidi - cec? ( >=dev-libs/libcec-4.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/pillow[${PYTHON_USEDEP}] - dev-libs/libcdio - gles? ( media-libs/mesa[gles2] ) - libusb? ( virtual/libusb:1 ) - media-fonts/corefonts - >=media-fonts/noto-20160531 - media-fonts/roboto - media-libs/fontconfig - media-libs/freetype - >=media-libs/libass-0.13.4 - media-libs/mesa[egl] - >=media-libs/taglib-1.11.1 - system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] ) - mysql? ( virtual/mysql ) - >=net-misc/curl-7.51.0 - nfs? ( net-fs/libnfs:= ) - opengl? ( media-libs/glu ) - !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) - libressl? ( dev-libs/libressl:0= ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - sftp? ( net-libs/libssh[sftp] ) - sys-libs/zlib - udev? ( virtual/udev ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) - ) - webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) - X? ( - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - ) - xslt? ( dev-libs/libxslt ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - lirc? ( - || ( app-misc/lirc app-misc/inputlircd ) - ) - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( - systemd? ( sys-power/upower ) - !systemd? ( - || ( sys-power/upower-pm-utils sys-power/upower ) - ) - ) -" -DEPEND="${COMMON_DEPEND} - app-arch/bzip2 - app-arch/unzip - app-arch/xz-utils - app-arch/zip - dev-lang/swig - dev-libs/crossguid - dev-util/cmake - dev-util/gperf - media-libs/giflib - >=media-libs/libjpeg-turbo-1.5.1:= - >=media-libs/libpng-1.6.26:0= - test? ( dev-cpp/gtest ) - virtual/pkgconfig - x86? ( dev-lang/nasm ) -" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-r3 - # Force java for latest git version to avoid having to hand maintain the - # generated addons package. #488118 - DEPEND+=" - virtual/jre - " - ;; -*) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz - !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )" - KEYWORDS="~amd64 ~x86" - IUSE+=" java" - DEPEND+=" - java? ( virtual/jre ) - " - - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} - ;; -esac - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -CMAKE_USE_DIR=${S}/project/cmake/ - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_prepare() { - if in_iuse java && use !java; then - eapply "${FILESDIR}"/${PN}-cmake-no-java.patch - fi - cmake-utils_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/linux/*.cpp || die - - # Prepare tools and libs witch are configured with autotools during compile time - AUTOTOOLS_DIRS=( - "${S}"/lib/cpluff - "${S}"/tools/depends/native/TexturePacker/src - "${S}"/tools/depends/native/JsonSchemaBuilder/src - ) - - local d - for d in "${AUTOTOOLS_DIRS[@]}" ; do - pushd ${d} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die - done - elibtoolize - - # Prevent autoreconf rerun - sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/project/cmake/modules/FindCpluff.cmake \ - "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ - "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh -} - -src_configure() { - local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) - - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=$(usex airplay) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_BLUETOOTH=$(usex bluetooth) - -DENABLE_BLURAY=$(usex bluray) - -DENABLE_CCACHE=OFF - -DENABLE_CEC=$(usex cec) - -DENABLE_DBUS=$(usex dbus) - -DENABLE_DVDCSS=$(usex css) - -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" - -DENABLE_CAP=$(usex caps) - -DENABLE_LIRC=$(usex lirc) - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_NONFREE=$(usex nonfree) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPENSSL=ON - -DENABLE_OPTICAL=$(usex dvd) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_SSH=$(usex sftp) - -DENABLE_UDEV=$(usex udev) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_X11=$(usex X) - -DENABLE_XSLT=$(usex xslt) - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" - ) - - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - - use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usev test) -} - -src_install() { - cmake-utils_src_install - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - newicon media/icon48x48.png kodi.png - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die - dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ - usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf - - local f - for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do - rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die - dosym /usr/share/fonts/noto/"${f}" \ - usr/share/kodi/addons/skin.estuary/fonts/"${f}" - done - - rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/kodi-17.2.ebuild b/media-tv/kodi/kodi-17.2.ebuild deleted file mode 100644 index 94c5a55bfa5..00000000000 --- a/media-tv/kodi/kodi-17.2.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 cmake-utils autotools - -LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" -LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" -LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" -FFMPEG_VERSION="3.1.6" -CODENAME="Krypton" -SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz - !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )" - -DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"; - -LICENSE="GPL-2" -SLOT="0" -# use flag is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - gles? ( X ) - opengl? ( X ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( - app-pda/libplist - net-libs/shairplay - ) - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-0.7.0 ) - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - dev-db/sqlite - dev-libs/expat - dev-libs/fribidi - cec? ( >=dev-libs/libcec-4.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/pillow[${PYTHON_USEDEP}] - dev-libs/libcdio - gles? ( media-libs/mesa[gles2] ) - libusb? ( virtual/libusb:1 ) - media-fonts/corefonts - >=media-fonts/noto-20160531 - media-fonts/roboto - media-libs/fontconfig - media-libs/freetype - >=media-libs/libass-0.13.4 - media-libs/mesa[egl] - >=media-libs/taglib-1.11.1 - system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] ) - mysql? ( virtual/mysql ) - >=net-misc/curl-7.51.0 - nfs? ( net-fs/libnfs:= ) - opengl? ( media-libs/glu ) - !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) - libressl? ( dev-libs/libressl:0= ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - sftp? ( net-libs/libssh[sftp] ) - sys-libs/zlib - udev? ( virtual/udev ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) - ) - webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) - X? ( - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - ) - xslt? ( dev-libs/libxslt ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - lirc? ( - || ( app-misc/lirc app-misc/inputlircd ) - ) - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( - systemd? ( sys-power/upower ) - !systemd? ( - || ( sys-power/upower-pm-utils sys-power/upower ) - ) - ) -" -DEPEND="${COMMON_DEPEND} - app-arch/bzip2 - app-arch/unzip - app-arch/xz-utils - app-arch/zip - dev-lang/swig - dev-libs/crossguid - dev-util/cmake - dev-util/gperf - media-libs/giflib - >=media-libs/libjpeg-turbo-1.5.1:= - >=media-libs/libpng-1.6.26:0= - test? ( dev-cpp/gtest ) - virtual/pkgconfig - x86? ( dev-lang/nasm ) -" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-r3 - # Force java for latest git version to avoid having to hand maintain the - # generated addons package. #488118 - DEPEND+=" - virtual/jre - " - ;; -*) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz - !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )" - KEYWORDS="amd64 x86" - IUSE+=" java" - DEPEND+=" - java? ( virtual/jre ) - " - - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} - ;; -esac - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -CMAKE_USE_DIR=${S}/project/cmake/ - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_prepare() { - if in_iuse java && use !java; then - eapply "${FILESDIR}"/${PN}-cmake-no-java.patch - fi - cmake-utils_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/linux/*.cpp || die - - # Prepare tools and libs witch are configured with autotools during compile time - AUTOTOOLS_DIRS=( - "${S}"/lib/cpluff - "${S}"/tools/depends/native/TexturePacker/src - "${S}"/tools/depends/native/JsonSchemaBuilder/src - ) - - local d - for d in "${AUTOTOOLS_DIRS[@]}" ; do - pushd ${d} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die - done - elibtoolize - - # Prevent autoreconf rerun - sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/project/cmake/modules/FindCpluff.cmake \ - "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ - "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh -} - -src_configure() { - local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) - - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=$(usex airplay) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_BLUETOOTH=$(usex bluetooth) - -DENABLE_BLURAY=$(usex bluray) - -DENABLE_CCACHE=OFF - -DENABLE_CEC=$(usex cec) - -DENABLE_DBUS=$(usex dbus) - -DENABLE_DVDCSS=$(usex css) - -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" - -DENABLE_CAP=$(usex caps) - -DENABLE_LIRC=$(usex lirc) - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_NONFREE=$(usex nonfree) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPENSSL=ON - -DENABLE_OPTICAL=$(usex dvd) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_SSH=$(usex sftp) - -DENABLE_UDEV=$(usex udev) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_X11=$(usex X) - -DENABLE_XSLT=$(usex xslt) - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" - ) - - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - - use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usev test) -} - -src_install() { - cmake-utils_src_install - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - newicon media/icon48x48.png kodi.png - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die - dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ - usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf - - local f - for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do - rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die - dosym /usr/share/fonts/noto/"${f}" \ - usr/share/kodi/addons/skin.estuary/fonts/"${f}" - done - - rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml index 89e4d8a7d65..cbc623e2e5c 100644 --- a/media-tv/kodi/metadata.xml +++ b/media-tv/kodi/metadata.xml @@ -15,14 +15,11 @@ <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag> <flag name="gles">Enable support for GLES</flag> <flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag> - <flag name="midi">Support MIDI files</flag> <flag name="nfs">Enable NFS client support</flag> <flag name="nonfree">Enable non-free components</flag> <flag name="dvd">Enable optical (CD/DVD drive) support</flag> - <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag> <flag name="sftp">Support browsing files over SFTP</flag> <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> - <flag name="texturepacker">Support packing skin textures</flag> <flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag> <flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag> <flag name="webserver">Enable internal webserver</flag>
