summaryrefslogtreecommitdiff
path: root/media-tv/kodi
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-tv/kodi
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'media-tv/kodi')
-rw-r--r--media-tv/kodi/Manifest22
-rw-r--r--media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch31
-rw-r--r--media-tv/kodi/kodi-18.3-r1.ebuild328
-rw-r--r--media-tv/kodi/kodi-18.7.1.ebuild6
-rw-r--r--media-tv/kodi/kodi-18.7.ebuild4
-rw-r--r--media-tv/kodi/kodi-18.8.ebuild (renamed from media-tv/kodi/kodi-18.6.ebuild)9
-rw-r--r--media-tv/kodi/kodi-19.0_alpha1-r1.ebuild (renamed from media-tv/kodi/kodi-18.5-r2.ebuild)76
-rw-r--r--media-tv/kodi/kodi-19.9999.ebuild (renamed from media-tv/kodi/kodi-18.4-r1.ebuild)79
-rw-r--r--media-tv/kodi/kodi-9999.ebuild4
9 files changed, 133 insertions, 426 deletions
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index b0fca16ab576..dc330bee5efe 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,22 +1,20 @@
AUX kodi-18-remove-useless-test.patch 1295 BLAKE2B 36c6408ee1ef404539f097822952fa4000b4913ed5b54526bb4f2b452a553335eb3935e5a6cbcec0b1e497eed86d5417784016404596d31a063d608ca1f44d51 SHA512 73c50bf728d04117ad1493505bea561ade6c49e2e58de24a453374946d0931e11e094b749bad9d90ea48197521808a12b87c42e496acb6091380f4953b959567
AUX kodi-18.5-cassert.patch 1402 BLAKE2B 02f2b63856cf1fd75749d78a0f9cf37cac55b20fc22302846011781c56e8902312a10e71c3e1b21f44aaa362efba2acefb73c5ae68643b569c541508f44d97bd SHA512 fbaa126dd647559749944c09e5424a76dccdaa5d8dc6299a52cb6215f20af29f3cf8d0596280f335e8a9be1ffe556fa47b33c9d28b22c2b47f51d738219aeb8c
-DIST ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz 12426917 BLAKE2B 83da9511d7b4ef6a8c813561a061c4fe86712e4424c30c9005500751c6c79f4232910caaf13cd34d2db1867f592b042dd291d6c32a77f80107ce87a3a7db1760 SHA512 b4d4bf16f05b953ba81769446c8fd90246e1919b9ef671fb212008151c83d8445e4123ad37c352aa6243074962832e817749d2de318eb721d5bb5d655fd77ab2
+AUX kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch 1114 BLAKE2B 149786e52ea4379cc6841e15929d39787e3c2e40832f078026afe0a6f43908ca3a8e451a12be7324313601aa224f53131ad811a83a72bec08592eefd14bb1128 SHA512 44bb5a26b916dea80b162ca4c03e71b2f6d1e108d8f9a007ac1d1661119ecbd7a6b4d65471d97d8991feb0d0ef157f6e8f69f70f463e5af4dc1d9b68aafda28b
DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
DIST ffmpeg-kodi-4.3-Matrix-Alpha1.tar.gz 13478011 BLAKE2B 6219293fba86981c34c22b1a91c6dce0c298d523ecafe2e0ddce8b1ec4213d4f8f65610e4555a124a582d7fa8e858d0ad6921015fa4e639d64a02e955f7faf46 SHA512 23220650b550fe2008c38c955e10baf55e1ceaac780cf170db5349b156ac399ff3eda39509773f0c973c50083e75823b1da8e92b3751c04bb06a7f5687bef850
-DIST kodi-18.3.tar.gz 51013397 BLAKE2B cce29d481397dddd3c942f83a034bc6d73eafc1be2a50436e1e5611ccf04c27e6110c4b4f99f7f7d1cf8da3e2550209c8bee3db6e98136b8fa9738c4b1fc7e43 SHA512 4e898e28238dcbc67e106c5a0ef88bd6a82f8c0ad00e77e3ddbe2da6181b37d9ca1ba6bda57206223cfa119c5291edb4410d3e773d97b5ab67660e49929437ec
-DIST kodi-18.4.tar.gz 51027569 BLAKE2B 47e3377abb4a1e5a3c26b1519f45ab9347127467594841ac689b857a3f4163731951d4e1e4960bce5c2af4fa224acf4a3887f42bdc41a603bba4979d3bcbcda8 SHA512 ae08fc29d20387d9352dc1ae4a89da19962a279b89705ff8f7869377281589d44a685cebaa8509d3252ae79215dcdaadb72e9fa752e6d2bce59974bc23276aad
-DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67d9a3371b1a006292f642e59c6321cb63f698e1a43bc7be45209dbf993028b1184722f7b51dbe6fef6a292ba SHA512 6fe70d8ee5b6ffd3d43b89487554e41eed8dbf95bb017b82578b547ec248ae94f4dda298f0d85c5896019f7032eba4e1e2494c8140dde9c9b9cb21802acfd029
-DIST kodi-18.6.tar.gz 51031022 BLAKE2B bc82ad8bcce8f0881a5a98fa0fd56de18413d0043dcbae9dafe25ae45e533ef02d7a95a460cba8efd899fe8c2ffa62fa228aa788e23196269efc57faff13a134 SHA512 9dffb052e0adf7c838ace178dd1e0e7b5fb02f01d43f90e22aa7d225bc67496586daab9bed2d20c1aaca34d4e69a9973fec5065f5076def2eb32da630d9cb67d
+DIST kodi-18-libmicrohttpd-0.9.71.patch 84981 BLAKE2B e07c7df63bdfbaf9dfc5d0989adf96eb663a8c99ea11c42dfc585d8b91343a3445e9bc2f1797e845b0895e79568526e8e594a76e8cb3d7b591153a0ad45ce807 SHA512 286a1466174d847eac460b2a7a1b66b082148f2a3e91c4f5f881b909a59b8fdb2037eda074bd3c6e5dbe6a65dc2bef9f1d6746d7db2cb78d285c4b7750c366c2
DIST kodi-18.7.1.tar.gz 51052174 BLAKE2B 8e341d1b047cf170e845c775427f9fa54dabe2a9ad56afa80e90e0b6b508f2606907c813decdbdcc75eeeeb742ae1a600cc4d1bb40021bc6624a234f1aeb9946 SHA512 db44c2d3c998af37948ccd042932545c9d781b622dba85ec11b7dd97ec0be80f03d2687249a9483d1b2a7178179bf5a003f8d0f4c0e55c9f2a41f67a27a19e0f
DIST kodi-18.7.tar.gz 51051040 BLAKE2B 7ff04cd0ddcf74e46eef4318cf870662b9e076b362322958a6b8019d49134e37981f7ca21b5806e38b942adc4c29ea2b25a19f46e5da3d469613cf19a29f4e8c SHA512 7e5678f5e23e8af929056a49b0ce0b992a1f53a1fe970a149610c5a24adb591085bb06cc405e8bdc6040eef853d23e99df660d7006fc1ea4e79afd3a697875c5
+DIST kodi-18.8.tar.gz 51052219 BLAKE2B 6e49b08b5e2bfe778dafb687658e82b90226a9f1c1a7827a4290d601fe4c98e5cbaabaa39563c19a2956b83ce3a76640f081a56a41dfea4d65fb8b503c6f37b0 SHA512 242eaa9144ba0d9b15f02ab41282295de76d375cf66d595e7f6687d47c996133fcf5647448dcd06759df9f30bd86cdba239720b9bdd8b57827b6f261c08c4aaa
+DIST kodi-19.0a1.tar.gz 51653713 BLAKE2B 7fb9e4e2a98f1ae77b8889c66f10d938d7aa63f1c77858a3b75d61e12eaf896472e05a13d0f4f0f953978349366e58190a86003bead481e915cddaec7c865b41 SHA512 52fb4b851a394b52fd50b99e13d4ed19cc7c069df52d29e1816faee4dfebde73501582a733d7d5112ad9ff20a7b7df5a8c26dfa29e886160ff8e06b5bedab4fc
DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-18.3-r1.ebuild 9637 BLAKE2B f664ff7359fca7b8d9aa4cb02e21d83835ae9de281d0a6540dfe9f6d203fdc263465274e9440cf1919dd64eff769b41a9d44db5aaddb34f9f33dffe5c0a9ca43 SHA512 81a975e03150e5da65928d2730299649fe94ef5538f4577cfeb26eee39cd888b7fec2b5fc4d9d8b814ff8e74c619f4ef00d840a05dd279547524f1743ed19d89
-EBUILD kodi-18.4-r1.ebuild 9521 BLAKE2B 312c594e5dd8c851af3a21e8b373892aed11aab8a2f29ec7442b46439242fe7f9fb04be8ab1460e8752e15258174d1c5ff66fee07cd041a2c65bdc95e0a65e83 SHA512 364ced13e0db628cf535c99137bbad2b5f6cb6f071bb1781e96314b365625cec3936213bae1827fbe6f926ecb2565a32e356b58b3951b10794920d2f9df4aecd
-EBUILD kodi-18.5-r2.ebuild 9492 BLAKE2B 022c819338e0cf341f84e62d2b72381a71a41c2088b27eea9e21a598aaaec2e778df11c19a22448da4bb035611fc5e549d321c08cd76c3e234b4aa343d545739 SHA512 dca47435172ec06cb6ee9514d684559f67f6532c9c037e5b57f374ce3c5d36420c95ed441e914fe5ba35cbb0e6d3581f2797297328758be4d752261a806d501a
-EBUILD kodi-18.6.ebuild 9643 BLAKE2B 3918f6e3c75285dc69e2af4340816edd602ac2aff9abe2ad56e54ebb2932f89af557942e7d762a98a6b2b7be0344d494152cc8fccac7d08aeefa9bdf4b563c4a SHA512 fc362753062944bd384aeded87fb1e06a47ca9d8bc9364b48c6ae4a4e20d75c1c0def79bdb0d8602e91587d47915d1ea2c082b28e8e6bc0acc382e62d02c7275
-EBUILD kodi-18.7.1.ebuild 9652 BLAKE2B a09cdbb72d0e03168b7128d4693437e02092a5f502300a68beda3bda1ba3b0efc2d1a214b44e5d74c82d962cf9fca23d74928ef6d2d438d07937fcd73b4d18de SHA512 9a92caac2c5c0cb3158db3d9a3d5146431760362ad39f272198fdd9c712ca1e3fe6f3d4ee2f6761b65b909a9121d01f118b879c02d2575c2245b8c128f6d72d0
-EBUILD kodi-18.7.ebuild 9643 BLAKE2B 3918f6e3c75285dc69e2af4340816edd602ac2aff9abe2ad56e54ebb2932f89af557942e7d762a98a6b2b7be0344d494152cc8fccac7d08aeefa9bdf4b563c4a SHA512 fc362753062944bd384aeded87fb1e06a47ca9d8bc9364b48c6ae4a4e20d75c1c0def79bdb0d8602e91587d47915d1ea2c082b28e8e6bc0acc382e62d02c7275
-EBUILD kodi-9999.ebuild 9260 BLAKE2B 7a9d8dbe0d9a74db432814850821f1e622d27c149e318d993ddf52b62d4c6f367956be621ca348e5e6ab378cd8bc11efc9ebb67cc433ce7a43bdd535ec6d25fb SHA512 bc49e379bb06b1b672fac3aedfbf0cff18b2b4d5ef83363c5ba58940655ca807f6afe6b6789a4e3534b6266b865a2b25f7f953cccabb37f58d9aad9002efd058
+EBUILD kodi-18.7.1.ebuild 9776 BLAKE2B 2c988ece7726fd6ad227b35fcf7e53c7fef61a8a0a511081741938f62e0eab5254ce537fed8a43e2c18688ee7a04b7c0c0de0247ca9997ceae1ad0607471f88e SHA512 44ce425be91bb45e2c1bf69fd05fe2a10f8341438f2e754283e4897e53cf35d580a3ce869848e415379fe3c4e503a8f13cab497658f648a7c582eeaae21e4928
+EBUILD kodi-18.7.ebuild 9762 BLAKE2B ed5b1e0bba1ae29387f59acc9f454872abdae8506b19570fa4df7ceda32a3551f684bc3f7be2b8426f4041d24a3bed830076d76c897a310c79d87773b7e3c566 SHA512 f0b4362ef5665ebb17618b09f6f25179423526cd9244c585d333349f8894a6d5543a76ccb181f0b0445de50305ce1813998720a8c5c1ac245ca5872b20bcc67f
+EBUILD kodi-18.8.ebuild 9619 BLAKE2B 1329861366f039dca5cfdbc450ad1c36d42bf2e2b464f1fec1bd2a4150a2c7df62ece6ad9846e978a4d8e6ea0624e718a61c7b4490c530ee7f8308a71b3ee2a8 SHA512 5f1e2b46fad7a81b00586ae7e94943bc2b3a8f14e14a8238dce4d62da47a139317d881ac853d6bdf70796ab278e9b5b320c31b2af9682ddae5f791f43c1cb40d
+EBUILD kodi-19.0_alpha1-r1.ebuild 9429 BLAKE2B 124d85552e57a4e6890ac4fee32c467d0572e5580ed7fe36aab4ae2b39e6982e51fe693c5650850ad6a005227a62df194e9c43d21a07679221f2fc72373874c8 SHA512 41d7531c261fe6cd559423fba3bd5c742a68ea6d4c2702f2c28e6f4bea896f84138d20ce1a502348114395aa3b7b1ea21ab590f11e185107cc1724f6489b1276
+EBUILD kodi-19.9999.ebuild 9360 BLAKE2B ae0d101e15421762d115a1b03939fb6420325404b993e70dc5b5cfda0a29d1d16b05346a08ab20e8626fc2a13a3beaca48e5fa7f131f4d4f2b7e7ebf6e90d2d0 SHA512 1cec9b72029e46c2312e802eaf9c70f63ac98b9d7ddc97530abf02b68e08cdb24d1219674b1abb2fae707c7fb3f272bfa0c9eb3a4bbca8bd95df6ab4749d4309
+EBUILD kodi-9999.ebuild 9360 BLAKE2B ae0d101e15421762d115a1b03939fb6420325404b993e70dc5b5cfda0a29d1d16b05346a08ab20e8626fc2a13a3beaca48e5fa7f131f4d4f2b7e7ebf6e90d2d0 SHA512 1cec9b72029e46c2312e802eaf9c70f63ac98b9d7ddc97530abf02b68e08cdb24d1219674b1abb2fae707c7fb3f272bfa0c9eb3a4bbca8bd95df6ab4749d4309
MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847
diff --git a/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch b/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch
new file mode 100644
index 000000000000..096a4032628b
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch
@@ -0,0 +1,31 @@
+From 3be79a564343886ade7e88f447944fd4b5452959 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Fri, 31 Jul 2020 14:56:21 -0400
+Subject: [PATCH] [test] [webserver] Conditional TestHTTPDirectory
+
+TestHTTPDirectory.cpp requires microhttpd so only include it if microhttpd is found.
+
+TestHTTPDirectory.cpp includes network/WebServer.h which includes network/httprequesthandler/IHTTPRequestHandler.h which includes microhttpd.h
+---
+ xbmc/filesystem/test/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/filesystem/test/CMakeLists.txt b/xbmc/filesystem/test/CMakeLists.txt
+index 235acc8549cf..9572459cf198 100644
+--- a/xbmc/filesystem/test/CMakeLists.txt
++++ b/xbmc/filesystem/test/CMakeLists.txt
+@@ -1,10 +1,13 @@
+ set(SOURCES TestDirectory.cpp
+ TestFile.cpp
+ TestFileFactory.cpp
+- TestHTTPDirectory.cpp
+ TestZipFile.cpp
+ TestZipManager.cpp)
+
++if(MICROHTTPD_FOUND)
++ list(APPEND SOURCES TestHTTPDirectory.cpp)
++endif()
++
+ if(NFS_FOUND)
+ list(APPEND SOURCES TestNfsFile.cpp)
+ endif()
diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
deleted file mode 100644
index ea0a6609f660..000000000000
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.3"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.2"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
-else
- PYTHON_COMPAT=( python2_7 )
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- ^^ ( gbm raspberry-pi wayland X )
- ?? ( mariadb mysql )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
- dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl,X(+)] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
- raspberry-pi? (
- || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
- )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- >=sys-libs/zlib-1.2.11
- udev? ( virtual/udev )
- vaapi? (
- x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- vdpau? ( x11-libs/libva[vdpau] )
- wayland? ( x11-libs/libva[wayland] )
- X? ( x11-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? ( app-misc/lirc )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
- dev-libs/rapidjson
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- virtual/jre
- x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if use gbm; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="gbm"
- -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use wayland; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="wayland"
- -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use raspberry-pi; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
- fi
-
- if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/media-tv/kodi/kodi-18.7.1.ebuild b/media-tv/kodi/kodi-18.7.1.ebuild
index 7f289b5c8a23..1500d25880b3 100644
--- a/media-tv/kodi/kodi-18.7.1.ebuild
+++ b/media-tv/kodi/kodi-18.7.1.ebuild
@@ -13,10 +13,12 @@ FFMPEG_KODI_VERSION="18.4"
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+ !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
+ https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
PATCHES=(
"${FILESDIR}/${PN}-18.5-cassert.patch"
"${FILESDIR}/${PN}-18-remove-useless-test.patch"
+ "${DISTDIR}/${PN}-18-libmicrohttpd-0.9.71.patch"
)
if [[ ${PV} == *9999 ]] ; then
@@ -31,7 +33,7 @@ else
MY_PV=${MY_PV/_rc/rc}
MY_P="${PN}-${MY_PV}"
SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
fi
diff --git a/media-tv/kodi/kodi-18.7.ebuild b/media-tv/kodi/kodi-18.7.ebuild
index b73cbf49d2d8..af2df1256278 100644
--- a/media-tv/kodi/kodi-18.7.ebuild
+++ b/media-tv/kodi/kodi-18.7.ebuild
@@ -13,10 +13,12 @@ FFMPEG_KODI_VERSION="18.4"
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+ !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
+ https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
PATCHES=(
"${FILESDIR}/${PN}-18.5-cassert.patch"
"${FILESDIR}/${PN}-18-remove-useless-test.patch"
+ "${DISTDIR}/${PN}-18-libmicrohttpd-0.9.71.patch"
)
if [[ ${PV} == *9999 ]] ; then
diff --git a/media-tv/kodi/kodi-18.6.ebuild b/media-tv/kodi/kodi-18.8.ebuild
index b73cbf49d2d8..cf17871d239b 100644
--- a/media-tv/kodi/kodi-18.6.ebuild
+++ b/media-tv/kodi/kodi-18.8.ebuild
@@ -13,11 +13,8 @@ FFMPEG_KODI_VERSION="18.4"
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-PATCHES=(
- "${FILESDIR}/${PN}-18.5-cassert.patch"
- "${FILESDIR}/${PN}-18-remove-useless-test.patch"
-)
+ !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
+ https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
if [[ ${PV} == *9999 ]] ; then
PYTHON_COMPAT=( python2_7 python3_{6,7} )
@@ -31,7 +28,7 @@ else
MY_PV=${MY_PV/_rc/rc}
MY_P="${PN}-${MY_PV}"
SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
fi
diff --git a/media-tv/kodi/kodi-18.5-r2.ebuild b/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild
index 9b455201ee36..6da60ce1906b 100644
--- a/media-tv/kodi/kodi-18.5-r2.ebuild
+++ b/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild
@@ -7,23 +7,18 @@ PYTHON_REQ_USE="libressl?,sqlite,ssl"
LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
+FFMPEG_VERSION="4.3"
+CODENAME="Matrix"
+FFMPEG_KODI_VERSION="Alpha1"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-PATCHES=(
- "${FILESDIR}/${P}-cassert.patch"
-)
-
if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
inherit git-r3
else
- PYTHON_COMPAT=( python2_7 )
MY_PV=${PV/_p/_r}
MY_PV=${MY_PV/_alpha/a}
MY_PV=${MY_PV/_beta/b}
@@ -34,6 +29,10 @@ else
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
fi
+PATCHES=(
+ "${FILESDIR}/${P}-conditional-TestHTTPDirectory.patch"
+)
+
inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
DESCRIPTION="A free and open source media-player and entertainment hub"
@@ -44,12 +43,13 @@ SLOT="0"
# use flag is called libusb so that it doesn't fool people in thinking that
# it is _required_ for USB support. Otherwise they'll disable udev and
# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( gles opengl )
^^ ( gbm raspberry-pi wayland X )
?? ( mariadb mysql )
+ bluray? ( udf )
udev? ( !libusb )
udisks? ( dbus )
upower? ( dbus )
@@ -63,23 +63,26 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
+ bluray? ( >=media-libs/libbluray-1.1.2 )
caps? ( sys-libs/libcap )
dbus? ( sys-apps/dbus )
dev-db/sqlite
dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
+ >=dev-libs/flatbuffers-1.11.0
+ >=dev-libs/fribidi-1.0.5
cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
dev-libs/libpcre[cxx]
>=dev-libs/libinput-1.10.5
>=dev-libs/libxml2-2.9.4
>=dev-libs/lzo-2.04
+ >=dev-libs/spdlog-1.5.0:=
dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=dev-libs/libcdio-2.1.0
+ >=dev-libs/libfmt-6.1.2
dev-libs/libfstrcmp
gbm? ( media-libs/mesa[gbm] )
gles? (
@@ -89,19 +92,20 @@ COMMON_DEPEND="${PYTHON_DEPS}
libusb? ( virtual/libusb:1 )
virtual/ttf-fonts
media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
+ media-libs/dav1d
+ >=media-libs/fontconfig-2.13.1
+ >=media-libs/freetype-2.10.1
>=media-libs/libass-0.13.4
!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
>=media-libs/taglib-1.11.1
system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+ >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
libressl? ( media-video/ffmpeg[libressl,-openssl] )
!libressl? ( media-video/ffmpeg[-libressl,openssl] )
)
mysql? ( dev-db/mysql-connector-c:= )
mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
+ >=net-misc/curl-7.68.0[http2]
nfs? ( >=net-fs/libnfs-2.0.0:= )
opengl? ( media-libs/glu )
!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
@@ -112,6 +116,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
pulseaudio? ( media-sound/pulseaudio )
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
>=sys-libs/zlib-1.2.11
+ udf? ( >=dev-libs/libudfread-1.0.0 )
udev? ( virtual/udev )
vaapi? (
x11-libs/libva:=
@@ -145,7 +150,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
"
RDEPEND="${COMMON_DEPEND}
lirc? ( app-misc/lirc )
- !media-tv/xbmc
udisks? ( sys-fs/udisks:2 )
upower? ( sys-power/upower )
"
@@ -158,9 +162,9 @@ DEPEND="${COMMON_DEPEND}
dev-util/cmake
dev-util/gperf
media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
+ >=media-libs/libjpeg-turbo-2.0.4:=
>=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
+ test? ( >=dev-cpp/gtest-1.10.0 )
virtual/pkgconfig
virtual/jre
x86? ( dev-lang/nasm )
@@ -179,14 +183,6 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
git-r3_src_unpack
else
default
@@ -203,7 +199,6 @@ src_prepare() {
# Prepare tools and libs witch are configured with autotools during compile time
AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
"${S}"/tools/depends/native/TexturePacker/src
"${S}"/tools/depends/native/JsonSchemaBuilder/src
)
@@ -218,7 +213,6 @@ src_prepare() {
# Prevent autoreconf rerun
sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
|| die
@@ -240,6 +234,8 @@ src_configure() {
-DENABLE_INTERNAL_CROSSGUID=OFF
-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-DENABLE_INTERNAL_FSTRCMP=OFF
+ -DENABLE_INTERNAL_GTEST=OFF
+ -DENABLE_INTERNAL_UDFREAD=OFF
-DENABLE_CAP=$(usex caps)
-DENABLE_LCMS2=$(usex lcms)
-DENABLE_LIRCCLIENT=$(usex lirc)
@@ -253,7 +249,9 @@ src_configure() {
-DENABLE_PLIST=$(usex airplay)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_SMBCLIENT=$(usex samba)
+ -DENABLE_TESTING=$(usex test)
-DENABLE_UDEV=$(usex udev)
+ -DENABLE_UDFREAD=$(usex udf)
-DENABLE_UPNP=$(usex upnp)
-DENABLE_VAAPI=$(usex vaapi)
-DENABLE_VDPAU=$(usex vdpau)
@@ -261,6 +259,8 @@ src_configure() {
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
)
use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
@@ -290,7 +290,10 @@ src_configure() {
fi
if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+ mycmakeargs+=(
+ -DCORE_PLATFORM_NAME="x11"
+ -DX11_RENDER_SYSTEM="$(usex opengl gl gles)"
+ )
fi
cmake_src_configure
@@ -301,7 +304,8 @@ src_compile() {
}
src_test() {
- cmake_build check
+ # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
+ KODI_HOME="${BUILD_DIR}" cmake_build check
}
src_install() {
diff --git a/media-tv/kodi/kodi-18.4-r1.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 3b37458b80ec..68f0cbca4eae 100644
--- a/media-tv/kodi/kodi-18.4-r1.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -7,30 +7,25 @@ PYTHON_REQ_USE="libressl?,sqlite,ssl"
LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
+FFMPEG_VERSION="4.3"
+CODENAME="Matrix"
+FFMPEG_KODI_VERSION="Alpha1"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-PATCHES=(
- "${FILESDIR}/${PN}-18.5-cassert.patch"
-)
-
if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
inherit git-r3
else
- PYTHON_COMPAT=( python2_7 )
MY_PV=${PV/_p/_r}
MY_PV=${MY_PV/_alpha/a}
MY_PV=${MY_PV/_beta/b}
MY_PV=${MY_PV/_rc/rc}
MY_P="${PN}-${MY_PV}"
SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
fi
@@ -44,17 +39,18 @@ SLOT="0"
# use flag is called libusb so that it doesn't fool people in thinking that
# it is _required_ for USB support. Otherwise they'll disable udev and
# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-RESTRICT="!test? ( test )"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( gles opengl )
^^ ( gbm raspberry-pi wayland X )
?? ( mariadb mysql )
+ bluray? ( udf )
udev? ( !libusb )
udisks? ( dbus )
upower? ( dbus )
"
+RESTRICT="!test? ( test )"
COMMON_DEPEND="${PYTHON_DEPS}
airplay? (
@@ -63,23 +59,26 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
+ bluray? ( >=media-libs/libbluray-1.1.2 )
caps? ( sys-libs/libcap )
dbus? ( sys-apps/dbus )
dev-db/sqlite
dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
+ >=dev-libs/flatbuffers-1.11.0
+ >=dev-libs/fribidi-1.0.5
cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
dev-libs/libpcre[cxx]
>=dev-libs/libinput-1.10.5
>=dev-libs/libxml2-2.9.4
>=dev-libs/lzo-2.04
+ >=dev-libs/spdlog-1.5.0:=
dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=dev-libs/libcdio-2.1.0
+ >=dev-libs/libfmt-6.1.2
dev-libs/libfstrcmp
gbm? ( media-libs/mesa[gbm] )
gles? (
@@ -89,29 +88,31 @@ COMMON_DEPEND="${PYTHON_DEPS}
libusb? ( virtual/libusb:1 )
virtual/ttf-fonts
media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
+ media-libs/dav1d
+ >=media-libs/fontconfig-2.13.1
+ >=media-libs/freetype-2.10.1
>=media-libs/libass-0.13.4
!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
>=media-libs/taglib-1.11.1
system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+ >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
libressl? ( media-video/ffmpeg[libressl,-openssl] )
!libressl? ( media-video/ffmpeg[-libressl,openssl] )
)
mysql? ( dev-db/mysql-connector-c:= )
mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
+ >=net-misc/curl-7.68.0[http2]
nfs? ( >=net-fs/libnfs-2.0.0:= )
opengl? ( media-libs/glu )
!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
libressl? ( dev-libs/libressl:0= )
raspberry-pi? (
- || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+ || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
)
pulseaudio? ( media-sound/pulseaudio )
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
>=sys-libs/zlib-1.2.11
+ udf? ( >=dev-libs/libudfread-1.0.0 )
udev? ( virtual/udev )
vaapi? (
x11-libs/libva:=
@@ -145,7 +146,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
"
RDEPEND="${COMMON_DEPEND}
lirc? ( app-misc/lirc )
- !media-tv/xbmc
udisks? ( sys-fs/udisks:2 )
upower? ( sys-power/upower )
"
@@ -158,9 +158,9 @@ DEPEND="${COMMON_DEPEND}
dev-util/cmake
dev-util/gperf
media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
+ >=media-libs/libjpeg-turbo-2.0.4:=
>=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
+ test? ( >=dev-cpp/gtest-1.10.0 )
virtual/pkgconfig
virtual/jre
x86? ( dev-lang/nasm )
@@ -179,14 +179,6 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
git-r3_src_unpack
else
default
@@ -203,7 +195,6 @@ src_prepare() {
# Prepare tools and libs witch are configured with autotools during compile time
AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
"${S}"/tools/depends/native/TexturePacker/src
"${S}"/tools/depends/native/JsonSchemaBuilder/src
)
@@ -218,7 +209,6 @@ src_prepare() {
# Prevent autoreconf rerun
sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
|| die
@@ -240,11 +230,12 @@ src_configure() {
-DENABLE_INTERNAL_CROSSGUID=OFF
-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-DENABLE_INTERNAL_FSTRCMP=OFF
+ -DENABLE_INTERNAL_GTEST=OFF
+ -DENABLE_INTERNAL_UDFREAD=OFF
-DENABLE_CAP=$(usex caps)
-DENABLE_LCMS2=$(usex lcms)
-DENABLE_LIRCCLIENT=$(usex lirc)
-DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
-DENABLE_MICROHTTPD=$(usex webserver)
-DENABLE_MYSQLCLIENT=$(usex mysql)
-DENABLE_NFS=$(usex nfs)
@@ -254,7 +245,9 @@ src_configure() {
-DENABLE_PLIST=$(usex airplay)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_SMBCLIENT=$(usex samba)
+ -DENABLE_TESTING=$(usex test)
-DENABLE_UDEV=$(usex udev)
+ -DENABLE_UDFREAD=$(usex udf)
-DENABLE_UPNP=$(usex upnp)
-DENABLE_VAAPI=$(usex vaapi)
-DENABLE_VDPAU=$(usex vdpau)
@@ -262,6 +255,8 @@ src_configure() {
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
)
use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
@@ -291,7 +286,10 @@ src_configure() {
fi
if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+ mycmakeargs+=(
+ -DCORE_PLATFORM_NAME="x11"
+ -DX11_RENDER_SYSTEM="$(usex opengl gl gles)"
+ )
fi
cmake_src_configure
@@ -302,7 +300,8 @@ src_compile() {
}
src_test() {
- cmake_build check
+ # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
+ KODI_HOME="${BUILD_DIR}" cmake_build check
}
src_install() {
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index a01b08308cc0..68f0cbca4eae 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
FFMPEG_VERSION="4.3"
CODENAME="Matrix"
FFMPEG_KODI_VERSION="Alpha1"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -255,6 +255,8 @@ src_configure() {
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
)
use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 21:21:19 +0000