| 1 |
commit: de8659db6cdfc6ca835d142f1821cdb5f3017ec3 |
| 2 |
Author: Craig Andrews <candrews <AT> integralblue <DOT> com> |
| 3 |
AuthorDate: Sun Jun 4 01:22:00 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 6 21:48:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8659db |
| 7 |
|
| 8 |
media-tv/kodi and media-libs/kodi-platform: Drop old versions |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/4845 |
| 12 |
|
| 13 |
media-libs/kodi-platform/Manifest | 1 - |
| 14 |
.../kodi-platform/kodi-platform-16.9999.ebuild | 24 - |
| 15 |
.../kodi-platform-16_p20150805.ebuild | 24 - |
| 16 |
media-tv/kodi/Manifest | 9 - |
| 17 |
media-tv/kodi/files/kodi-14.1-no-arm-flags.patch | 16 - |
| 18 |
media-tv/kodi/files/kodi-16-ffmpeg3.patch | 641 --------------------- |
| 19 |
.../kodi-16.1-GUIFontTTFGL-loses-precision.patch | 63 -- |
| 20 |
media-tv/kodi/files/kodi-9999-no-arm-flags.patch | 16 - |
| 21 |
media-tv/kodi/files/kodi-9999-texturepacker.patch | 17 - |
| 22 |
media-tv/kodi/kodi-16.1-r4.ebuild | 309 ---------- |
| 23 |
media-tv/kodi/kodi-16.1.ebuild | 297 ---------- |
| 24 |
media-tv/kodi/kodi-17.0-r4.ebuild | 279 --------- |
| 25 |
media-tv/kodi/kodi-17.1-r3.ebuild | 279 --------- |
| 26 |
media-tv/kodi/kodi-17.2.ebuild | 279 --------- |
| 27 |
media-tv/kodi/metadata.xml | 3 - |
| 28 |
15 files changed, 2257 deletions(-) |
| 29 |
|
| 30 |
diff --git a/media-libs/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest |
| 31 |
index 0916a04c850..3f925cf4e27 100644 |
| 32 |
--- a/media-libs/kodi-platform/Manifest |
| 33 |
+++ b/media-libs/kodi-platform/Manifest |
| 34 |
@@ -1,2 +1 @@ |
| 35 |
-DIST kodi-platform-16_p20150805.tar.gz 8389 SHA256 158b083f5c18ca17a939e6858efd09959b9416e56b42ca884aa35f2ddae9fd2d SHA512 6668735206124a2942d8f3138b9e1eafeb2c97c5a81a6fd3e80e3d4ced676993d629f3dc7683ad226fd1665232c7c2cc062a3b52e8d0efcb9a7583506a29890d WHIRLPOOL 6b0bafb93cbb9a421d4f5d3d578c41899488a05f654f517da308a3f5b85b71267a011771906f97141a9b83ebcc153d7bf9e3c18391849865f13618ef48e508e6 |
| 36 |
DIST kodi-platform-17.1.0.1.tar.gz 8538 SHA256 972dff4acc9580551113da8d5895f9aedd27c3579e8e48126303384a54424f94 SHA512 c3501b30d6e643239d1a5726eae79d734392709240b21fd314c97fa8a98b0c4ba912c8a246bd53e7049fadde0f695274ae4d1920442ab9a22337258388f80bcb WHIRLPOOL 088658b114fe62e5941b389c33b1acc887d757ce109f1a83c57ce21748b7da73d69bd87baaf96aa82ce5aed70bb725cb31699851e5441b5f6e31b51cb632f7da |
| 37 |
|
| 38 |
diff --git a/media-libs/kodi-platform/kodi-platform-16.9999.ebuild b/media-libs/kodi-platform/kodi-platform-16.9999.ebuild |
| 39 |
deleted file mode 100644 |
| 40 |
index a00432da5e8..00000000000 |
| 41 |
--- a/media-libs/kodi-platform/kodi-platform-16.9999.ebuild |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,24 +0,0 @@ |
| 44 |
-# Copyright 1999-2016 Gentoo Foundation |
| 45 |
-# Distributed under the terms of the GNU General Public License v2 |
| 46 |
- |
| 47 |
-EAPI=5 |
| 48 |
- |
| 49 |
-inherit git-2 cmake-utils |
| 50 |
- |
| 51 |
-EGIT_REPO_URI="https://github.com/xbmc/kodi-platform" |
| 52 |
-EGIT_BRANCH="Jarvis" |
| 53 |
- |
| 54 |
-DESCRIPTION="Kodi platform support library" |
| 55 |
-HOMEPAGE="https://github.com/xbmc/kodi-platform" |
| 56 |
-SRC_URI="" |
| 57 |
- |
| 58 |
-LICENSE="GPL-2" |
| 59 |
-SLOT="0" |
| 60 |
-KEYWORDS="" |
| 61 |
-IUSE="" |
| 62 |
- |
| 63 |
-# libplatform changed in version 2 from platform to p8-platform which makes it incompatible |
| 64 |
-DEPEND="=dev-libs/libplatform-1* |
| 65 |
- dev-libs/tinyxml |
| 66 |
- =media-tv/kodi-16*" |
| 67 |
-RDEPEND="${DEPEND}" |
| 68 |
|
| 69 |
diff --git a/media-libs/kodi-platform/kodi-platform-16_p20150805.ebuild b/media-libs/kodi-platform/kodi-platform-16_p20150805.ebuild |
| 70 |
deleted file mode 100644 |
| 71 |
index bb268beb9c1..00000000000 |
| 72 |
--- a/media-libs/kodi-platform/kodi-platform-16_p20150805.ebuild |
| 73 |
+++ /dev/null |
| 74 |
@@ -1,24 +0,0 @@ |
| 75 |
-# Copyright 1999-2016 Gentoo Foundation |
| 76 |
-# Distributed under the terms of the GNU General Public License v2 |
| 77 |
- |
| 78 |
-EAPI=5 |
| 79 |
- |
| 80 |
-inherit cmake-utils |
| 81 |
- |
| 82 |
-GIT_COMMIT="15edaf7" |
| 83 |
-DESCRIPTION="Kodi platform support library" |
| 84 |
-HOMEPAGE="https://github.com/xbmc/kodi-platform" |
| 85 |
-SRC_URI="https://github.com/xbmc/kodi-platform/tarball/${GIT_COMMIT} -> ${P}.tar.gz" |
| 86 |
- |
| 87 |
-LICENSE="GPL-2" |
| 88 |
-SLOT="0" |
| 89 |
-KEYWORDS="~amd64" |
| 90 |
-IUSE="" |
| 91 |
- |
| 92 |
-# libplatform changed in version 2 from platform to p8-platform which makes it incompatible |
| 93 |
-DEPEND="=dev-libs/libplatform-1* |
| 94 |
- dev-libs/tinyxml |
| 95 |
- =media-tv/kodi-16*" |
| 96 |
-RDEPEND="${DEPEND}" |
| 97 |
- |
| 98 |
-S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}" |
| 99 |
|
| 100 |
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest |
| 101 |
index 350d870f4b7..922f625ad12 100644 |
| 102 |
--- a/media-tv/kodi/Manifest |
| 103 |
+++ b/media-tv/kodi/Manifest |
| 104 |
@@ -1,13 +1,4 @@ |
| 105 |
DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 SHA256 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1 WHIRLPOOL ae6f0b3b798e92cd72aed8eb3e6dc82708c86052590b30ae93e1b8275dca89c5a4470dbc8ff51bfefd72bd40036b7bd1b7695ee77e90bab35b5e80bcb8b79826 |
| 106 |
-DIST kodi-16.1-gcc-6.patch 63436 SHA256 cc4d730f163fcc3a99cb67480953cb043c17097d815bf41da441c7e66caaa0dc SHA512 9236608e26685feccd4492c58e7b5c4262e0ac100aabda46a565685eaa19af5b9bbe11f59cecc91de33474ac024ff74d670fe137fa2490f4ec1207817fb7fd23 WHIRLPOOL 336ba43387c154e67a5a3592675f802a50771e3bac14af79f9413773185f6b35e85a1af10988b96238a00e6a9c300caf856435f356572b7fb441e652164c8917 |
| 107 |
-DIST kodi-16.1-generated-addons-r1.tar.xz 54528 SHA256 ffa06845ed95597b46a178575e361f0641f78778be553d7a9f51b4cc190d2629 SHA512 32c9a5bb6ed5f5d8e73a37c35268c1a7176c6a4c52c5b5e8f6c5c76a3c51445ff0a5b8802be94ada5d63ecbea4d7e69b61d579c931900f6ba6abb583bbe542d9 WHIRLPOOL 3cd62abee6854efbee0070d811d0ef03f7b2d1d629c91d43fb2a2883c83733267affef60339459ce1ca7e30b1b856e20b929883cd12958348803c428d69e142e |
| 108 |
-DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d |
| 109 |
-DIST kodi-17.0-generated-addons.tar.xz 57552 SHA256 89f7b681e920cec5974ec133e7c895ae2d2372d006e25dc4085668f2e9784813 SHA512 87e1610456c6c21193bc88dc9e62b941ec2caadcac42f9fae13abff193d446452f8ac007810d88990d7549039713ed970d9ac6436fe730794c669cab19fac5b7 WHIRLPOOL 7bf3176511da59226a7974d22cc28d614b16f5db2904ae4b5c6d4ed668808a0fca8440a264bef882091ec1312c3fc83abe99c9dab821fb2d990d28766af68646 |
| 110 |
-DIST kodi-17.0.tar.gz 58449501 SHA256 4bfffa2493973ae15ab1d922632c09a2583908d6140bc4f58ec8f9314e4f6545 SHA512 ca0d812bcbcc58b74542872365244c5b937803c5618d2277e85a8cb805820ddb22886233d1417fa0e7532c9909749e632e276f8da51d86e1f5f060b2d1ad6a12 WHIRLPOOL f26cc7908c0618904586e255244c7f42814a52d65399a7bb16ba42f4c5079bb82176eb8035af9bf5c56469249dd4af53c161899d276f44634946333440313c53 |
| 111 |
-DIST kodi-17.1-generated-addons.tar.xz 57560 SHA256 a92a8222444a123e4876e835238ce5ddf9cfed967c07b7af17cfdd82421196ac SHA512 b3d313aceecad16c0dcf1cddeee459155b94aad4137cb74b405c0634b85f8a6819f90d3d9dad9d528ad4a39909ca7eb5ae73ed4c40c13aaa573494be2b990cd8 WHIRLPOOL b1193338224408f948175ad7ee100c9d27c45e8e07dc72adcb846e4ee2ea1febe6f605af4bfb22649dcfed95e4b16385276dbf8870f7da0f9c9886dc9ba5136d |
| 112 |
-DIST kodi-17.1.tar.gz 58457875 SHA256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee SHA512 5093fe7dcdf22e2604ea93696c909028c00a8b0c858e7b25f55dade6c3423b4a68f5a49a8a0dd5238b10f4a7dd5e815a82251949ce7adb8a8f8cf5d58fc7bd41 WHIRLPOOL a2f3ce757383b1e3ac40c91574a873cf23c3f10e944e5d74228a0bec287f919bcd0b1251d89c6dd33eea847a34a4149e26e8d464169538601ff9be0f817539c6 |
| 113 |
-DIST kodi-17.2-generated-addons.tar.xz 57556 SHA256 c04c610fec8345ed383afccdb0e9eb04d6327682169dd236ca36291e866f2cab SHA512 46a41f1eb45a7d2680e0c07e71073c929881a324c91d2fea0871aa31cba00296fe0b835481411a213921c7813ac75b629ff3e9d941f5ca0ad72c0d1dcf861a21 WHIRLPOOL 45372116099402dae63a51117d93f08852416ff7cad4ecf7a969a1a70d42460e9681338bf69803291774a0e6d130166e5136f0692d086eded1d7b69e527db872 |
| 114 |
-DIST kodi-17.2.tar.gz 58465212 SHA256 aed9236c5a0074a4dfc775c111d362e4358daa0030d7e8ba38fbb6d58ae1affe SHA512 79aaaaaab21dac1831f5da4f0f773a0ab7e997347a423ee42d19ba511523d21c5a16f2c924502bd8dd9000827f50e87361a0440503a6278463cddf30170ba980 WHIRLPOOL 345e2bdf58c99f4134a4010a5f9afb9d206aeaebe60cc54b30632957f416a7408f140319ff6b2558951d3a22e049d7900ec9f63064d0e90a045f5bb9d50e91d9 |
| 115 |
DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3 |
| 116 |
DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634 |
| 117 |
DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a |
| 118 |
|
| 119 |
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 |
| 120 |
deleted file mode 100644 |
| 121 |
index 82a738356ff..00000000000 |
| 122 |
--- a/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch |
| 123 |
+++ /dev/null |
| 124 |
@@ -1,16 +0,0 @@ |
| 125 |
-http://bugs.gentoo.org/400617 |
| 126 |
- |
| 127 |
-do not force any particular ABI or FPU or SIMD compiler flags for arm |
| 128 |
-targets. let the toolchain and user CFLAGS control that. |
| 129 |
- |
| 130 |
---- a/configure.in |
| 131 |
-+++ b/configure.in |
| 132 |
-@@ -571,7 +571,7 @@ |
| 133 |
- elif test "$target_platform" = "target_raspberry_pi"; then |
| 134 |
- ARCH="arm" |
| 135 |
- use_arch="arm" |
| 136 |
--elif test "$use_arch" = "arm"; then |
| 137 |
-+elif false; then |
| 138 |
- CFLAGS="$CFLAGS -mno-apcs-stack-check" |
| 139 |
- CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check" |
| 140 |
- FFMPEG_EXTRACFLAGS="" |
| 141 |
|
| 142 |
diff --git a/media-tv/kodi/files/kodi-16-ffmpeg3.patch b/media-tv/kodi/files/kodi-16-ffmpeg3.patch |
| 143 |
deleted file mode 100644 |
| 144 |
index 755af69f8f4..00000000000 |
| 145 |
--- a/media-tv/kodi/files/kodi-16-ffmpeg3.patch |
| 146 |
+++ /dev/null |
| 147 |
@@ -1,641 +0,0 @@ |
| 148 |
- |
| 149 |
-Changes from original commit are only in file paths & quilt refresh. |
| 150 |
- |
| 151 |
-commit c31b7d374062f87c7512d9872cbceac920465913 |
| 152 |
-Author: Philip Langdale <philipl@×××××.org> |
| 153 |
-Date: Mon Sep 21 19:49:36 2015 -0700 |
| 154 |
- |
| 155 |
- ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master |
| 156 |
- |
| 157 |
- The deprecated PixelFormat and PIX_FMT_* names have been removed in |
| 158 |
- ffmpeg master. |
| 159 |
- |
| 160 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h |
| 161 |
-=================================================================== |
| 162 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h |
| 163 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h |
| 164 |
-@@ -24,7 +24,6 @@ |
| 165 |
- #include "utils/CPUInfo.h" |
| 166 |
- |
| 167 |
- extern "C" { |
| 168 |
--#include "libswscale/swscale.h" |
| 169 |
- #include "libavcodec/avcodec.h" |
| 170 |
- #include "libavformat/avformat.h" |
| 171 |
- #include "libavutil/avutil.h" |
| 172 |
-@@ -33,23 +32,6 @@ extern "C" { |
| 173 |
- #include "libpostproc/postprocess.h" |
| 174 |
- } |
| 175 |
- |
| 176 |
--inline int SwScaleCPUFlags() |
| 177 |
--{ |
| 178 |
-- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); |
| 179 |
-- int flags = 0; |
| 180 |
-- |
| 181 |
-- if (cpuFeatures & CPU_FEATURE_MMX) |
| 182 |
-- flags |= SWS_CPU_CAPS_MMX; |
| 183 |
-- if (cpuFeatures & CPU_FEATURE_MMX2) |
| 184 |
-- flags |= SWS_CPU_CAPS_MMX2; |
| 185 |
-- if (cpuFeatures & CPU_FEATURE_3DNOW) |
| 186 |
-- flags |= SWS_CPU_CAPS_3DNOW; |
| 187 |
-- if (cpuFeatures & CPU_FEATURE_ALTIVEC) |
| 188 |
-- flags |= SWS_CPU_CAPS_ALTIVEC; |
| 189 |
-- |
| 190 |
-- return flags; |
| 191 |
--} |
| 192 |
-- |
| 193 |
- inline int PPCPUFlags() |
| 194 |
- { |
| 195 |
- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); |
| 196 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp |
| 197 |
-=================================================================== |
| 198 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp |
| 199 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp |
| 200 |
-@@ -39,7 +39,7 @@ extern "C" { |
| 201 |
- #include "libswscale/swscale.h" |
| 202 |
- } |
| 203 |
- |
| 204 |
--// allocate a new picture (PIX_FMT_YUV420P) |
| 205 |
-+// allocate a new picture (AV_PIX_FMT_YUV420P) |
| 206 |
- DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight) |
| 207 |
- { |
| 208 |
- DVDVideoPicture* pPicture = new DVDVideoPicture; |
| 209 |
-@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert |
| 210 |
- |
| 211 |
- int dstformat; |
| 212 |
- if (format == RENDER_FMT_UYVY422) |
| 213 |
-- dstformat = PIX_FMT_UYVY422; |
| 214 |
-+ dstformat = AV_PIX_FMT_UYVY422; |
| 215 |
- else |
| 216 |
-- dstformat = PIX_FMT_YUYV422; |
| 217 |
-+ dstformat = AV_PIX_FMT_YUYV422; |
| 218 |
- |
| 219 |
-- struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P, |
| 220 |
-+ struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P, |
| 221 |
- pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat, |
| 222 |
-- SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 223 |
-+ SWS_BILINEAR, NULL, NULL, NULL); |
| 224 |
- sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride); |
| 225 |
- sws_freeContext(ctx); |
| 226 |
- } |
| 227 |
-@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur |
| 228 |
- } |
| 229 |
- |
| 230 |
- struct EFormatMap { |
| 231 |
-- PixelFormat pix_fmt; |
| 232 |
-+ AVPixelFormat pix_fmt; |
| 233 |
- ERenderFormat format; |
| 234 |
- }; |
| 235 |
- |
| 236 |
- static const EFormatMap g_format_map[] = { |
| 237 |
-- { PIX_FMT_YUV420P, RENDER_FMT_YUV420P } |
| 238 |
--, { PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } |
| 239 |
--, { PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } |
| 240 |
--, { PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } |
| 241 |
--, { PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } |
| 242 |
--, { PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } |
| 243 |
--, { PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } |
| 244 |
--, { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } |
| 245 |
--, { PIX_FMT_NONE , RENDER_FMT_NONE } |
| 246 |
-+ { AV_PIX_FMT_YUV420P, RENDER_FMT_YUV420P } |
| 247 |
-+, { AV_PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } |
| 248 |
-+, { AV_PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } |
| 249 |
-+, { AV_PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } |
| 250 |
-+, { AV_PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } |
| 251 |
-+, { AV_PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } |
| 252 |
-+, { AV_PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } |
| 253 |
-+, { AV_PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } |
| 254 |
-+, { AV_PIX_FMT_NONE , RENDER_FMT_NONE } |
| 255 |
- }; |
| 256 |
- |
| 257 |
- ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt) |
| 258 |
- { |
| 259 |
-- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) |
| 260 |
-+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) |
| 261 |
- { |
| 262 |
- if(p->pix_fmt == fmt) |
| 263 |
- return p->format; |
| 264 |
-@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro |
| 265 |
- |
| 266 |
- int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt) |
| 267 |
- { |
| 268 |
-- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) |
| 269 |
-+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) |
| 270 |
- { |
| 271 |
- if(p->format == fmt) |
| 272 |
- return p->pix_fmt; |
| 273 |
- } |
| 274 |
-- return PIX_FMT_NONE; |
| 275 |
-+ return AV_PIX_FMT_NONE; |
| 276 |
- } |
| 277 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp |
| 278 |
-=================================================================== |
| 279 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp |
| 280 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp |
| 281 |
-@@ -77,8 +77,8 @@ enum DecoderState |
| 282 |
- STATE_SW_MULTI |
| 283 |
- }; |
| 284 |
- |
| 285 |
--enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx |
| 286 |
-- , const PixelFormat * fmt ) |
| 287 |
-+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx |
| 288 |
-+ , const AVPixelFormat * fmt ) |
| 289 |
- { |
| 290 |
- CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque; |
| 291 |
- |
| 292 |
-@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G |
| 293 |
- avctx->hwaccel_context = 0; |
| 294 |
- } |
| 295 |
- |
| 296 |
-- const PixelFormat * cur = fmt; |
| 297 |
-- while(*cur != PIX_FMT_NONE) |
| 298 |
-+ const AVPixelFormat * cur = fmt; |
| 299 |
-+ while(*cur != AV_PIX_FMT_NONE) |
| 300 |
- { |
| 301 |
- #ifdef HAVE_LIBVDPAU |
| 302 |
- if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU)) |
| 303 |
-@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G |
| 304 |
- #endif |
| 305 |
- #ifdef HAVE_LIBVA |
| 306 |
- // mpeg4 vaapi decoding is disabled |
| 307 |
-- if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) |
| 308 |
-+ if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) |
| 309 |
- { |
| 310 |
- VAAPI::CDecoder* dec = new VAAPI::CDecoder(); |
| 311 |
- if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true) |
| 312 |
-@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre |
| 313 |
- |
| 314 |
- for(std::vector<ERenderFormat>::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it) |
| 315 |
- { |
| 316 |
-- m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); |
| 317 |
-+ m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); |
| 318 |
- if(*it == RENDER_FMT_YUV420P) |
| 319 |
-- m_formats.push_back(PIX_FMT_YUVJ420P); |
| 320 |
-+ m_formats.push_back(AV_PIX_FMT_YUVJ420P); |
| 321 |
- } |
| 322 |
-- m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ |
| 323 |
-+ m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ |
| 324 |
- |
| 325 |
- pCodec = avcodec_find_decoder(hints.codec); |
| 326 |
- |
| 327 |
-@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom |
| 328 |
- pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc; |
| 329 |
- pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace; |
| 330 |
- if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG |
| 331 |
-- || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P) |
| 332 |
-+ || m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P) |
| 333 |
- pDvdVideoPicture->color_range = 1; |
| 334 |
- else |
| 335 |
- pDvdVideoPicture->color_range = 0; |
| 336 |
-@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV |
| 337 |
- pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED; |
| 338 |
- pDvdVideoPicture->extended_format = 0; |
| 339 |
- |
| 340 |
-- PixelFormat pix_fmt; |
| 341 |
-- pix_fmt = (PixelFormat)m_pFrame->format; |
| 342 |
-+ AVPixelFormat pix_fmt; |
| 343 |
-+ pix_fmt = (AVPixelFormat)m_pFrame->format; |
| 344 |
- |
| 345 |
- pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt); |
| 346 |
- return true; |
| 347 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h |
| 348 |
-=================================================================== |
| 349 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h |
| 350 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h |
| 351 |
-@@ -46,7 +46,7 @@ public: |
| 352 |
- public: |
| 353 |
- IHardwareDecoder() {} |
| 354 |
- virtual ~IHardwareDecoder() {}; |
| 355 |
-- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0; |
| 356 |
-+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0; |
| 357 |
- virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0; |
| 358 |
- virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0; |
| 359 |
- virtual int Check (AVCodecContext* avctx) = 0; |
| 360 |
-@@ -77,7 +77,7 @@ public: |
| 361 |
- void SetHardware(IHardwareDecoder* hardware); |
| 362 |
- |
| 363 |
- protected: |
| 364 |
-- static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt); |
| 365 |
-+ static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt); |
| 366 |
- |
| 367 |
- int FilterOpen(const std::string& filters, bool scale); |
| 368 |
- void FilterClose(); |
| 369 |
-@@ -119,7 +119,7 @@ protected: |
| 370 |
- int m_iLastKeyframe; |
| 371 |
- double m_dts; |
| 372 |
- bool m_started; |
| 373 |
-- std::vector<PixelFormat> m_formats; |
| 374 |
-+ std::vector<AVPixelFormat> m_formats; |
| 375 |
- double m_decoderPts; |
| 376 |
- int m_skippedDeint; |
| 377 |
- bool m_requestSkipDeint; |
| 378 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp |
| 379 |
-=================================================================== |
| 380 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp |
| 381 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp |
| 382 |
-@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop( |
| 383 |
- |
| 384 |
- void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture) |
| 385 |
- { |
| 386 |
-- // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P. |
| 387 |
-+ // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P. |
| 388 |
- struct SwsContext *swcontext = sws_getContext( |
| 389 |
-- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422, |
| 390 |
-- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, |
| 391 |
-- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 392 |
-+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422, |
| 393 |
-+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, |
| 394 |
-+ SWS_FAST_BILINEAR, NULL, NULL, NULL); |
| 395 |
- if (swcontext) |
| 396 |
- { |
| 397 |
- uint8_t *src[] = { yuv422_ptr, 0, 0, 0 }; |
| 398 |
-@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42 |
| 399 |
- |
| 400 |
- void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture) |
| 401 |
- { |
| 402 |
-- // convert PIX_FMT_BGRA to PIX_FMT_YUV420P. |
| 403 |
-+ // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P. |
| 404 |
- struct SwsContext *swcontext = sws_getContext( |
| 405 |
-- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA, |
| 406 |
-- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, |
| 407 |
-- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 408 |
-+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA, |
| 409 |
-+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, |
| 410 |
-+ SWS_FAST_BILINEAR, NULL, NULL, NULL); |
| 411 |
- if (swcontext) |
| 412 |
- { |
| 413 |
- uint8_t *src[] = { bgra_ptr, 0, 0, 0 }; |
| 414 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp |
| 415 |
-=================================================================== |
| 416 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp |
| 417 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp |
| 418 |
-@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo |
| 419 |
- return true; |
| 420 |
- } |
| 421 |
- |
| 422 |
--bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) |
| 423 |
-+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) |
| 424 |
- { |
| 425 |
- if (!CheckCompatibility(avctx)) |
| 426 |
- return false; |
| 427 |
-@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder() |
| 428 |
- return true; |
| 429 |
- } |
| 430 |
- |
| 431 |
--bool CDecoder::Supports(enum PixelFormat fmt) |
| 432 |
-+bool CDecoder::Supports(enum AVPixelFormat fmt) |
| 433 |
- { |
| 434 |
-- if(fmt == PIX_FMT_DXVA2_VLD) |
| 435 |
-+ if(fmt == AV_PIX_FMT_DXVA2_VLD) |
| 436 |
- return true; |
| 437 |
- return false; |
| 438 |
- } |
| 439 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h |
| 440 |
-=================================================================== |
| 441 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h |
| 442 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h |
| 443 |
-@@ -141,7 +141,7 @@ class CDecoder |
| 444 |
- public: |
| 445 |
- CDecoder(); |
| 446 |
- ~CDecoder(); |
| 447 |
-- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces); |
| 448 |
-+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces); |
| 449 |
- virtual int Decode (AVCodecContext* avctx, AVFrame* frame); |
| 450 |
- virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); |
| 451 |
- virtual int Check (AVCodecContext* avctx); |
| 452 |
-@@ -154,7 +154,7 @@ public: |
| 453 |
- int GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); |
| 454 |
- void RelBuffer(uint8_t *data); |
| 455 |
- |
| 456 |
-- static bool Supports(enum PixelFormat fmt); |
| 457 |
-+ static bool Supports(enum AVPixelFormat fmt); |
| 458 |
- |
| 459 |
- void CloseDXVADecoder(); |
| 460 |
- |
| 461 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp |
| 462 |
-=================================================================== |
| 463 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp |
| 464 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp |
| 465 |
-@@ -479,7 +479,7 @@ CDecoder::~CDecoder() |
| 466 |
- Close(); |
| 467 |
- } |
| 468 |
- |
| 469 |
--bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) |
| 470 |
-+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) |
| 471 |
- { |
| 472 |
- // don't support broken wrappers by default |
| 473 |
- // nvidia cards with a vaapi to vdpau wrapper |
| 474 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h |
| 475 |
-=================================================================== |
| 476 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h |
| 477 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h |
| 478 |
-@@ -406,7 +406,7 @@ public: |
| 479 |
- CDecoder(); |
| 480 |
- virtual ~CDecoder(); |
| 481 |
- |
| 482 |
-- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); |
| 483 |
-+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); |
| 484 |
- virtual int Decode (AVCodecContext* avctx, AVFrame* frame); |
| 485 |
- virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); |
| 486 |
- virtual void Reset(); |
| 487 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp |
| 488 |
-=================================================================== |
| 489 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp |
| 490 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp |
| 491 |
-@@ -186,7 +186,7 @@ void CDecoder::Close() |
| 492 |
- m_bitstream = NULL; |
| 493 |
- } |
| 494 |
- |
| 495 |
--bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) |
| 496 |
-+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) |
| 497 |
- { |
| 498 |
- Close(); |
| 499 |
- |
| 500 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h |
| 501 |
-=================================================================== |
| 502 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h |
| 503 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h |
| 504 |
-@@ -35,7 +35,7 @@ class CDecoder |
| 505 |
- public: |
| 506 |
- CDecoder(); |
| 507 |
- ~CDecoder(); |
| 508 |
-- virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); |
| 509 |
-+ virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); |
| 510 |
- virtual int Decode(AVCodecContext* avctx, AVFrame* frame); |
| 511 |
- virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); |
| 512 |
- virtual int Check(AVCodecContext* avctx); |
| 513 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp |
| 514 |
-=================================================================== |
| 515 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp |
| 516 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp |
| 517 |
-@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_ |
| 518 |
- m_vdpauConfig.context = 0; |
| 519 |
- } |
| 520 |
- |
| 521 |
--bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) |
| 522 |
-+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) |
| 523 |
- { |
| 524 |
- // check if user wants to decode this format with VDPAU |
| 525 |
- std::string gpuvendor = g_Windowing.GetRenderVendor(); |
| 526 |
-@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct |
| 527 |
- return 0; |
| 528 |
- } |
| 529 |
- |
| 530 |
--bool CDecoder::IsVDPAUFormat(PixelFormat format) |
| 531 |
-+bool CDecoder::IsVDPAUFormat(AVPixelFormat format) |
| 532 |
- { |
| 533 |
- if (format == AV_PIX_FMT_VDPAU) |
| 534 |
- return true; |
| 535 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h |
| 536 |
-=================================================================== |
| 537 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h |
| 538 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h |
| 539 |
-@@ -556,7 +556,7 @@ public: |
| 540 |
- CDecoder(); |
| 541 |
- virtual ~CDecoder(); |
| 542 |
- |
| 543 |
-- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); |
| 544 |
-+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); |
| 545 |
- virtual int Decode (AVCodecContext* avctx, AVFrame* frame); |
| 546 |
- virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); |
| 547 |
- virtual void Reset(); |
| 548 |
-@@ -571,7 +571,7 @@ public: |
| 549 |
- bool Supports(VdpVideoMixerFeature feature); |
| 550 |
- bool Supports(EINTERLACEMETHOD method); |
| 551 |
- EINTERLACEMETHOD AutoInterlaceMethod(); |
| 552 |
-- static bool IsVDPAUFormat(PixelFormat fmt); |
| 553 |
-+ static bool IsVDPAUFormat(AVPixelFormat fmt); |
| 554 |
- |
| 555 |
- static void FFReleaseBuffer(void *opaque, uint8_t *data); |
| 556 |
- static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); |
| 557 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp |
| 558 |
-=================================================================== |
| 559 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp |
| 560 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp |
| 561 |
-@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack |
| 562 |
- |
| 563 |
- // for video we need a decoder to get desired information into codec context |
| 564 |
- if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata && |
| 565 |
-- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE)) |
| 566 |
-+ (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE)) |
| 567 |
- { |
| 568 |
- // open a decoder, it will be cleared down by ffmpeg on closing the stream |
| 569 |
- if (!st->codec->codec) |
| 570 |
-@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() |
| 571 |
- st = m_pFormatContext->streams[idx]; |
| 572 |
- if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) |
| 573 |
- { |
| 574 |
-- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) |
| 575 |
-+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) |
| 576 |
- return true; |
| 577 |
- hasVideo = true; |
| 578 |
- } |
| 579 |
-@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() |
| 580 |
- st = m_pFormatContext->streams[i]; |
| 581 |
- if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) |
| 582 |
- { |
| 583 |
-- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) |
| 584 |
-+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) |
| 585 |
- return true; |
| 586 |
- hasVideo = true; |
| 587 |
- } |
| 588 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp |
| 589 |
-=================================================================== |
| 590 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp |
| 591 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp |
| 592 |
-@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st |
| 593 |
- |
| 594 |
- uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4]; |
| 595 |
- struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight, |
| 596 |
-- PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 597 |
-+ AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); |
| 598 |
- |
| 599 |
- if (context) |
| 600 |
- { |
| 601 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |
| 602 |
-=================================================================== |
| 603 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |
| 604 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |
| 605 |
-@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im |
| 606 |
- } |
| 607 |
- else if (m_format == RENDER_FMT_NV12) |
| 608 |
- { |
| 609 |
-- srcFormat = PIX_FMT_NV12; |
| 610 |
-+ srcFormat = AV_PIX_FMT_NV12; |
| 611 |
- for (int i = 0; i < 2; i++) |
| 612 |
- { |
| 613 |
- src[i] = im->plane[i]; |
| 614 |
-@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im |
| 615 |
- } |
| 616 |
- else if (m_format == RENDER_FMT_YUYV422) |
| 617 |
- { |
| 618 |
-- srcFormat = PIX_FMT_YUYV422; |
| 619 |
-+ srcFormat = AV_PIX_FMT_YUYV422; |
| 620 |
- src[0] = im->plane[0]; |
| 621 |
- srcStride[0] = im->stride[0]; |
| 622 |
- } |
| 623 |
- else if (m_format == RENDER_FMT_UYVY422) |
| 624 |
- { |
| 625 |
-- srcFormat = PIX_FMT_UYVY422; |
| 626 |
-+ srcFormat = AV_PIX_FMT_UYVY422; |
| 627 |
- src[0] = im->plane[0]; |
| 628 |
- srcStride[0] = im->stride[0]; |
| 629 |
- } |
| 630 |
-@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im |
| 631 |
- |
| 632 |
- m_context = sws_getCachedContext(m_context, |
| 633 |
- im->width, im->height, (AVPixelFormat)srcFormat, |
| 634 |
-- im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA, |
| 635 |
-- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 636 |
-+ im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA, |
| 637 |
-+ SWS_FAST_BILINEAR, NULL, NULL, NULL); |
| 638 |
- |
| 639 |
- uint8_t *dst[] = { m_rgbBuffer, 0, 0, 0 }; |
| 640 |
- int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; |
| 641 |
-@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I |
| 642 |
- |
| 643 |
- if (m_format == RENDER_FMT_YUV420P) |
| 644 |
- { |
| 645 |
-- srcFormat = PIX_FMT_YUV420P; |
| 646 |
-+ srcFormat = AV_PIX_FMT_YUV420P; |
| 647 |
- for (int i = 0; i < 3; i++) |
| 648 |
- { |
| 649 |
- srcTop[i] = im->plane[i]; |
| 650 |
-@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I |
| 651 |
- } |
| 652 |
- else if (m_format == RENDER_FMT_NV12) |
| 653 |
- { |
| 654 |
-- srcFormat = PIX_FMT_NV12; |
| 655 |
-+ srcFormat = AV_PIX_FMT_NV12; |
| 656 |
- for (int i = 0; i < 2; i++) |
| 657 |
- { |
| 658 |
- srcTop[i] = im->plane[i]; |
| 659 |
-@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I |
| 660 |
- } |
| 661 |
- else if (m_format == RENDER_FMT_YUYV422) |
| 662 |
- { |
| 663 |
-- srcFormat = PIX_FMT_YUYV422; |
| 664 |
-+ srcFormat = AV_PIX_FMT_YUYV422; |
| 665 |
- srcTop[0] = im->plane[0]; |
| 666 |
- srcStrideTop[0] = im->stride[0] * 2; |
| 667 |
- srcBot[0] = im->plane[0] + im->stride[0]; |
| 668 |
-@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I |
| 669 |
- } |
| 670 |
- else if (m_format == RENDER_FMT_UYVY422) |
| 671 |
- { |
| 672 |
-- srcFormat = PIX_FMT_UYVY422; |
| 673 |
-+ srcFormat = AV_PIX_FMT_UYVY422; |
| 674 |
- srcTop[0] = im->plane[0]; |
| 675 |
- srcStrideTop[0] = im->stride[0] * 2; |
| 676 |
- srcBot[0] = im->plane[0] + im->stride[0]; |
| 677 |
-@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I |
| 678 |
- |
| 679 |
- m_context = sws_getCachedContext(m_context, |
| 680 |
- im->width, im->height >> 1, (AVPixelFormat)srcFormat, |
| 681 |
-- im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA, |
| 682 |
-- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 683 |
-+ im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA, |
| 684 |
-+ SWS_FAST_BILINEAR, NULL, NULL, NULL); |
| 685 |
- uint8_t *dstTop[] = { m_rgbBuffer, 0, 0, 0 }; |
| 686 |
- uint8_t *dstBot[] = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 }; |
| 687 |
- int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; |
| 688 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp |
| 689 |
-=================================================================== |
| 690 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp |
| 691 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp |
| 692 |
-@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu |
| 693 |
- #endif |
| 694 |
- { |
| 695 |
- m_sw_context = sws_getCachedContext(m_sw_context, |
| 696 |
-- im->width, im->height, PIX_FMT_YUV420P, |
| 697 |
-- im->width, im->height, PIX_FMT_RGBA, |
| 698 |
-+ im->width, im->height, AV_PIX_FMT_YUV420P, |
| 699 |
-+ im->width, im->height, AV_PIX_FMT_RGBA, |
| 700 |
- SWS_FAST_BILINEAR, NULL, NULL, NULL); |
| 701 |
- |
| 702 |
- uint8_t *src[] = { im->plane[0], im->plane[1], im->plane[2], 0 }; |
| 703 |
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp |
| 704 |
-=================================================================== |
| 705 |
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp |
| 706 |
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp |
| 707 |
-@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer() |
| 708 |
- UnInit(); |
| 709 |
- } |
| 710 |
- |
| 711 |
--static enum PixelFormat PixelFormatFromFormat(ERenderFormat format) |
| 712 |
-+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format) |
| 713 |
- { |
| 714 |
-- if (format == RENDER_FMT_DXVA) return PIX_FMT_NV12; |
| 715 |
-- if (format == RENDER_FMT_YUV420P) return PIX_FMT_YUV420P; |
| 716 |
-- if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10; |
| 717 |
-- if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16; |
| 718 |
-- if (format == RENDER_FMT_NV12) return PIX_FMT_NV12; |
| 719 |
-- if (format == RENDER_FMT_UYVY422) return PIX_FMT_UYVY422; |
| 720 |
-- if (format == RENDER_FMT_YUYV422) return PIX_FMT_YUYV422; |
| 721 |
-- return PIX_FMT_NONE; |
| 722 |
-+ if (format == RENDER_FMT_DXVA) return AV_PIX_FMT_NV12; |
| 723 |
-+ if (format == RENDER_FMT_YUV420P) return AV_PIX_FMT_YUV420P; |
| 724 |
-+ if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10; |
| 725 |
-+ if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16; |
| 726 |
-+ if (format == RENDER_FMT_NV12) return AV_PIX_FMT_NV12; |
| 727 |
-+ if (format == RENDER_FMT_UYVY422) return AV_PIX_FMT_UYVY422; |
| 728 |
-+ if (format == RENDER_FMT_YUYV422) return AV_PIX_FMT_YUYV422; |
| 729 |
-+ return AV_PIX_FMT_NONE; |
| 730 |
- } |
| 731 |
- |
| 732 |
- void CWinRenderer::ManageTextures() |
| 733 |
-@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags) |
| 734 |
- |
| 735 |
- void CWinRenderer::RenderSW() |
| 736 |
- { |
| 737 |
-- enum PixelFormat format = PixelFormatFromFormat(m_format); |
| 738 |
-+ enum AVPixelFormat format = PixelFormatFromFormat(m_format); |
| 739 |
- |
| 740 |
- // 1. convert yuv to rgb |
| 741 |
- m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx, |
| 742 |
- m_sourceWidth, m_sourceHeight, format, |
| 743 |
-- m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA, |
| 744 |
-- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 745 |
-+ m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA, |
| 746 |
-+ SWS_FAST_BILINEAR, NULL, NULL, NULL); |
| 747 |
- |
| 748 |
- YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer]; |
| 749 |
- |
| 750 |
-Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp |
| 751 |
-=================================================================== |
| 752 |
---- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp |
| 753 |
-+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp |
| 754 |
-@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi |
| 755 |
- uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch, |
| 756 |
- CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */) |
| 757 |
- { |
| 758 |
-- struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA, |
| 759 |
-- out_width, out_height, PIX_FMT_BGRA, |
| 760 |
-- CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL); |
| 761 |
-+ struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA, |
| 762 |
-+ out_width, out_height, AV_PIX_FMT_BGRA, |
| 763 |
-+ CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL); |
| 764 |
- |
| 765 |
- uint8_t *src[] = { in_pixels, 0, 0, 0 }; |
| 766 |
- int srcStride[] = { (int)in_pitch, 0, 0, 0 }; |
| 767 |
-Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp |
| 768 |
-=================================================================== |
| 769 |
---- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp |
| 770 |
-+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp |
| 771 |
-@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas |
| 772 |
- return false; |
| 773 |
- |
| 774 |
- // Due to a bug in swsscale we need to allocate one extra line of data |
| 775 |
-- if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) |
| 776 |
-+ if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) |
| 777 |
- return false; |
| 778 |
- } |
| 779 |
- |
| 780 |
-@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas |
| 781 |
- |
| 782 |
- // We got the video frame, render it into the picture buffer |
| 783 |
- struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt, |
| 784 |
-- m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); |
| 785 |
-+ m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); |
| 786 |
- |
| 787 |
- sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height, |
| 788 |
- m_pFrameRGB->data, m_pFrameRGB->linesize ); |
| 789 |
|
| 790 |
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 |
| 791 |
deleted file mode 100644 |
| 792 |
index 30ed1e06793..00000000000 |
| 793 |
--- a/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch |
| 794 |
+++ /dev/null |
| 795 |
@@ -1,63 +0,0 @@ |
| 796 |
-From fa6f5d761b600b0a8b52db18168e540b03f79ceb Mon Sep 17 00:00:00 2001 |
| 797 |
-From: Memphiz <memphis@×××××××.de> |
| 798 |
-Date: Mon, 21 Dec 2015 11:29:23 +0100 |
| 799 |
-Subject: [PATCH] [GUIFont] - the BufferHandle is a GLUInt for gl and gles and |
| 800 |
- a void * for dx |
| 801 |
- |
| 802 |
---- |
| 803 |
- xbmc/guilib/GUIFontCache.h | 10 ++++++++-- |
| 804 |
- xbmc/guilib/GUIFontTTFGL.cpp | 4 ++-- |
| 805 |
- 2 files changed, 10 insertions(+), 4 deletions(-) |
| 806 |
- |
| 807 |
-diff --git a/xbmc/guilib/GUIFontCache.h b/xbmc/guilib/GUIFontCache.h |
| 808 |
-index 7cbe91d..ab35919 100644 |
| 809 |
---- a/xbmc/guilib/GUIFontCache.h |
| 810 |
-+++ b/xbmc/guilib/GUIFontCache.h |
| 811 |
-@@ -37,6 +37,7 @@ |
| 812 |
- #include <cassert> |
| 813 |
- |
| 814 |
- #include "TransformMatrix.h" |
| 815 |
-+#include "system.h" |
| 816 |
- |
| 817 |
- #define FONT_CACHE_TIME_LIMIT (1000) |
| 818 |
- #define FONT_CACHE_DIST_LIMIT (0.01f) |
| 819 |
-@@ -231,10 +232,15 @@ struct CGUIFontCacheDynamicPosition |
| 820 |
- |
| 821 |
- struct CVertexBuffer |
| 822 |
- { |
| 823 |
-- void *bufferHandle; |
| 824 |
-+#if defined(HAS_GL) || defined(HAS_GLES) |
| 825 |
-+ typedef unsigned int BufferHandleType; |
| 826 |
-+#elif defined(HAS_DX) |
| 827 |
-+ typedef void* BufferHandleType; |
| 828 |
-+#endif |
| 829 |
-+ BufferHandleType bufferHandle; // this is really a GLuint |
| 830 |
- size_t size; |
| 831 |
- CVertexBuffer() : bufferHandle(NULL), size(0), m_font(NULL) {} |
| 832 |
-- CVertexBuffer(void *bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} |
| 833 |
-+ CVertexBuffer(BufferHandleType bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} |
| 834 |
- CVertexBuffer(const CVertexBuffer &other) : bufferHandle(other.bufferHandle), size(other.size), m_font(other.m_font) |
| 835 |
- { |
| 836 |
- /* In practice, the copy constructor is only called before a vertex buffer |
| 837 |
-diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp |
| 838 |
-index f2f3a41..c4aaa3b 100644 |
| 839 |
---- a/xbmc/guilib/GUIFontTTFGL.cpp |
| 840 |
-+++ b/xbmc/guilib/GUIFontTTFGL.cpp |
| 841 |
-@@ -232,7 +232,7 @@ void CGUIFontTTFGL::LastEnd() |
| 842 |
- glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glMatrixModview.Get()); |
| 843 |
- |
| 844 |
- // Bind the buffer to the OpenGL context's GL_ARRAY_BUFFER binding point |
| 845 |
-- glBindBuffer(GL_ARRAY_BUFFER, (GLuint) m_vertexTrans[i].vertexBuffer->bufferHandle); |
| 846 |
-+ glBindBuffer(GL_ARRAY_BUFFER, m_vertexTrans[i].vertexBuffer->bufferHandle); |
| 847 |
- |
| 848 |
- // Do the actual drawing operation, split into groups of characters no |
| 849 |
- // larger than the pre-determined size of the element array |
| 850 |
-@@ -285,7 +285,7 @@ CVertexBuffer CGUIFontTTFGL::CreateVertexBuffer(const std::vector<SVertex> &vert |
| 851 |
- // Unbind GL_ARRAY_BUFFER |
| 852 |
- glBindBuffer(GL_ARRAY_BUFFER, 0); |
| 853 |
- |
| 854 |
-- return CVertexBuffer((void *) bufferHandle, vertices.size() / 4, this); |
| 855 |
-+ return CVertexBuffer(bufferHandle, vertices.size() / 4, this); |
| 856 |
- } |
| 857 |
- |
| 858 |
- void CGUIFontTTFGL::DestroyVertexBuffer(CVertexBuffer &buffer) const |
| 859 |
|
| 860 |
diff --git a/media-tv/kodi/files/kodi-9999-no-arm-flags.patch b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch |
| 861 |
deleted file mode 100644 |
| 862 |
index 64c1cfbc8fe..00000000000 |
| 863 |
--- a/media-tv/kodi/files/kodi-9999-no-arm-flags.patch |
| 864 |
+++ /dev/null |
| 865 |
@@ -1,16 +0,0 @@ |
| 866 |
-http://bugs.gentoo.org/400617 |
| 867 |
- |
| 868 |
-do not force any particular ABI or FPU or SIMD compiler flags for arm |
| 869 |
-targets. let the toolchain and user CFLAGS control that. |
| 870 |
- |
| 871 |
---- a/configure.ac |
| 872 |
-+++ b/configure.ac |
| 873 |
-@@ -571,7 +571,7 @@ |
| 874 |
- elif test "$target_platform" = "target_raspberry_pi"; then |
| 875 |
- ARCH="arm" |
| 876 |
- use_arch="arm" |
| 877 |
--elif test "$use_arch" = "arm"; then |
| 878 |
-+elif false; then |
| 879 |
- CFLAGS="$CFLAGS -mno-apcs-stack-check" |
| 880 |
- CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check" |
| 881 |
- FFMPEG_EXTRACFLAGS="" |
| 882 |
|
| 883 |
diff --git a/media-tv/kodi/files/kodi-9999-texturepacker.patch b/media-tv/kodi/files/kodi-9999-texturepacker.patch |
| 884 |
deleted file mode 100644 |
| 885 |
index a39244312a4..00000000000 |
| 886 |
--- a/media-tv/kodi/files/kodi-9999-texturepacker.patch |
| 887 |
+++ /dev/null |
| 888 |
@@ -1,17 +0,0 @@ |
| 889 |
---- a/tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:18.880029509 +0100 |
| 890 |
-+++ b/tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:41.459671679 +0100 |
| 891 |
-@@ -9,14 +9,10 @@ |
| 892 |
- |
| 893 |
- ifeq ($(NATIVEPLATFORM),) |
| 894 |
- PLATFORM = native |
| 895 |
-- EXTRA_CONFIGURE = --enable-static |
| 896 |
- else |
| 897 |
- PLATFORM = $(NATIVEPLATFORM) |
| 898 |
- endif |
| 899 |
- |
| 900 |
--ifeq ($(NATIVE_OS), linux) |
| 901 |
-- EXTRA_CONFIGURE = --enable-static |
| 902 |
--endif |
| 903 |
- ifeq ($(NATIVE_OS), android) |
| 904 |
- EXTRA_CONFIGURE = --enable-static |
| 905 |
- endif |
| 906 |
|
| 907 |
diff --git a/media-tv/kodi/kodi-16.1-r4.ebuild b/media-tv/kodi/kodi-16.1-r4.ebuild |
| 908 |
deleted file mode 100644 |
| 909 |
index 1b322cb36f6..00000000000 |
| 910 |
--- a/media-tv/kodi/kodi-16.1-r4.ebuild |
| 911 |
+++ /dev/null |
| 912 |
@@ -1,309 +0,0 @@ |
| 913 |
-# Copyright 1999-2017 Gentoo Foundation |
| 914 |
-# Distributed under the terms of the GNU General Public License v2 |
| 915 |
- |
| 916 |
-EAPI=6 |
| 917 |
- |
| 918 |
-# Does not work with py3 here |
| 919 |
-PYTHON_COMPAT=( python2_7 ) |
| 920 |
-PYTHON_REQ_USE="sqlite" |
| 921 |
- |
| 922 |
-inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs |
| 923 |
- |
| 924 |
-CODENAME="Jarvis" |
| 925 |
-case ${PV} in |
| 926 |
-9999) |
| 927 |
- EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" |
| 928 |
- inherit git-r3 |
| 929 |
- ;; |
| 930 |
-*) |
| 931 |
- MY_PV=${PV/_p/_r} |
| 932 |
- MY_PV=${MY_PV//_alpha/a} |
| 933 |
- MY_PV=${MY_PV//_beta/b} |
| 934 |
- MY_PV=${MY_PV//_rc/rc} |
| 935 |
- MY_P="${PN}-${MY_PV}" |
| 936 |
- SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz |
| 937 |
- https://dev.gentoo.org/~soap/distfiles/${PN}-${PV}-gcc-6.patch |
| 938 |
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons-r1.tar.xz )" |
| 939 |
- KEYWORDS="~amd64 ~x86" |
| 940 |
- |
| 941 |
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 942 |
- ;; |
| 943 |
-esac |
| 944 |
- |
| 945 |
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" |
| 946 |
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/" |
| 947 |
- |
| 948 |
-LICENSE="GPL-2" |
| 949 |
-SLOT="0" |
| 950 |
-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" |
| 951 |
-# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 |
| 952 |
-REQUIRED_USE=" |
| 953 |
- ${PYTHON_REQUIRED_USE} |
| 954 |
- || ( gles opengl ) |
| 955 |
- ?? ( gles vaapi ) |
| 956 |
- udisks? ( dbus ) |
| 957 |
- upower? ( dbus ) |
| 958 |
-" |
| 959 |
- |
| 960 |
-COMMON_DEPEND="${PYTHON_DEPS} |
| 961 |
- app-arch/bzip2 |
| 962 |
- app-arch/unzip |
| 963 |
- app-arch/zip |
| 964 |
- app-i18n/enca |
| 965 |
- airplay? ( |
| 966 |
- app-pda/libplist |
| 967 |
- net-libs/shairplay |
| 968 |
- ) |
| 969 |
- dev-libs/boost:= |
| 970 |
- dev-libs/expat |
| 971 |
- dev-libs/fribidi |
| 972 |
- dev-libs/libcdio[-minimal] |
| 973 |
- cec? ( >=dev-libs/libcec-3.0 ) |
| 974 |
- dev-libs/libpcre[cxx] |
| 975 |
- dev-libs/libxml2 |
| 976 |
- dev-libs/libxslt |
| 977 |
- >=dev-libs/lzo-2.04 |
| 978 |
- dev-libs/tinyxml[stl] |
| 979 |
- >=dev-libs/yajl-2 |
| 980 |
- dev-python/simplejson[${PYTHON_USEDEP}] |
| 981 |
- media-fonts/corefonts |
| 982 |
- media-fonts/roboto |
| 983 |
- alsa? ( media-libs/alsa-lib ) |
| 984 |
- media-libs/flac |
| 985 |
- media-libs/fontconfig |
| 986 |
- media-libs/freetype |
| 987 |
- media-libs/jasper:= |
| 988 |
- media-libs/jbigkit |
| 989 |
- >=media-libs/libass-0.9.7 |
| 990 |
- bluray? ( >=media-libs/libbluray-0.7.0 ) |
| 991 |
- css? ( media-libs/libdvdcss ) |
| 992 |
- media-libs/libmad |
| 993 |
- media-libs/libmodplug |
| 994 |
- media-libs/libmpeg2 |
| 995 |
- media-libs/libogg |
| 996 |
- media-libs/libpng:0= |
| 997 |
- media-libs/libsamplerate |
| 998 |
- joystick? ( media-libs/libsdl2 ) |
| 999 |
- >=media-libs/taglib-1.8 |
| 1000 |
- media-libs/libvorbis |
| 1001 |
- media-libs/tiff:0= |
| 1002 |
- media-sound/dcadec |
| 1003 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 1004 |
- media-sound/wavpack |
| 1005 |
- >=media-video/ffmpeg-2.6:=[encode,postproc] |
| 1006 |
- rtmp? ( media-video/rtmpdump ) |
| 1007 |
- nfs? ( net-fs/libnfs:= ) |
| 1008 |
- webserver? ( net-libs/libmicrohttpd[messages] ) |
| 1009 |
- sftp? ( net-libs/libssh[sftp] ) |
| 1010 |
- net-misc/curl |
| 1011 |
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
| 1012 |
- bluetooth? ( net-wireless/bluez ) |
| 1013 |
- dbus? ( sys-apps/dbus ) |
| 1014 |
- caps? ( sys-libs/libcap ) |
| 1015 |
- sys-libs/zlib |
| 1016 |
- virtual/jpeg:0= |
| 1017 |
- usb? ( virtual/libusb:1 ) |
| 1018 |
- mysql? ( virtual/mysql ) |
| 1019 |
- opengl? ( |
| 1020 |
- virtual/glu |
| 1021 |
- virtual/opengl |
| 1022 |
- >=media-libs/glew-1.5.6:= |
| 1023 |
- ) |
| 1024 |
- gles? ( |
| 1025 |
- media-libs/mesa[gles2] |
| 1026 |
- ) |
| 1027 |
- vaapi? ( x11-libs/libva[opengl] ) |
| 1028 |
- vdpau? ( |
| 1029 |
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) |
| 1030 |
- media-video/ffmpeg[vdpau] |
| 1031 |
- ) |
| 1032 |
- X? ( |
| 1033 |
- x11-apps/xdpyinfo |
| 1034 |
- x11-apps/mesa-progs |
| 1035 |
- x11-libs/libXinerama |
| 1036 |
- x11-libs/libXrandr |
| 1037 |
- x11-libs/libXrender |
| 1038 |
- ) |
| 1039 |
- zeroconf? ( net-dns/avahi[dbus] ) |
| 1040 |
-" |
| 1041 |
-RDEPEND="${COMMON_DEPEND} |
| 1042 |
- !media-tv/xbmc |
| 1043 |
- udisks? ( sys-fs/udisks:0 ) |
| 1044 |
- upower? ( |
| 1045 |
- systemd? ( sys-power/upower ) |
| 1046 |
- !systemd? ( |
| 1047 |
- || ( sys-power/upower-pm-utils sys-power/upower ) |
| 1048 |
- ) |
| 1049 |
- )" |
| 1050 |
-DEPEND="${COMMON_DEPEND} |
| 1051 |
- app-arch/xz-utils |
| 1052 |
- dev-lang/swig |
| 1053 |
- dev-libs/crossguid |
| 1054 |
- dev-util/gperf |
| 1055 |
- texturepacker? ( media-libs/giflib ) |
| 1056 |
- X? ( x11-proto/xineramaproto ) |
| 1057 |
- dev-util/cmake |
| 1058 |
- x86? ( dev-lang/nasm ) |
| 1059 |
- java? ( virtual/jre ) |
| 1060 |
- test? ( dev-cpp/gtest ) |
| 1061 |
- virtual/pkgconfig" |
| 1062 |
-# Force java for latest git version to avoid having to hand maintain the |
| 1063 |
-# generated addons package. #488118 |
| 1064 |
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" |
| 1065 |
- |
| 1066 |
-PATCHES=( |
| 1067 |
- "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887 |
| 1068 |
- "${FILESDIR}"/${PN}-9999-texturepacker.patch |
| 1069 |
- "${FILESDIR}"/${PN}-16-ffmpeg3.patch |
| 1070 |
- "${DISTDIR}"/${PN}-${PV}-gcc-6.patch #592446 |
| 1071 |
- "${FILESDIR}"/${PN}-${PV}-GUIFontTTFGL-loses-precision.patch |
| 1072 |
-) |
| 1073 |
- |
| 1074 |
-CONFIG_CHECK="~IP_MULTICAST" |
| 1075 |
-ERROR_IP_MULTICAST=" |
| 1076 |
-In some cases Kodi needs to access multicast addresses. |
| 1077 |
-Please consider enabling IP_MULTICAST under Networking options. |
| 1078 |
-" |
| 1079 |
- |
| 1080 |
-pkg_setup() { |
| 1081 |
- check_extra_config |
| 1082 |
- python-single-r1_pkg_setup |
| 1083 |
-} |
| 1084 |
- |
| 1085 |
-src_unpack() { |
| 1086 |
- [[ ${PV} == "9999" ]] && git-r3_src_unpack || default |
| 1087 |
-} |
| 1088 |
- |
| 1089 |
-src_prepare() { |
| 1090 |
- default |
| 1091 |
- |
| 1092 |
- # some dirs ship generated autotools, some dont |
| 1093 |
- multijob_init |
| 1094 |
- local d dirs=( |
| 1095 |
- tools/depends/native/TexturePacker/src/configure |
| 1096 |
- $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) |
| 1097 |
- ) |
| 1098 |
- for d in "${dirs[@]}" ; do |
| 1099 |
- [[ -e ${d} ]] && continue |
| 1100 |
- pushd ${d/%configure/.} >/dev/null || die |
| 1101 |
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ |
| 1102 |
- multijob_child_init eautoreconf |
| 1103 |
- popd >/dev/null || die |
| 1104 |
- done |
| 1105 |
- multijob_finish |
| 1106 |
- elibtoolize |
| 1107 |
- |
| 1108 |
- # Cross-compiler support |
| 1109 |
- # We need JsonSchemaBuilder and TexturePacker binaries for the host system |
| 1110 |
- # Later we need libsquish for the target system |
| 1111 |
- if tc-is-cross-compiler ; then |
| 1112 |
- mkdir "${WORKDIR}"/${CBUILD} || die |
| 1113 |
- pushd "${WORKDIR}"/${CBUILD} >/dev/null || die |
| 1114 |
- einfo "Building host tools" |
| 1115 |
- cp -a "$S"/{tools,xbmc} ./ || die |
| 1116 |
- local tools=( JsonSchemaBuilder ) |
| 1117 |
- use texturepacker && tools+=( TexturePacker ) |
| 1118 |
- for tool in "${tools[@]}" ; do |
| 1119 |
- tc-env_build emake -C tools/depends/native/$tool |
| 1120 |
- mkdir "$S"/tools/depends/native/$tool/bin || die |
| 1121 |
- ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die |
| 1122 |
- done |
| 1123 |
- popd >/dev/null || die |
| 1124 |
- |
| 1125 |
- emake -f codegenerator.mk |
| 1126 |
- |
| 1127 |
- # Binary kodi.bin links against libsquish, |
| 1128 |
- # so we need libsquish compiled for the target system |
| 1129 |
- emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX) |
| 1130 |
- elif [[ ${PV} == "9999" ]] || use java ; then #558798 |
| 1131 |
- tc-env_build emake -f codegenerator.mk |
| 1132 |
- fi |
| 1133 |
- |
| 1134 |
- # Disable internal func checks as our USE/DEPEND |
| 1135 |
- # stuff handles this just fine already #408395 |
| 1136 |
- export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes |
| 1137 |
- |
| 1138 |
- # Fix the final version string showing as "exported" |
| 1139 |
- # instead of the SVN revision number. |
| 1140 |
- export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} |
| 1141 |
- |
| 1142 |
- # avoid long delays when powerkit isn't running #348580 |
| 1143 |
- sed -i \ |
| 1144 |
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ |
| 1145 |
- xbmc/linux/*.cpp || die |
| 1146 |
- |
| 1147 |
- # Tweak autotool timestamps to avoid regeneration |
| 1148 |
- find . -type f -exec touch -r configure {} + || die |
| 1149 |
-} |
| 1150 |
- |
| 1151 |
-src_configure() { |
| 1152 |
- # Disable documentation generation |
| 1153 |
- export ac_cv_path_LATEX=no |
| 1154 |
- # Avoid help2man |
| 1155 |
- export HELP2MAN=$(type -P help2man || echo true) |
| 1156 |
- # No configure flage for this #403561 |
| 1157 |
- export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) |
| 1158 |
- # Requiring java is asine #434662 |
| 1159 |
- [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) |
| 1160 |
- |
| 1161 |
- econf \ |
| 1162 |
- --disable-ccache \ |
| 1163 |
- --disable-optimizations \ |
| 1164 |
- --with-ffmpeg=shared \ |
| 1165 |
- $(use_enable alsa) \ |
| 1166 |
- $(use_enable airplay) \ |
| 1167 |
- $(use_enable airplay airtunes) \ |
| 1168 |
- $(use_enable bluray libbluray) \ |
| 1169 |
- $(use_enable caps libcap) \ |
| 1170 |
- $(use_enable cec libcec) \ |
| 1171 |
- $(use_enable css dvdcss) \ |
| 1172 |
- $(use_enable dbus) \ |
| 1173 |
- $(use_enable debug) \ |
| 1174 |
- $(use_enable gles) \ |
| 1175 |
- $(use_enable joystick) \ |
| 1176 |
- $(use_enable midi mid) \ |
| 1177 |
- $(use_enable mysql) \ |
| 1178 |
- $(use_enable nfs) \ |
| 1179 |
- $(use_enable opengl gl) \ |
| 1180 |
- $(use_enable profile profiling) \ |
| 1181 |
- $(use_enable pulseaudio pulse) \ |
| 1182 |
- $(use_enable rtmp) \ |
| 1183 |
- $(use_enable samba) \ |
| 1184 |
- $(use_enable sftp ssh) \ |
| 1185 |
- $(use_enable usb libusb) \ |
| 1186 |
- $(use_enable test gtest) \ |
| 1187 |
- $(use_enable texturepacker) \ |
| 1188 |
- $(use_enable upnp) \ |
| 1189 |
- $(use_enable vaapi) \ |
| 1190 |
- $(use_enable vdpau) \ |
| 1191 |
- $(use_enable webserver) \ |
| 1192 |
- $(use_enable X x11) \ |
| 1193 |
- $(use_enable zeroconf avahi) |
| 1194 |
-} |
| 1195 |
- |
| 1196 |
-src_compile() { |
| 1197 |
- emake V=1 |
| 1198 |
-} |
| 1199 |
- |
| 1200 |
-src_install() { |
| 1201 |
- default |
| 1202 |
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die |
| 1203 |
- |
| 1204 |
- domenu tools/Linux/kodi.desktop |
| 1205 |
- newicon media/icon48x48.png kodi.png |
| 1206 |
- |
| 1207 |
- # Remove fontconfig settings that are used only on MacOSX. |
| 1208 |
- # Can't be patched upstream because they just find all files and install |
| 1209 |
- # them into same structure like they have in git. |
| 1210 |
- rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die |
| 1211 |
- |
| 1212 |
- # Replace bundled fonts with system ones. |
| 1213 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die |
| 1214 |
- dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ |
| 1215 |
- /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf |
| 1216 |
- dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ |
| 1217 |
- /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf |
| 1218 |
- |
| 1219 |
- python_domodule tools/EventClients/lib/python/xbmcclient.py |
| 1220 |
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send |
| 1221 |
-} |
| 1222 |
|
| 1223 |
diff --git a/media-tv/kodi/kodi-16.1.ebuild b/media-tv/kodi/kodi-16.1.ebuild |
| 1224 |
deleted file mode 100644 |
| 1225 |
index 6cb080e663a..00000000000 |
| 1226 |
--- a/media-tv/kodi/kodi-16.1.ebuild |
| 1227 |
+++ /dev/null |
| 1228 |
@@ -1,297 +0,0 @@ |
| 1229 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1230 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1231 |
- |
| 1232 |
-EAPI=6 |
| 1233 |
- |
| 1234 |
-# Does not work with py3 here |
| 1235 |
-PYTHON_COMPAT=( python2_7 ) |
| 1236 |
-PYTHON_REQ_USE="sqlite" |
| 1237 |
- |
| 1238 |
-inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs |
| 1239 |
- |
| 1240 |
-CODENAME="Jarvis" |
| 1241 |
-case ${PV} in |
| 1242 |
-9999) |
| 1243 |
- EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" |
| 1244 |
- inherit git-r3 |
| 1245 |
- ;; |
| 1246 |
-*) |
| 1247 |
- MY_PV=${PV/_p/_r} |
| 1248 |
- MY_PV=${MY_PV//_alpha/a} |
| 1249 |
- MY_PV=${MY_PV//_beta/b} |
| 1250 |
- MY_PV=${MY_PV//_rc/rc} |
| 1251 |
- MY_P="${PN}-${MY_PV}" |
| 1252 |
- SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz |
| 1253 |
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons-r1.tar.xz )" |
| 1254 |
- KEYWORDS="amd64 x86" |
| 1255 |
- |
| 1256 |
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 1257 |
- ;; |
| 1258 |
-esac |
| 1259 |
- |
| 1260 |
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" |
| 1261 |
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/" |
| 1262 |
- |
| 1263 |
-LICENSE="GPL-2" |
| 1264 |
-SLOT="0" |
| 1265 |
-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" |
| 1266 |
-# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 |
| 1267 |
-REQUIRED_USE=" |
| 1268 |
- ${PYTHON_REQUIRED_USE} |
| 1269 |
- || ( gles opengl ) |
| 1270 |
- ?? ( gles vaapi ) |
| 1271 |
- udisks? ( dbus ) |
| 1272 |
- upower? ( dbus ) |
| 1273 |
-" |
| 1274 |
- |
| 1275 |
-COMMON_DEPEND="${PYTHON_DEPS} |
| 1276 |
- app-arch/bzip2 |
| 1277 |
- app-arch/unzip |
| 1278 |
- app-arch/zip |
| 1279 |
- app-i18n/enca |
| 1280 |
- airplay? ( app-pda/libplist ) |
| 1281 |
- dev-libs/boost:= |
| 1282 |
- dev-libs/expat |
| 1283 |
- dev-libs/fribidi |
| 1284 |
- dev-libs/libcdio[-minimal] |
| 1285 |
- cec? ( >=dev-libs/libcec-3.0 ) |
| 1286 |
- dev-libs/libpcre[cxx] |
| 1287 |
- dev-libs/libxml2 |
| 1288 |
- dev-libs/libxslt |
| 1289 |
- >=dev-libs/lzo-2.04 |
| 1290 |
- dev-libs/tinyxml[stl] |
| 1291 |
- >=dev-libs/yajl-2 |
| 1292 |
- dev-python/simplejson[${PYTHON_USEDEP}] |
| 1293 |
- media-fonts/corefonts |
| 1294 |
- media-fonts/roboto |
| 1295 |
- alsa? ( media-libs/alsa-lib ) |
| 1296 |
- media-libs/flac |
| 1297 |
- media-libs/fontconfig |
| 1298 |
- media-libs/freetype |
| 1299 |
- media-libs/jasper:= |
| 1300 |
- media-libs/jbigkit |
| 1301 |
- >=media-libs/libass-0.9.7 |
| 1302 |
- bluray? ( >=media-libs/libbluray-0.7.0 ) |
| 1303 |
- css? ( media-libs/libdvdcss ) |
| 1304 |
- media-libs/libmad |
| 1305 |
- media-libs/libmodplug |
| 1306 |
- media-libs/libmpeg2 |
| 1307 |
- media-libs/libogg |
| 1308 |
- media-libs/libpng:0= |
| 1309 |
- media-libs/libsamplerate |
| 1310 |
- joystick? ( media-libs/libsdl2 ) |
| 1311 |
- >=media-libs/taglib-1.8 |
| 1312 |
- media-libs/libvorbis |
| 1313 |
- media-libs/tiff:0= |
| 1314 |
- media-sound/dcadec |
| 1315 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 1316 |
- media-sound/wavpack |
| 1317 |
- >=media-video/ffmpeg-2.6:=[encode] |
| 1318 |
- rtmp? ( media-video/rtmpdump ) |
| 1319 |
- nfs? ( net-fs/libnfs:= ) |
| 1320 |
- webserver? ( net-libs/libmicrohttpd[messages] ) |
| 1321 |
- sftp? ( net-libs/libssh[sftp] ) |
| 1322 |
- net-misc/curl |
| 1323 |
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
| 1324 |
- bluetooth? ( net-wireless/bluez ) |
| 1325 |
- dbus? ( sys-apps/dbus ) |
| 1326 |
- caps? ( sys-libs/libcap ) |
| 1327 |
- sys-libs/zlib |
| 1328 |
- virtual/jpeg:0= |
| 1329 |
- usb? ( virtual/libusb:1 ) |
| 1330 |
- mysql? ( virtual/mysql ) |
| 1331 |
- opengl? ( |
| 1332 |
- virtual/glu |
| 1333 |
- virtual/opengl |
| 1334 |
- >=media-libs/glew-1.5.6:= |
| 1335 |
- ) |
| 1336 |
- gles? ( |
| 1337 |
- media-libs/mesa[gles2] |
| 1338 |
- ) |
| 1339 |
- vaapi? ( x11-libs/libva[opengl] ) |
| 1340 |
- vdpau? ( |
| 1341 |
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) |
| 1342 |
- media-video/ffmpeg[vdpau] |
| 1343 |
- ) |
| 1344 |
- X? ( |
| 1345 |
- x11-apps/xdpyinfo |
| 1346 |
- x11-apps/mesa-progs |
| 1347 |
- x11-libs/libXinerama |
| 1348 |
- x11-libs/libXrandr |
| 1349 |
- x11-libs/libXrender |
| 1350 |
- ) |
| 1351 |
- zeroconf? ( net-dns/avahi ) |
| 1352 |
-" |
| 1353 |
-RDEPEND="${COMMON_DEPEND} |
| 1354 |
- !media-tv/xbmc |
| 1355 |
- udisks? ( sys-fs/udisks:0 ) |
| 1356 |
- upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" |
| 1357 |
-DEPEND="${COMMON_DEPEND} |
| 1358 |
- app-arch/xz-utils |
| 1359 |
- dev-lang/swig |
| 1360 |
- dev-libs/crossguid |
| 1361 |
- dev-util/gperf |
| 1362 |
- texturepacker? ( media-libs/giflib ) |
| 1363 |
- X? ( x11-proto/xineramaproto ) |
| 1364 |
- dev-util/cmake |
| 1365 |
- x86? ( dev-lang/nasm ) |
| 1366 |
- java? ( virtual/jre ) |
| 1367 |
- test? ( dev-cpp/gtest ) |
| 1368 |
- virtual/pkgconfig" |
| 1369 |
-# Force java for latest git version to avoid having to hand maintain the |
| 1370 |
-# generated addons package. #488118 |
| 1371 |
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" |
| 1372 |
- |
| 1373 |
-PATCHES=( |
| 1374 |
- "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887 |
| 1375 |
- "${FILESDIR}"/${PN}-9999-texturepacker.patch |
| 1376 |
- "${FILESDIR}"/${PN}-16-ffmpeg3.patch |
| 1377 |
-) |
| 1378 |
- |
| 1379 |
-CONFIG_CHECK="~IP_MULTICAST" |
| 1380 |
-ERROR_IP_MULTICAST=" |
| 1381 |
-In some cases Kodi needs to access multicast addresses. |
| 1382 |
-Please consider enabling IP_MULTICAST under Networking options. |
| 1383 |
-" |
| 1384 |
- |
| 1385 |
-pkg_setup() { |
| 1386 |
- check_extra_config |
| 1387 |
- python-single-r1_pkg_setup |
| 1388 |
-} |
| 1389 |
- |
| 1390 |
-src_unpack() { |
| 1391 |
- [[ ${PV} == "9999" ]] && git-r3_src_unpack || default |
| 1392 |
-} |
| 1393 |
- |
| 1394 |
-src_prepare() { |
| 1395 |
- default |
| 1396 |
- |
| 1397 |
- # some dirs ship generated autotools, some dont |
| 1398 |
- multijob_init |
| 1399 |
- local d dirs=( |
| 1400 |
- tools/depends/native/TexturePacker/src/configure |
| 1401 |
- $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) |
| 1402 |
- ) |
| 1403 |
- for d in "${dirs[@]}" ; do |
| 1404 |
- [[ -e ${d} ]] && continue |
| 1405 |
- pushd ${d/%configure/.} >/dev/null || die |
| 1406 |
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ |
| 1407 |
- multijob_child_init eautoreconf |
| 1408 |
- popd >/dev/null || die |
| 1409 |
- done |
| 1410 |
- multijob_finish |
| 1411 |
- elibtoolize |
| 1412 |
- |
| 1413 |
- # Cross-compiler support |
| 1414 |
- # We need JsonSchemaBuilder and TexturePacker binaries for the host system |
| 1415 |
- # Later we need libsquish for the target system |
| 1416 |
- if tc-is-cross-compiler ; then |
| 1417 |
- mkdir "${WORKDIR}"/${CBUILD} || die |
| 1418 |
- pushd "${WORKDIR}"/${CBUILD} >/dev/null || die |
| 1419 |
- einfo "Building host tools" |
| 1420 |
- cp -a "$S"/{tools,xbmc} ./ || die |
| 1421 |
- local tools=( JsonSchemaBuilder ) |
| 1422 |
- use texturepacker && tools+=( TexturePacker ) |
| 1423 |
- for tool in "${tools[@]}" ; do |
| 1424 |
- tc-env_build emake -C tools/depends/native/$tool |
| 1425 |
- mkdir "$S"/tools/depends/native/$tool/bin || die |
| 1426 |
- ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die |
| 1427 |
- done |
| 1428 |
- popd >/dev/null || die |
| 1429 |
- |
| 1430 |
- emake -f codegenerator.mk |
| 1431 |
- |
| 1432 |
- # Binary kodi.bin links against libsquish, |
| 1433 |
- # so we need libsquish compiled for the target system |
| 1434 |
- emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX) |
| 1435 |
- elif [[ ${PV} == "9999" ]] || use java ; then #558798 |
| 1436 |
- tc-env_build emake -f codegenerator.mk |
| 1437 |
- fi |
| 1438 |
- |
| 1439 |
- # Disable internal func checks as our USE/DEPEND |
| 1440 |
- # stuff handles this just fine already #408395 |
| 1441 |
- export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes |
| 1442 |
- |
| 1443 |
- # Fix the final version string showing as "exported" |
| 1444 |
- # instead of the SVN revision number. |
| 1445 |
- export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} |
| 1446 |
- |
| 1447 |
- # avoid long delays when powerkit isn't running #348580 |
| 1448 |
- sed -i \ |
| 1449 |
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ |
| 1450 |
- xbmc/linux/*.cpp || die |
| 1451 |
- |
| 1452 |
- # Tweak autotool timestamps to avoid regeneration |
| 1453 |
- find . -type f -exec touch -r configure {} + || die |
| 1454 |
-} |
| 1455 |
- |
| 1456 |
-src_configure() { |
| 1457 |
- # Disable documentation generation |
| 1458 |
- export ac_cv_path_LATEX=no |
| 1459 |
- # Avoid help2man |
| 1460 |
- export HELP2MAN=$(type -P help2man || echo true) |
| 1461 |
- # No configure flage for this #403561 |
| 1462 |
- export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) |
| 1463 |
- # Requiring java is asine #434662 |
| 1464 |
- [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) |
| 1465 |
- |
| 1466 |
- econf \ |
| 1467 |
- --disable-ccache \ |
| 1468 |
- --disable-optimizations \ |
| 1469 |
- --with-ffmpeg=shared \ |
| 1470 |
- $(use_enable alsa) \ |
| 1471 |
- $(use_enable airplay) \ |
| 1472 |
- $(use_enable bluray libbluray) \ |
| 1473 |
- $(use_enable caps libcap) \ |
| 1474 |
- $(use_enable cec libcec) \ |
| 1475 |
- $(use_enable css dvdcss) \ |
| 1476 |
- $(use_enable dbus) \ |
| 1477 |
- $(use_enable debug) \ |
| 1478 |
- $(use_enable gles) \ |
| 1479 |
- $(use_enable joystick) \ |
| 1480 |
- $(use_enable midi mid) \ |
| 1481 |
- $(use_enable mysql) \ |
| 1482 |
- $(use_enable nfs) \ |
| 1483 |
- $(use_enable opengl gl) \ |
| 1484 |
- $(use_enable profile profiling) \ |
| 1485 |
- $(use_enable pulseaudio pulse) \ |
| 1486 |
- $(use_enable rtmp) \ |
| 1487 |
- $(use_enable samba) \ |
| 1488 |
- $(use_enable sftp ssh) \ |
| 1489 |
- $(use_enable usb libusb) \ |
| 1490 |
- $(use_enable test gtest) \ |
| 1491 |
- $(use_enable texturepacker) \ |
| 1492 |
- $(use_enable upnp) \ |
| 1493 |
- $(use_enable vaapi) \ |
| 1494 |
- $(use_enable vdpau) \ |
| 1495 |
- $(use_enable webserver) \ |
| 1496 |
- $(use_enable X x11) \ |
| 1497 |
- $(use_enable zeroconf avahi) |
| 1498 |
-} |
| 1499 |
- |
| 1500 |
-src_compile() { |
| 1501 |
- emake V=1 |
| 1502 |
-} |
| 1503 |
- |
| 1504 |
-src_install() { |
| 1505 |
- default |
| 1506 |
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die |
| 1507 |
- |
| 1508 |
- domenu tools/Linux/kodi.desktop |
| 1509 |
- newicon media/icon48x48.png kodi.png |
| 1510 |
- |
| 1511 |
- # Remove fontconfig settings that are used only on MacOSX. |
| 1512 |
- # Can't be patched upstream because they just find all files and install |
| 1513 |
- # them into same structure like they have in git. |
| 1514 |
- rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die |
| 1515 |
- |
| 1516 |
- # Replace bundled fonts with system ones. |
| 1517 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die |
| 1518 |
- dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ |
| 1519 |
- /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf |
| 1520 |
- dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ |
| 1521 |
- /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf |
| 1522 |
- |
| 1523 |
- python_domodule tools/EventClients/lib/python/xbmcclient.py |
| 1524 |
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send |
| 1525 |
-} |
| 1526 |
|
| 1527 |
diff --git a/media-tv/kodi/kodi-17.0-r4.ebuild b/media-tv/kodi/kodi-17.0-r4.ebuild |
| 1528 |
deleted file mode 100644 |
| 1529 |
index 719b9853100..00000000000 |
| 1530 |
--- a/media-tv/kodi/kodi-17.0-r4.ebuild |
| 1531 |
+++ /dev/null |
| 1532 |
@@ -1,279 +0,0 @@ |
| 1533 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1534 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1535 |
- |
| 1536 |
-EAPI=6 |
| 1537 |
- |
| 1538 |
-# Does not work with py3 here |
| 1539 |
-PYTHON_COMPAT=( python2_7 ) |
| 1540 |
-PYTHON_REQ_USE="sqlite" |
| 1541 |
- |
| 1542 |
-inherit eutils linux-info python-single-r1 cmake-utils autotools |
| 1543 |
- |
| 1544 |
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" |
| 1545 |
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" |
| 1546 |
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" |
| 1547 |
-FFMPEG_VERSION="3.1.6" |
| 1548 |
-CODENAME="Krypton" |
| 1549 |
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz |
| 1550 |
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz |
| 1551 |
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz |
| 1552 |
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )" |
| 1553 |
- |
| 1554 |
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" |
| 1555 |
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/" |
| 1556 |
- |
| 1557 |
-LICENSE="GPL-2" |
| 1558 |
-SLOT="0" |
| 1559 |
-# use flag is called libusb so that it doesn't fool people in thinking that |
| 1560 |
-# it is _required_ for USB support. Otherwise they'll disable udev and |
| 1561 |
-# that's going to be worse. |
| 1562 |
-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" |
| 1563 |
-REQUIRED_USE=" |
| 1564 |
- ${PYTHON_REQUIRED_USE} |
| 1565 |
- || ( gles opengl ) |
| 1566 |
- gles? ( X ) |
| 1567 |
- opengl? ( X ) |
| 1568 |
- udev? ( !libusb ) |
| 1569 |
- udisks? ( dbus ) |
| 1570 |
- upower? ( dbus ) |
| 1571 |
-" |
| 1572 |
- |
| 1573 |
-COMMON_DEPEND="${PYTHON_DEPS} |
| 1574 |
- airplay? ( |
| 1575 |
- app-pda/libplist |
| 1576 |
- net-libs/shairplay |
| 1577 |
- ) |
| 1578 |
- alsa? ( media-libs/alsa-lib ) |
| 1579 |
- bluetooth? ( net-wireless/bluez ) |
| 1580 |
- bluray? ( >=media-libs/libbluray-0.7.0 ) |
| 1581 |
- caps? ( sys-libs/libcap ) |
| 1582 |
- dbus? ( sys-apps/dbus ) |
| 1583 |
- dev-db/sqlite |
| 1584 |
- dev-libs/expat |
| 1585 |
- dev-libs/fribidi |
| 1586 |
- cec? ( >=dev-libs/libcec-4.0 ) |
| 1587 |
- dev-libs/libpcre[cxx] |
| 1588 |
- dev-libs/libxml2 |
| 1589 |
- >=dev-libs/lzo-2.04 |
| 1590 |
- dev-libs/tinyxml[stl] |
| 1591 |
- >=dev-libs/yajl-2 |
| 1592 |
- dev-python/pillow[${PYTHON_USEDEP}] |
| 1593 |
- dev-libs/libcdio |
| 1594 |
- gles? ( media-libs/mesa[gles2] ) |
| 1595 |
- libusb? ( virtual/libusb:1 ) |
| 1596 |
- media-fonts/corefonts |
| 1597 |
- >=media-fonts/noto-20160531 |
| 1598 |
- media-fonts/roboto |
| 1599 |
- media-libs/fontconfig |
| 1600 |
- media-libs/freetype |
| 1601 |
- >=media-libs/libass-0.13.4 |
| 1602 |
- media-libs/mesa[egl] |
| 1603 |
- >=media-libs/taglib-1.11.1 |
| 1604 |
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] ) |
| 1605 |
- mysql? ( virtual/mysql ) |
| 1606 |
- >=net-misc/curl-7.51.0 |
| 1607 |
- nfs? ( net-fs/libnfs:= ) |
| 1608 |
- opengl? ( media-libs/glu ) |
| 1609 |
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) |
| 1610 |
- libressl? ( dev-libs/libressl:0= ) |
| 1611 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 1612 |
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
| 1613 |
- sftp? ( net-libs/libssh[sftp] ) |
| 1614 |
- sys-libs/zlib |
| 1615 |
- udev? ( virtual/udev ) |
| 1616 |
- vaapi? ( x11-libs/libva[opengl] ) |
| 1617 |
- vdpau? ( |
| 1618 |
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) |
| 1619 |
- system-ffmpeg? ( media-video/ffmpeg[vdpau] ) |
| 1620 |
- ) |
| 1621 |
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) |
| 1622 |
- X? ( |
| 1623 |
- x11-libs/libdrm |
| 1624 |
- x11-libs/libX11 |
| 1625 |
- x11-libs/libXrandr |
| 1626 |
- x11-libs/libXrender |
| 1627 |
- ) |
| 1628 |
- xslt? ( dev-libs/libxslt ) |
| 1629 |
- zeroconf? ( net-dns/avahi[dbus] ) |
| 1630 |
-" |
| 1631 |
-RDEPEND="${COMMON_DEPEND} |
| 1632 |
- lirc? ( |
| 1633 |
- || ( app-misc/lirc app-misc/inputlircd ) |
| 1634 |
- ) |
| 1635 |
- !media-tv/xbmc |
| 1636 |
- udisks? ( sys-fs/udisks:0 ) |
| 1637 |
- upower? ( |
| 1638 |
- systemd? ( sys-power/upower ) |
| 1639 |
- !systemd? ( |
| 1640 |
- || ( sys-power/upower-pm-utils sys-power/upower ) |
| 1641 |
- ) |
| 1642 |
- ) |
| 1643 |
-" |
| 1644 |
-DEPEND="${COMMON_DEPEND} |
| 1645 |
- app-arch/bzip2 |
| 1646 |
- app-arch/unzip |
| 1647 |
- app-arch/xz-utils |
| 1648 |
- app-arch/zip |
| 1649 |
- dev-lang/swig |
| 1650 |
- dev-libs/crossguid |
| 1651 |
- dev-util/cmake |
| 1652 |
- dev-util/gperf |
| 1653 |
- media-libs/giflib |
| 1654 |
- >=media-libs/libjpeg-turbo-1.5.1:= |
| 1655 |
- >=media-libs/libpng-1.6.26:0= |
| 1656 |
- test? ( dev-cpp/gtest ) |
| 1657 |
- virtual/pkgconfig |
| 1658 |
- x86? ( dev-lang/nasm ) |
| 1659 |
-" |
| 1660 |
-case ${PV} in |
| 1661 |
-9999) |
| 1662 |
- EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" |
| 1663 |
- inherit git-r3 |
| 1664 |
- # Force java for latest git version to avoid having to hand maintain the |
| 1665 |
- # generated addons package. #488118 |
| 1666 |
- DEPEND+=" |
| 1667 |
- virtual/jre |
| 1668 |
- " |
| 1669 |
- ;; |
| 1670 |
-*) |
| 1671 |
- MY_PV=${PV/_p/_r} |
| 1672 |
- MY_PV=${MY_PV/_alpha/a} |
| 1673 |
- MY_PV=${MY_PV/_beta/b} |
| 1674 |
- MY_PV=${MY_PV/_rc/rc} |
| 1675 |
- MY_P="${PN}-${MY_PV}" |
| 1676 |
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz |
| 1677 |
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )" |
| 1678 |
- KEYWORDS="~amd64 ~x86" |
| 1679 |
- IUSE+=" java" |
| 1680 |
- DEPEND+=" |
| 1681 |
- java? ( virtual/jre ) |
| 1682 |
- " |
| 1683 |
- |
| 1684 |
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 1685 |
- ;; |
| 1686 |
-esac |
| 1687 |
- |
| 1688 |
-CONFIG_CHECK="~IP_MULTICAST" |
| 1689 |
-ERROR_IP_MULTICAST=" |
| 1690 |
-In some cases Kodi needs to access multicast addresses. |
| 1691 |
-Please consider enabling IP_MULTICAST under Networking options. |
| 1692 |
-" |
| 1693 |
- |
| 1694 |
-CMAKE_USE_DIR=${S}/project/cmake/ |
| 1695 |
- |
| 1696 |
-pkg_setup() { |
| 1697 |
- check_extra_config |
| 1698 |
- python-single-r1_pkg_setup |
| 1699 |
-} |
| 1700 |
- |
| 1701 |
-src_prepare() { |
| 1702 |
- if in_iuse java && use !java; then |
| 1703 |
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch |
| 1704 |
- fi |
| 1705 |
- cmake-utils_src_prepare |
| 1706 |
- |
| 1707 |
- # avoid long delays when powerkit isn't running #348580 |
| 1708 |
- sed -i \ |
| 1709 |
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ |
| 1710 |
- xbmc/linux/*.cpp || die |
| 1711 |
- |
| 1712 |
- # Prepare tools and libs witch are configured with autotools during compile time |
| 1713 |
- AUTOTOOLS_DIRS=( |
| 1714 |
- "${S}"/lib/cpluff |
| 1715 |
- "${S}"/tools/depends/native/TexturePacker/src |
| 1716 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src |
| 1717 |
- ) |
| 1718 |
- |
| 1719 |
- local d |
| 1720 |
- for d in "${AUTOTOOLS_DIRS[@]}" ; do |
| 1721 |
- pushd ${d} >/dev/null || die |
| 1722 |
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf |
| 1723 |
- popd >/dev/null || die |
| 1724 |
- done |
| 1725 |
- elibtoolize |
| 1726 |
- |
| 1727 |
- # Prevent autoreconf rerun |
| 1728 |
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ |
| 1729 |
- "${S}"/project/cmake/modules/FindCpluff.cmake \ |
| 1730 |
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ |
| 1731 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh |
| 1732 |
-} |
| 1733 |
- |
| 1734 |
-src_configure() { |
| 1735 |
- local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) |
| 1736 |
- |
| 1737 |
- local mycmakeargs=( |
| 1738 |
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" |
| 1739 |
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 |
| 1740 |
- -DENABLE_ALSA=$(usex alsa) |
| 1741 |
- -DENABLE_AIRTUNES=$(usex airplay) |
| 1742 |
- -DENABLE_AVAHI=$(usex zeroconf) |
| 1743 |
- -DENABLE_BLUETOOTH=$(usex bluetooth) |
| 1744 |
- -DENABLE_BLURAY=$(usex bluray) |
| 1745 |
- -DENABLE_CCACHE=OFF |
| 1746 |
- -DENABLE_CEC=$(usex cec) |
| 1747 |
- -DENABLE_DBUS=$(usex dbus) |
| 1748 |
- -DENABLE_DVDCSS=$(usex css) |
| 1749 |
- -DENABLE_INTERNAL_CROSSGUID=OFF |
| 1750 |
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" |
| 1751 |
- -DENABLE_CAP=$(usex caps) |
| 1752 |
- -DENABLE_LIRC=$(usex lirc) |
| 1753 |
- -DENABLE_MICROHTTPD=$(usex webserver) |
| 1754 |
- -DENABLE_MYSQLCLIENT=$(usex mysql) |
| 1755 |
- -DENABLE_NFS=$(usex nfs) |
| 1756 |
- -DENABLE_NONFREE=$(usex nonfree) |
| 1757 |
- -DENABLE_OPENGLES=$(usex gles) |
| 1758 |
- -DENABLE_OPENGL=$(usex opengl) |
| 1759 |
- -DENABLE_OPENSSL=ON |
| 1760 |
- -DENABLE_OPTICAL=$(usex dvd) |
| 1761 |
- -DENABLE_PLIST=$(usex airplay) |
| 1762 |
- -DENABLE_PULSEAUDIO=$(usex pulseaudio) |
| 1763 |
- -DENABLE_SMBCLIENT=$(usex samba) |
| 1764 |
- -DENABLE_SSH=$(usex sftp) |
| 1765 |
- -DENABLE_UDEV=$(usex udev) |
| 1766 |
- -DENABLE_UPNP=$(usex upnp) |
| 1767 |
- -DENABLE_VAAPI=$(usex vaapi) |
| 1768 |
- -DENABLE_VDPAU=$(usex vdpau) |
| 1769 |
- -DENABLE_X11=$(usex X) |
| 1770 |
- -DENABLE_XSLT=$(usex xslt) |
| 1771 |
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" |
| 1772 |
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" |
| 1773 |
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" |
| 1774 |
- ) |
| 1775 |
- |
| 1776 |
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) |
| 1777 |
- |
| 1778 |
- use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" ) |
| 1779 |
- |
| 1780 |
- cmake-utils_src_configure |
| 1781 |
-} |
| 1782 |
- |
| 1783 |
-src_compile() { |
| 1784 |
- cmake-utils_src_compile all $(usev test) |
| 1785 |
-} |
| 1786 |
- |
| 1787 |
-src_install() { |
| 1788 |
- cmake-utils_src_install |
| 1789 |
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die |
| 1790 |
- |
| 1791 |
- newicon media/icon48x48.png kodi.png |
| 1792 |
- |
| 1793 |
- # Replace bundled fonts with system ones. |
| 1794 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die |
| 1795 |
- dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ |
| 1796 |
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf |
| 1797 |
- |
| 1798 |
- local f |
| 1799 |
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do |
| 1800 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die |
| 1801 |
- dosym /usr/share/fonts/noto/"${f}" \ |
| 1802 |
- usr/share/kodi/addons/skin.estuary/fonts/"${f}" |
| 1803 |
- done |
| 1804 |
- |
| 1805 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die |
| 1806 |
- dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ |
| 1807 |
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf |
| 1808 |
- |
| 1809 |
- python_domodule tools/EventClients/lib/python/xbmcclient.py |
| 1810 |
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send |
| 1811 |
-} |
| 1812 |
|
| 1813 |
diff --git a/media-tv/kodi/kodi-17.1-r3.ebuild b/media-tv/kodi/kodi-17.1-r3.ebuild |
| 1814 |
deleted file mode 100644 |
| 1815 |
index 719b9853100..00000000000 |
| 1816 |
--- a/media-tv/kodi/kodi-17.1-r3.ebuild |
| 1817 |
+++ /dev/null |
| 1818 |
@@ -1,279 +0,0 @@ |
| 1819 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1820 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1821 |
- |
| 1822 |
-EAPI=6 |
| 1823 |
- |
| 1824 |
-# Does not work with py3 here |
| 1825 |
-PYTHON_COMPAT=( python2_7 ) |
| 1826 |
-PYTHON_REQ_USE="sqlite" |
| 1827 |
- |
| 1828 |
-inherit eutils linux-info python-single-r1 cmake-utils autotools |
| 1829 |
- |
| 1830 |
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" |
| 1831 |
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" |
| 1832 |
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" |
| 1833 |
-FFMPEG_VERSION="3.1.6" |
| 1834 |
-CODENAME="Krypton" |
| 1835 |
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz |
| 1836 |
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz |
| 1837 |
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz |
| 1838 |
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )" |
| 1839 |
- |
| 1840 |
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" |
| 1841 |
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/" |
| 1842 |
- |
| 1843 |
-LICENSE="GPL-2" |
| 1844 |
-SLOT="0" |
| 1845 |
-# use flag is called libusb so that it doesn't fool people in thinking that |
| 1846 |
-# it is _required_ for USB support. Otherwise they'll disable udev and |
| 1847 |
-# that's going to be worse. |
| 1848 |
-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" |
| 1849 |
-REQUIRED_USE=" |
| 1850 |
- ${PYTHON_REQUIRED_USE} |
| 1851 |
- || ( gles opengl ) |
| 1852 |
- gles? ( X ) |
| 1853 |
- opengl? ( X ) |
| 1854 |
- udev? ( !libusb ) |
| 1855 |
- udisks? ( dbus ) |
| 1856 |
- upower? ( dbus ) |
| 1857 |
-" |
| 1858 |
- |
| 1859 |
-COMMON_DEPEND="${PYTHON_DEPS} |
| 1860 |
- airplay? ( |
| 1861 |
- app-pda/libplist |
| 1862 |
- net-libs/shairplay |
| 1863 |
- ) |
| 1864 |
- alsa? ( media-libs/alsa-lib ) |
| 1865 |
- bluetooth? ( net-wireless/bluez ) |
| 1866 |
- bluray? ( >=media-libs/libbluray-0.7.0 ) |
| 1867 |
- caps? ( sys-libs/libcap ) |
| 1868 |
- dbus? ( sys-apps/dbus ) |
| 1869 |
- dev-db/sqlite |
| 1870 |
- dev-libs/expat |
| 1871 |
- dev-libs/fribidi |
| 1872 |
- cec? ( >=dev-libs/libcec-4.0 ) |
| 1873 |
- dev-libs/libpcre[cxx] |
| 1874 |
- dev-libs/libxml2 |
| 1875 |
- >=dev-libs/lzo-2.04 |
| 1876 |
- dev-libs/tinyxml[stl] |
| 1877 |
- >=dev-libs/yajl-2 |
| 1878 |
- dev-python/pillow[${PYTHON_USEDEP}] |
| 1879 |
- dev-libs/libcdio |
| 1880 |
- gles? ( media-libs/mesa[gles2] ) |
| 1881 |
- libusb? ( virtual/libusb:1 ) |
| 1882 |
- media-fonts/corefonts |
| 1883 |
- >=media-fonts/noto-20160531 |
| 1884 |
- media-fonts/roboto |
| 1885 |
- media-libs/fontconfig |
| 1886 |
- media-libs/freetype |
| 1887 |
- >=media-libs/libass-0.13.4 |
| 1888 |
- media-libs/mesa[egl] |
| 1889 |
- >=media-libs/taglib-1.11.1 |
| 1890 |
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] ) |
| 1891 |
- mysql? ( virtual/mysql ) |
| 1892 |
- >=net-misc/curl-7.51.0 |
| 1893 |
- nfs? ( net-fs/libnfs:= ) |
| 1894 |
- opengl? ( media-libs/glu ) |
| 1895 |
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) |
| 1896 |
- libressl? ( dev-libs/libressl:0= ) |
| 1897 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 1898 |
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
| 1899 |
- sftp? ( net-libs/libssh[sftp] ) |
| 1900 |
- sys-libs/zlib |
| 1901 |
- udev? ( virtual/udev ) |
| 1902 |
- vaapi? ( x11-libs/libva[opengl] ) |
| 1903 |
- vdpau? ( |
| 1904 |
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) |
| 1905 |
- system-ffmpeg? ( media-video/ffmpeg[vdpau] ) |
| 1906 |
- ) |
| 1907 |
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) |
| 1908 |
- X? ( |
| 1909 |
- x11-libs/libdrm |
| 1910 |
- x11-libs/libX11 |
| 1911 |
- x11-libs/libXrandr |
| 1912 |
- x11-libs/libXrender |
| 1913 |
- ) |
| 1914 |
- xslt? ( dev-libs/libxslt ) |
| 1915 |
- zeroconf? ( net-dns/avahi[dbus] ) |
| 1916 |
-" |
| 1917 |
-RDEPEND="${COMMON_DEPEND} |
| 1918 |
- lirc? ( |
| 1919 |
- || ( app-misc/lirc app-misc/inputlircd ) |
| 1920 |
- ) |
| 1921 |
- !media-tv/xbmc |
| 1922 |
- udisks? ( sys-fs/udisks:0 ) |
| 1923 |
- upower? ( |
| 1924 |
- systemd? ( sys-power/upower ) |
| 1925 |
- !systemd? ( |
| 1926 |
- || ( sys-power/upower-pm-utils sys-power/upower ) |
| 1927 |
- ) |
| 1928 |
- ) |
| 1929 |
-" |
| 1930 |
-DEPEND="${COMMON_DEPEND} |
| 1931 |
- app-arch/bzip2 |
| 1932 |
- app-arch/unzip |
| 1933 |
- app-arch/xz-utils |
| 1934 |
- app-arch/zip |
| 1935 |
- dev-lang/swig |
| 1936 |
- dev-libs/crossguid |
| 1937 |
- dev-util/cmake |
| 1938 |
- dev-util/gperf |
| 1939 |
- media-libs/giflib |
| 1940 |
- >=media-libs/libjpeg-turbo-1.5.1:= |
| 1941 |
- >=media-libs/libpng-1.6.26:0= |
| 1942 |
- test? ( dev-cpp/gtest ) |
| 1943 |
- virtual/pkgconfig |
| 1944 |
- x86? ( dev-lang/nasm ) |
| 1945 |
-" |
| 1946 |
-case ${PV} in |
| 1947 |
-9999) |
| 1948 |
- EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" |
| 1949 |
- inherit git-r3 |
| 1950 |
- # Force java for latest git version to avoid having to hand maintain the |
| 1951 |
- # generated addons package. #488118 |
| 1952 |
- DEPEND+=" |
| 1953 |
- virtual/jre |
| 1954 |
- " |
| 1955 |
- ;; |
| 1956 |
-*) |
| 1957 |
- MY_PV=${PV/_p/_r} |
| 1958 |
- MY_PV=${MY_PV/_alpha/a} |
| 1959 |
- MY_PV=${MY_PV/_beta/b} |
| 1960 |
- MY_PV=${MY_PV/_rc/rc} |
| 1961 |
- MY_P="${PN}-${MY_PV}" |
| 1962 |
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz |
| 1963 |
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )" |
| 1964 |
- KEYWORDS="~amd64 ~x86" |
| 1965 |
- IUSE+=" java" |
| 1966 |
- DEPEND+=" |
| 1967 |
- java? ( virtual/jre ) |
| 1968 |
- " |
| 1969 |
- |
| 1970 |
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 1971 |
- ;; |
| 1972 |
-esac |
| 1973 |
- |
| 1974 |
-CONFIG_CHECK="~IP_MULTICAST" |
| 1975 |
-ERROR_IP_MULTICAST=" |
| 1976 |
-In some cases Kodi needs to access multicast addresses. |
| 1977 |
-Please consider enabling IP_MULTICAST under Networking options. |
| 1978 |
-" |
| 1979 |
- |
| 1980 |
-CMAKE_USE_DIR=${S}/project/cmake/ |
| 1981 |
- |
| 1982 |
-pkg_setup() { |
| 1983 |
- check_extra_config |
| 1984 |
- python-single-r1_pkg_setup |
| 1985 |
-} |
| 1986 |
- |
| 1987 |
-src_prepare() { |
| 1988 |
- if in_iuse java && use !java; then |
| 1989 |
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch |
| 1990 |
- fi |
| 1991 |
- cmake-utils_src_prepare |
| 1992 |
- |
| 1993 |
- # avoid long delays when powerkit isn't running #348580 |
| 1994 |
- sed -i \ |
| 1995 |
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ |
| 1996 |
- xbmc/linux/*.cpp || die |
| 1997 |
- |
| 1998 |
- # Prepare tools and libs witch are configured with autotools during compile time |
| 1999 |
- AUTOTOOLS_DIRS=( |
| 2000 |
- "${S}"/lib/cpluff |
| 2001 |
- "${S}"/tools/depends/native/TexturePacker/src |
| 2002 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src |
| 2003 |
- ) |
| 2004 |
- |
| 2005 |
- local d |
| 2006 |
- for d in "${AUTOTOOLS_DIRS[@]}" ; do |
| 2007 |
- pushd ${d} >/dev/null || die |
| 2008 |
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf |
| 2009 |
- popd >/dev/null || die |
| 2010 |
- done |
| 2011 |
- elibtoolize |
| 2012 |
- |
| 2013 |
- # Prevent autoreconf rerun |
| 2014 |
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ |
| 2015 |
- "${S}"/project/cmake/modules/FindCpluff.cmake \ |
| 2016 |
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ |
| 2017 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh |
| 2018 |
-} |
| 2019 |
- |
| 2020 |
-src_configure() { |
| 2021 |
- local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) |
| 2022 |
- |
| 2023 |
- local mycmakeargs=( |
| 2024 |
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" |
| 2025 |
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 |
| 2026 |
- -DENABLE_ALSA=$(usex alsa) |
| 2027 |
- -DENABLE_AIRTUNES=$(usex airplay) |
| 2028 |
- -DENABLE_AVAHI=$(usex zeroconf) |
| 2029 |
- -DENABLE_BLUETOOTH=$(usex bluetooth) |
| 2030 |
- -DENABLE_BLURAY=$(usex bluray) |
| 2031 |
- -DENABLE_CCACHE=OFF |
| 2032 |
- -DENABLE_CEC=$(usex cec) |
| 2033 |
- -DENABLE_DBUS=$(usex dbus) |
| 2034 |
- -DENABLE_DVDCSS=$(usex css) |
| 2035 |
- -DENABLE_INTERNAL_CROSSGUID=OFF |
| 2036 |
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" |
| 2037 |
- -DENABLE_CAP=$(usex caps) |
| 2038 |
- -DENABLE_LIRC=$(usex lirc) |
| 2039 |
- -DENABLE_MICROHTTPD=$(usex webserver) |
| 2040 |
- -DENABLE_MYSQLCLIENT=$(usex mysql) |
| 2041 |
- -DENABLE_NFS=$(usex nfs) |
| 2042 |
- -DENABLE_NONFREE=$(usex nonfree) |
| 2043 |
- -DENABLE_OPENGLES=$(usex gles) |
| 2044 |
- -DENABLE_OPENGL=$(usex opengl) |
| 2045 |
- -DENABLE_OPENSSL=ON |
| 2046 |
- -DENABLE_OPTICAL=$(usex dvd) |
| 2047 |
- -DENABLE_PLIST=$(usex airplay) |
| 2048 |
- -DENABLE_PULSEAUDIO=$(usex pulseaudio) |
| 2049 |
- -DENABLE_SMBCLIENT=$(usex samba) |
| 2050 |
- -DENABLE_SSH=$(usex sftp) |
| 2051 |
- -DENABLE_UDEV=$(usex udev) |
| 2052 |
- -DENABLE_UPNP=$(usex upnp) |
| 2053 |
- -DENABLE_VAAPI=$(usex vaapi) |
| 2054 |
- -DENABLE_VDPAU=$(usex vdpau) |
| 2055 |
- -DENABLE_X11=$(usex X) |
| 2056 |
- -DENABLE_XSLT=$(usex xslt) |
| 2057 |
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" |
| 2058 |
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" |
| 2059 |
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" |
| 2060 |
- ) |
| 2061 |
- |
| 2062 |
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) |
| 2063 |
- |
| 2064 |
- use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" ) |
| 2065 |
- |
| 2066 |
- cmake-utils_src_configure |
| 2067 |
-} |
| 2068 |
- |
| 2069 |
-src_compile() { |
| 2070 |
- cmake-utils_src_compile all $(usev test) |
| 2071 |
-} |
| 2072 |
- |
| 2073 |
-src_install() { |
| 2074 |
- cmake-utils_src_install |
| 2075 |
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die |
| 2076 |
- |
| 2077 |
- newicon media/icon48x48.png kodi.png |
| 2078 |
- |
| 2079 |
- # Replace bundled fonts with system ones. |
| 2080 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die |
| 2081 |
- dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ |
| 2082 |
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf |
| 2083 |
- |
| 2084 |
- local f |
| 2085 |
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do |
| 2086 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die |
| 2087 |
- dosym /usr/share/fonts/noto/"${f}" \ |
| 2088 |
- usr/share/kodi/addons/skin.estuary/fonts/"${f}" |
| 2089 |
- done |
| 2090 |
- |
| 2091 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die |
| 2092 |
- dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ |
| 2093 |
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf |
| 2094 |
- |
| 2095 |
- python_domodule tools/EventClients/lib/python/xbmcclient.py |
| 2096 |
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send |
| 2097 |
-} |
| 2098 |
|
| 2099 |
diff --git a/media-tv/kodi/kodi-17.2.ebuild b/media-tv/kodi/kodi-17.2.ebuild |
| 2100 |
deleted file mode 100644 |
| 2101 |
index 94c5a55bfa5..00000000000 |
| 2102 |
--- a/media-tv/kodi/kodi-17.2.ebuild |
| 2103 |
+++ /dev/null |
| 2104 |
@@ -1,279 +0,0 @@ |
| 2105 |
-# Copyright 1999-2017 Gentoo Foundation |
| 2106 |
-# Distributed under the terms of the GNU General Public License v2 |
| 2107 |
- |
| 2108 |
-EAPI=6 |
| 2109 |
- |
| 2110 |
-# Does not work with py3 here |
| 2111 |
-PYTHON_COMPAT=( python2_7 ) |
| 2112 |
-PYTHON_REQ_USE="sqlite" |
| 2113 |
- |
| 2114 |
-inherit eutils linux-info python-single-r1 cmake-utils autotools |
| 2115 |
- |
| 2116 |
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" |
| 2117 |
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" |
| 2118 |
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" |
| 2119 |
-FFMPEG_VERSION="3.1.6" |
| 2120 |
-CODENAME="Krypton" |
| 2121 |
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz |
| 2122 |
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz |
| 2123 |
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz |
| 2124 |
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )" |
| 2125 |
- |
| 2126 |
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" |
| 2127 |
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/" |
| 2128 |
- |
| 2129 |
-LICENSE="GPL-2" |
| 2130 |
-SLOT="0" |
| 2131 |
-# use flag is called libusb so that it doesn't fool people in thinking that |
| 2132 |
-# it is _required_ for USB support. Otherwise they'll disable udev and |
| 2133 |
-# that's going to be worse. |
| 2134 |
-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" |
| 2135 |
-REQUIRED_USE=" |
| 2136 |
- ${PYTHON_REQUIRED_USE} |
| 2137 |
- || ( gles opengl ) |
| 2138 |
- gles? ( X ) |
| 2139 |
- opengl? ( X ) |
| 2140 |
- udev? ( !libusb ) |
| 2141 |
- udisks? ( dbus ) |
| 2142 |
- upower? ( dbus ) |
| 2143 |
-" |
| 2144 |
- |
| 2145 |
-COMMON_DEPEND="${PYTHON_DEPS} |
| 2146 |
- airplay? ( |
| 2147 |
- app-pda/libplist |
| 2148 |
- net-libs/shairplay |
| 2149 |
- ) |
| 2150 |
- alsa? ( media-libs/alsa-lib ) |
| 2151 |
- bluetooth? ( net-wireless/bluez ) |
| 2152 |
- bluray? ( >=media-libs/libbluray-0.7.0 ) |
| 2153 |
- caps? ( sys-libs/libcap ) |
| 2154 |
- dbus? ( sys-apps/dbus ) |
| 2155 |
- dev-db/sqlite |
| 2156 |
- dev-libs/expat |
| 2157 |
- dev-libs/fribidi |
| 2158 |
- cec? ( >=dev-libs/libcec-4.0 ) |
| 2159 |
- dev-libs/libpcre[cxx] |
| 2160 |
- dev-libs/libxml2 |
| 2161 |
- >=dev-libs/lzo-2.04 |
| 2162 |
- dev-libs/tinyxml[stl] |
| 2163 |
- >=dev-libs/yajl-2 |
| 2164 |
- dev-python/pillow[${PYTHON_USEDEP}] |
| 2165 |
- dev-libs/libcdio |
| 2166 |
- gles? ( media-libs/mesa[gles2] ) |
| 2167 |
- libusb? ( virtual/libusb:1 ) |
| 2168 |
- media-fonts/corefonts |
| 2169 |
- >=media-fonts/noto-20160531 |
| 2170 |
- media-fonts/roboto |
| 2171 |
- media-libs/fontconfig |
| 2172 |
- media-libs/freetype |
| 2173 |
- >=media-libs/libass-0.13.4 |
| 2174 |
- media-libs/mesa[egl] |
| 2175 |
- >=media-libs/taglib-1.11.1 |
| 2176 |
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] ) |
| 2177 |
- mysql? ( virtual/mysql ) |
| 2178 |
- >=net-misc/curl-7.51.0 |
| 2179 |
- nfs? ( net-fs/libnfs:= ) |
| 2180 |
- opengl? ( media-libs/glu ) |
| 2181 |
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) |
| 2182 |
- libressl? ( dev-libs/libressl:0= ) |
| 2183 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 2184 |
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
| 2185 |
- sftp? ( net-libs/libssh[sftp] ) |
| 2186 |
- sys-libs/zlib |
| 2187 |
- udev? ( virtual/udev ) |
| 2188 |
- vaapi? ( x11-libs/libva[opengl] ) |
| 2189 |
- vdpau? ( |
| 2190 |
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) |
| 2191 |
- system-ffmpeg? ( media-video/ffmpeg[vdpau] ) |
| 2192 |
- ) |
| 2193 |
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) |
| 2194 |
- X? ( |
| 2195 |
- x11-libs/libdrm |
| 2196 |
- x11-libs/libX11 |
| 2197 |
- x11-libs/libXrandr |
| 2198 |
- x11-libs/libXrender |
| 2199 |
- ) |
| 2200 |
- xslt? ( dev-libs/libxslt ) |
| 2201 |
- zeroconf? ( net-dns/avahi[dbus] ) |
| 2202 |
-" |
| 2203 |
-RDEPEND="${COMMON_DEPEND} |
| 2204 |
- lirc? ( |
| 2205 |
- || ( app-misc/lirc app-misc/inputlircd ) |
| 2206 |
- ) |
| 2207 |
- !media-tv/xbmc |
| 2208 |
- udisks? ( sys-fs/udisks:0 ) |
| 2209 |
- upower? ( |
| 2210 |
- systemd? ( sys-power/upower ) |
| 2211 |
- !systemd? ( |
| 2212 |
- || ( sys-power/upower-pm-utils sys-power/upower ) |
| 2213 |
- ) |
| 2214 |
- ) |
| 2215 |
-" |
| 2216 |
-DEPEND="${COMMON_DEPEND} |
| 2217 |
- app-arch/bzip2 |
| 2218 |
- app-arch/unzip |
| 2219 |
- app-arch/xz-utils |
| 2220 |
- app-arch/zip |
| 2221 |
- dev-lang/swig |
| 2222 |
- dev-libs/crossguid |
| 2223 |
- dev-util/cmake |
| 2224 |
- dev-util/gperf |
| 2225 |
- media-libs/giflib |
| 2226 |
- >=media-libs/libjpeg-turbo-1.5.1:= |
| 2227 |
- >=media-libs/libpng-1.6.26:0= |
| 2228 |
- test? ( dev-cpp/gtest ) |
| 2229 |
- virtual/pkgconfig |
| 2230 |
- x86? ( dev-lang/nasm ) |
| 2231 |
-" |
| 2232 |
-case ${PV} in |
| 2233 |
-9999) |
| 2234 |
- EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" |
| 2235 |
- inherit git-r3 |
| 2236 |
- # Force java for latest git version to avoid having to hand maintain the |
| 2237 |
- # generated addons package. #488118 |
| 2238 |
- DEPEND+=" |
| 2239 |
- virtual/jre |
| 2240 |
- " |
| 2241 |
- ;; |
| 2242 |
-*) |
| 2243 |
- MY_PV=${PV/_p/_r} |
| 2244 |
- MY_PV=${MY_PV/_alpha/a} |
| 2245 |
- MY_PV=${MY_PV/_beta/b} |
| 2246 |
- MY_PV=${MY_PV/_rc/rc} |
| 2247 |
- MY_P="${PN}-${MY_PV}" |
| 2248 |
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz |
| 2249 |
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )" |
| 2250 |
- KEYWORDS="amd64 x86" |
| 2251 |
- IUSE+=" java" |
| 2252 |
- DEPEND+=" |
| 2253 |
- java? ( virtual/jre ) |
| 2254 |
- " |
| 2255 |
- |
| 2256 |
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 2257 |
- ;; |
| 2258 |
-esac |
| 2259 |
- |
| 2260 |
-CONFIG_CHECK="~IP_MULTICAST" |
| 2261 |
-ERROR_IP_MULTICAST=" |
| 2262 |
-In some cases Kodi needs to access multicast addresses. |
| 2263 |
-Please consider enabling IP_MULTICAST under Networking options. |
| 2264 |
-" |
| 2265 |
- |
| 2266 |
-CMAKE_USE_DIR=${S}/project/cmake/ |
| 2267 |
- |
| 2268 |
-pkg_setup() { |
| 2269 |
- check_extra_config |
| 2270 |
- python-single-r1_pkg_setup |
| 2271 |
-} |
| 2272 |
- |
| 2273 |
-src_prepare() { |
| 2274 |
- if in_iuse java && use !java; then |
| 2275 |
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch |
| 2276 |
- fi |
| 2277 |
- cmake-utils_src_prepare |
| 2278 |
- |
| 2279 |
- # avoid long delays when powerkit isn't running #348580 |
| 2280 |
- sed -i \ |
| 2281 |
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ |
| 2282 |
- xbmc/linux/*.cpp || die |
| 2283 |
- |
| 2284 |
- # Prepare tools and libs witch are configured with autotools during compile time |
| 2285 |
- AUTOTOOLS_DIRS=( |
| 2286 |
- "${S}"/lib/cpluff |
| 2287 |
- "${S}"/tools/depends/native/TexturePacker/src |
| 2288 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src |
| 2289 |
- ) |
| 2290 |
- |
| 2291 |
- local d |
| 2292 |
- for d in "${AUTOTOOLS_DIRS[@]}" ; do |
| 2293 |
- pushd ${d} >/dev/null || die |
| 2294 |
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf |
| 2295 |
- popd >/dev/null || die |
| 2296 |
- done |
| 2297 |
- elibtoolize |
| 2298 |
- |
| 2299 |
- # Prevent autoreconf rerun |
| 2300 |
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ |
| 2301 |
- "${S}"/project/cmake/modules/FindCpluff.cmake \ |
| 2302 |
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ |
| 2303 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh |
| 2304 |
-} |
| 2305 |
- |
| 2306 |
-src_configure() { |
| 2307 |
- local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) |
| 2308 |
- |
| 2309 |
- local mycmakeargs=( |
| 2310 |
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" |
| 2311 |
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 |
| 2312 |
- -DENABLE_ALSA=$(usex alsa) |
| 2313 |
- -DENABLE_AIRTUNES=$(usex airplay) |
| 2314 |
- -DENABLE_AVAHI=$(usex zeroconf) |
| 2315 |
- -DENABLE_BLUETOOTH=$(usex bluetooth) |
| 2316 |
- -DENABLE_BLURAY=$(usex bluray) |
| 2317 |
- -DENABLE_CCACHE=OFF |
| 2318 |
- -DENABLE_CEC=$(usex cec) |
| 2319 |
- -DENABLE_DBUS=$(usex dbus) |
| 2320 |
- -DENABLE_DVDCSS=$(usex css) |
| 2321 |
- -DENABLE_INTERNAL_CROSSGUID=OFF |
| 2322 |
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" |
| 2323 |
- -DENABLE_CAP=$(usex caps) |
| 2324 |
- -DENABLE_LIRC=$(usex lirc) |
| 2325 |
- -DENABLE_MICROHTTPD=$(usex webserver) |
| 2326 |
- -DENABLE_MYSQLCLIENT=$(usex mysql) |
| 2327 |
- -DENABLE_NFS=$(usex nfs) |
| 2328 |
- -DENABLE_NONFREE=$(usex nonfree) |
| 2329 |
- -DENABLE_OPENGLES=$(usex gles) |
| 2330 |
- -DENABLE_OPENGL=$(usex opengl) |
| 2331 |
- -DENABLE_OPENSSL=ON |
| 2332 |
- -DENABLE_OPTICAL=$(usex dvd) |
| 2333 |
- -DENABLE_PLIST=$(usex airplay) |
| 2334 |
- -DENABLE_PULSEAUDIO=$(usex pulseaudio) |
| 2335 |
- -DENABLE_SMBCLIENT=$(usex samba) |
| 2336 |
- -DENABLE_SSH=$(usex sftp) |
| 2337 |
- -DENABLE_UDEV=$(usex udev) |
| 2338 |
- -DENABLE_UPNP=$(usex upnp) |
| 2339 |
- -DENABLE_VAAPI=$(usex vaapi) |
| 2340 |
- -DENABLE_VDPAU=$(usex vdpau) |
| 2341 |
- -DENABLE_X11=$(usex X) |
| 2342 |
- -DENABLE_XSLT=$(usex xslt) |
| 2343 |
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" |
| 2344 |
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" |
| 2345 |
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" |
| 2346 |
- ) |
| 2347 |
- |
| 2348 |
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) |
| 2349 |
- |
| 2350 |
- use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" ) |
| 2351 |
- |
| 2352 |
- cmake-utils_src_configure |
| 2353 |
-} |
| 2354 |
- |
| 2355 |
-src_compile() { |
| 2356 |
- cmake-utils_src_compile all $(usev test) |
| 2357 |
-} |
| 2358 |
- |
| 2359 |
-src_install() { |
| 2360 |
- cmake-utils_src_install |
| 2361 |
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die |
| 2362 |
- |
| 2363 |
- newicon media/icon48x48.png kodi.png |
| 2364 |
- |
| 2365 |
- # Replace bundled fonts with system ones. |
| 2366 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die |
| 2367 |
- dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ |
| 2368 |
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf |
| 2369 |
- |
| 2370 |
- local f |
| 2371 |
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do |
| 2372 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die |
| 2373 |
- dosym /usr/share/fonts/noto/"${f}" \ |
| 2374 |
- usr/share/kodi/addons/skin.estuary/fonts/"${f}" |
| 2375 |
- done |
| 2376 |
- |
| 2377 |
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die |
| 2378 |
- dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ |
| 2379 |
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf |
| 2380 |
- |
| 2381 |
- python_domodule tools/EventClients/lib/python/xbmcclient.py |
| 2382 |
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send |
| 2383 |
-} |
| 2384 |
|
| 2385 |
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml |
| 2386 |
index 89e4d8a7d65..cbc623e2e5c 100644 |
| 2387 |
--- a/media-tv/kodi/metadata.xml |
| 2388 |
+++ b/media-tv/kodi/metadata.xml |
| 2389 |
@@ -15,14 +15,11 @@ |
| 2390 |
<flag name="cec">Enable support for HDMI-CEC devices via libcec</flag> |
| 2391 |
<flag name="gles">Enable support for GLES</flag> |
| 2392 |
<flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag> |
| 2393 |
- <flag name="midi">Support MIDI files</flag> |
| 2394 |
<flag name="nfs">Enable NFS client support</flag> |
| 2395 |
<flag name="nonfree">Enable non-free components</flag> |
| 2396 |
<flag name="dvd">Enable optical (CD/DVD drive) support</flag> |
| 2397 |
- <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag> |
| 2398 |
<flag name="sftp">Support browsing files over SFTP</flag> |
| 2399 |
<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> |
| 2400 |
- <flag name="texturepacker">Support packing skin textures</flag> |
| 2401 |
<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> |
| 2402 |
<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> |
| 2403 |
<flag name="webserver">Enable internal webserver</flag> |
Archives