| 1 |
commit: c6c99e1fbfef5947fa78453db47cdcd84e33526f |
| 2 |
Author: Craig Andrews <candrews <AT> integralblue <DOT> com> |
| 3 |
AuthorDate: Wed Nov 23 21:54:36 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 11:06:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c99e1f |
| 7 |
|
| 8 |
media-tv/kodi: bump to 17.0b5 |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/2903 |
| 11 |
|
| 12 |
media-tv/kodi/Manifest | 4 +-- |
| 13 |
...17.0_beta4-r1.ebuild => kodi-17.0_beta5.ebuild} | 31 +++++++++++++++++++--- |
| 14 |
2 files changed, 29 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest |
| 17 |
index 3ed64b3..4b8a0ad 100644 |
| 18 |
--- a/media-tv/kodi/Manifest |
| 19 |
+++ b/media-tv/kodi/Manifest |
| 20 |
@@ -6,8 +6,8 @@ DIST kodi-16.0-generated-addons.tar.xz 76876 SHA256 fb164bf2aaf54d0c4a6da60b768b |
| 21 |
DIST kodi-16.0.tar.gz 52093964 SHA256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 SHA512 b187f57601dfadc2119622f19558dbaca6ba7c708f5c24d65b876ee32888251940ffa8caadf978ee1afbd7c8da5007771e013d639819b998c345e968149995ac WHIRLPOOL ca19325b52c4c7de72a8d18cc9d68a83203274d3a432bcd83188904a9a2ba4e69372144c40ada3b3cd89ed12d740a1dceec75c5511b706b922374784bf817b3f |
| 22 |
DIST kodi-16.1-generated-addons-r1.tar.xz 54528 SHA256 ffa06845ed95597b46a178575e361f0641f78778be553d7a9f51b4cc190d2629 SHA512 32c9a5bb6ed5f5d8e73a37c35268c1a7176c6a4c52c5b5e8f6c5c76a3c51445ff0a5b8802be94ada5d63ecbea4d7e69b61d579c931900f6ba6abb583bbe542d9 WHIRLPOOL 3cd62abee6854efbee0070d811d0ef03f7b2d1d629c91d43fb2a2883c83733267affef60339459ce1ca7e30b1b856e20b929883cd12958348803c428d69e142e |
| 23 |
DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d |
| 24 |
-DIST kodi-17.0b4-generated-addons.tar.xz 57024 SHA256 57da0a403fea4aed9a921ccec40d5fb6e2c4de8857308f9f46ce1339c8e6bd23 SHA512 78a786f6414ed38c6d89ae29537964586f7b5df28f08b0de3df209baa13905d35045dfcc71b40bf36dfbf29825892ed2b96cfee7365e56e5a13aa88abceddaf3 WHIRLPOOL bc582bc195637dd38ea0663c29decc5f30ed7b13586578d667191bd0fce696d6d7a934026a4be3f077fedcaef7611939ef3e74a0d5e9161ae65f4dd51d3bab87 |
| 25 |
-DIST kodi-17.0b4.tar.gz 54924547 SHA256 ace9a50e1552bf38633d92d6ef6af9a4489c5ecfda6c36e76f1d36d77d383308 SHA512 dadf34ca53f967db5fdefa95e551fc0a0be6f48bee641a431ab3a39efc324d8096bafb223f98939e2008cc1fa8d384ea6a6d63d1f7af65f2601f313ed2f6d773 WHIRLPOOL 3a45f73dec832232125eeca2ae76c8f66f6e534e1f65a3cf15e046f03159cb791575db99ab38a6fe1230cdb97e4f479d616bf1f2a7863bff799cfa99b196534a |
| 26 |
+DIST kodi-17.0b5-generated-addons.tar.xz 57040 SHA256 c291f6c040acfab600a5fa8e8277181940a2cee15d9caf11f9a4f8e01cc55b8f SHA512 84131f6176bb71d93efb385e6f0b8c9e917cad4a7e9d39b81fe26ab7ce8d3320c24c8b452d5356b2b207bd5b9f0c75308ff515155a39043de73de5ff26e3e786 WHIRLPOOL 20b5da022205c4c7ba9312d987ce4b485d0f58f8eebbabf3aeaf127816d06ac460738fce0f6c3a574b6838a64768d1102db137750fcead711d34cfcd1f0ff174 |
| 27 |
+DIST kodi-17.0b5.tar.gz 54923580 SHA256 e27d31c24de77f5f6b79f32d60c4e34787a2f98dcd7a15339ab6cf290f10a15d SHA512 bc3a2d4fec90444177071b6abc2f58ad69e1df22ff66b40cea341ecd2cf4f378691956f67ad275dd890a32798e265a92add8b0cf6a7beeaeb74091adb618996d WHIRLPOOL 56bcbf58671a406fa401285b3c363a6d9e9e496a29da84e2628a5e75fa6347218e741c8383dd36e99c61c043225cd3c2e57779060293bfc8a11926abc771e933 |
| 28 |
DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a |
| 29 |
DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca |
| 30 |
DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a |
| 31 |
|
| 32 |
diff --git a/media-tv/kodi/kodi-17.0_beta4-r1.ebuild b/media-tv/kodi/kodi-17.0_beta5.ebuild |
| 33 |
similarity index 87% |
| 34 |
rename from media-tv/kodi/kodi-17.0_beta4-r1.ebuild |
| 35 |
rename to media-tv/kodi/kodi-17.0_beta5.ebuild |
| 36 |
index 58bc542..3661b6e 100644 |
| 37 |
--- a/media-tv/kodi/kodi-17.0_beta4-r1.ebuild |
| 38 |
+++ b/media-tv/kodi/kodi-17.0_beta5.ebuild |
| 39 |
@@ -139,7 +139,7 @@ DEPEND="${COMMON_DEPEND} |
| 40 |
virtual/pkgconfig" |
| 41 |
# Force java for latest git version to avoid having to hand maintain the |
| 42 |
# generated addons package. #488118 |
| 43 |
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" |
| 44 |
+[[ ${PV} == 9999 ]] && DEPEND+=" virtual/jre" |
| 45 |
|
| 46 |
PATCHES=( |
| 47 |
"${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887 |
| 48 |
@@ -158,7 +158,7 @@ pkg_setup() { |
| 49 |
} |
| 50 |
|
| 51 |
src_unpack() { |
| 52 |
- [[ ${PV} == "9999" ]] && git-r3_src_unpack || default |
| 53 |
+ [[ ${PV} == 9999 ]] && git-r3_src_unpack || default |
| 54 |
cp "${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdcss/libdvdcss-master.tar.gz" || die |
| 55 |
cp "${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdread/libdvdread-master.tar.gz" || die |
| 56 |
cp "${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdnav/libdvdnav-master.tar.gz" || die |
| 57 |
@@ -183,7 +183,30 @@ src_prepare() { |
| 58 |
multijob_finish |
| 59 |
elibtoolize |
| 60 |
|
| 61 |
- if [[ ${PV} == "9999" ]] || use java ; then #558798 |
| 62 |
+ # Cross-compiler support |
| 63 |
+ # We need JsonSchemaBuilder and TexturePacker binaries for the host system |
| 64 |
+ # Later we need libsquish for the target system |
| 65 |
+ if tc-is-cross-compiler ; then |
| 66 |
+ mkdir "${WORKDIR}"/${CBUILD} || die |
| 67 |
+ pushd "${WORKDIR}"/${CBUILD} >/dev/null || die |
| 68 |
+ einfo "Building host tools" |
| 69 |
+ cp -a "${S}"/{tools,xbmc} ./ || die |
| 70 |
+ local tool tools=( JsonSchemaBuilder ) |
| 71 |
+ use texturepacker && tools+=( TexturePacker ) |
| 72 |
+ for tool in "${tools[@]}" ; do |
| 73 |
+ tc-env_build emake -C tools/depends/native/$tool |
| 74 |
+ mkdir "${S}"/tools/depends/native/$tool/bin || die |
| 75 |
+ ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool \ |
| 76 |
+ "${S}"/tools/depends/native/$tool/bin/$tool || die |
| 77 |
+ done |
| 78 |
+ popd >/dev/null || die |
| 79 |
+ |
| 80 |
+ emake -f codegenerator.mk |
| 81 |
+ |
| 82 |
+ # Binary kodi.bin links against libsquish, |
| 83 |
+ # so we need libsquish compiled for the target system |
| 84 |
+ emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX) |
| 85 |
+ elif [[ ${PV} == 9999 ]] || use java ; then #558798 |
| 86 |
tc-env_build emake -f codegenerator.mk |
| 87 |
fi |
| 88 |
|
| 89 |
@@ -212,7 +235,7 @@ src_configure() { |
| 90 |
# No configure flage for this #403561 |
| 91 |
export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) |
| 92 |
# Requiring java is asine #434662 |
| 93 |
- [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) |
| 94 |
+ [[ ${PV} != 9999 ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) |
| 95 |
|
| 96 |
econf \ |
| 97 |
--disable-ccache \ |
Archives