diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2015-03-15 17:00:42 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2015-03-15 17:00:42 +0000 |
| commit | 1a18784e7bc534b825ed9614690e1f8c0a0fd760 (patch) | |
| tree | 222bfac6c2a9f7a2e9c738a877e9cdfd8aa19362 /media-tv | |
| parent | Patch broken tests in 3.3.x and 3.4.0 versions. Fix bug 439156. (diff) | |
| download | historical-1a18784e7bc534b825ed9614690e1f8c0a0fd760.tar.gz historical-1a18784e7bc534b825ed9614690e1f8c0a0fd760.tar.bz2 historical-1a18784e7bc534b825ed9614690e1f8c0a0fd760.zip | |
kodi-9999-gentoo.patch accepted upstream
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/kodi/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/kodi/Manifest | 11 | ||||
| -rw-r--r-- | media-tv/kodi/files/kodi-9999-gentoo.patch | 29 | ||||
| -rw-r--r-- | media-tv/kodi/kodi-9999.ebuild | 3 |
4 files changed, 11 insertions, 38 deletions
diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog index eb6f79b154fe..5c0811b8287c 100644 --- a/media-tv/kodi/ChangeLog +++ b/media-tv/kodi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/kodi # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.7 2015/03/13 20:52:24 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.8 2015/03/15 17:00:31 tupone Exp $ + + 15 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-9999.ebuild, + -files/kodi-9999-gentoo.patch: + kodi-9999-gentoo.patch accepted upstream 12 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-9999.ebuild, files/kodi-9999-gentoo.patch: diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 36212861ca30..bf01a5ccf034 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -3,19 +3,18 @@ Hash: SHA256 AUX generate.sh 803 SHA256 8e32ccbd56e2d36d9d0504282881b3ee1d33ee7293827b75444b917093955d09 SHA512 064b11416be5583202d92ab0c87156b7098bf4a97c7875ad3a0b11e048ebcfd69aeb22653e8175e7ad0cd400ed2d9c27aa8d1d25be04d34438f4c4f86e329986 WHIRLPOOL 3565b3f6ef9650bfbb3b9e4b6ee5b71d1d245e62520f00f88f1c0b2ade6bf923200a1e94efdbbea8d5e53449f38ac78bc4714280e276e085c91ada404ebfeb89 AUX kodi-14.0-dvddemux-ffmpeg.patch 466 SHA256 dbfa9edf3592a4b06292a0813fc920e66d53808ff5bb3aa9192a750d11015ec5 SHA512 cbc71ae5f85374b15f19139a549fc10e5ebb363af0e6354d708043748b2d6e89903223bf4146472cf6281f4fb912b1c72407de4e81993a89811d4b1fab226f87 WHIRLPOOL 5c9167c97f057b57f6e2d2a57a1ce798a7c9f8e043db987e73261a45ec1f9e7e694385db1c5b7738e479d9be2ddeb1f26990d4df518710aeb5ee18ad02b838fd -AUX kodi-9999-gentoo.patch 1160 SHA256 811713a6381d7d9cfd18846bd3558f3e8c478a056d3389853fb6136ed6e35a55 SHA512 62017571f9d3fc1d89dd6835fc4be5a235d947311070ffdf3780750d8f854cce11ffc5e212fb6174480d781931fbaef203e6bee5cb19311bc64851a5afef1212 WHIRLPOOL 691c26bb57090a6196888c74260c1b38c217a329446ecd8768a7d304da3605c37585ea49b42ed0f90eabc477789c7ac4f7f5b0df5d6e9525fc9a0eb7bf97fb9e AUX kodi-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63 AUX kodi-9999-nomythtv.patch 1689 SHA256 b54e52be122890affca5eb726873817bfbaa1b5da0d58231bd0c098681ce6b35 SHA512 ebd3deef88fdef0b54bb5936f9a479523297c1224595ea021af0674b9cb422f3a3bdc03c3cdf9e96f475b23e68983a62241d91cb74fd4f69b2635e6f7d4a80e4 WHIRLPOOL 0d2ad77fee3a4cce535cb25c07c481d9133c867f6de1fba5cd1dcc6f79d480f496673c223e464d90cab9602651e226792679eaa499959d7cae01b94f64a2f345 DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506 EBUILD kodi-14.1.ebuild 7710 SHA256 0d01cde4dffa3a0c2433eb39f15333cac9b7dd4fd70852454cc3c6ca155e20cc SHA512 c9340ab0bc37fcd027d85cf63b77d5ca6196f1ae9954d860be17d8a5a0f7bdc5a02e961c5a66cbc20e930246a8c295537f2d6eb421c1d790d21dab6a3a0bd58a WHIRLPOOL 41555707f2b10a2ff2a414f1f8a1861da446bd16f0652091f7ade97241c4af03ed6d65e20eee4a4b39104f42a6b702679530f6828adf8d31f7f7fd01d22557c7 -EBUILD kodi-9999.ebuild 7896 SHA256 6e2b05a35d76a3d3b1fa5b5f2811e969cd51f61a84fd909377f26fc4f5212bf1 SHA512 9e67501e1adcc655eb9cd8fafcb33beded476fb2a097683894df496fd90d4c1ef239b238d1245a6114107ae58e9b3a829d76b0fd6bbbd3ad983dee17c9666395 WHIRLPOOL 8a67970407f22b152ce2455fec323572da5060c4d69efbb362bc6d0982485ac398a3c5bc4da14234dd98d58cb76a9df6ccb9c3256230da06d71e5729b9bce14b -MISC ChangeLog 1550 SHA256 74b4b2cd082e53965b6c956eb052eeebf5af7605f07d10ae09b802b20baca93b SHA512 5162c4c88647f8b2dedaedafb1075e87e83196440e1c84706ff5be731e224c46cf76b28d7a8eea67d383be64d3e53507fc7ad608c7656316a00a0d7f5ab13b1f WHIRLPOOL 9533412723336252a0492e05ab6bf9eb8720eae8f41529522f439d8f0fcca0cfd21ecebfc875c9c3040f984dc2cb2c8842b70130494e17f853633f06df6563b8 +EBUILD kodi-9999.ebuild 7856 SHA256 6e7e5c7a82f4440a41d0a85def95ba3a48c198e15fc7f5d4256ad910e10d07be SHA512 6c108be6691c6ef883ced6b3ab93d12fd564242f36ea06679d4bffc71c1db05fd95c7e32b6ed895c6016df48789410ce60b7ed09ceae60e86506beede729d1a3 WHIRLPOOL 9c207291162fa394f6c915b188f2d0eada4cd95de122b1df797bbc9751d9979d307ccd68599a579ed4308e276af4aebd3b93b8adb8da03463ee9a2381ecf8804 +MISC ChangeLog 1695 SHA256 5b636fa9bdba5608ab601afb17b69327774b38aab46c2b93e3f84b4687816fbd SHA512 7d0bc7dca5c5470cf58cef40574ac53106c9144baac759d6f55cd3d29ecfd234032374a6ea7fe0020b01c89279065d3098af60c1444912d7470dda4ba9460c39 WHIRLPOOL 6b09dc01dbd165474f249a9671980b508fe6e2fa951fc7f51baa1ff85560a1d3afd9222754e621b2e11f832a81edc2e9293490b7f935fa5b3d2008ddcfeb4a26 MISC metadata.xml 1234 SHA256 5fb643446f2efcf3a164c14c438bd9a6d58f060da69aac7669e1d9ce6e7541a8 SHA512 4cf23d3684a6c7c2affb0dc7218bdc6d8b7ae1d7e029f25898f8932ce21be53df6bacb19259b28e5126b02f0cc4af4145a0c37a11a79c4238e6238bfc752f098 WHIRLPOOL 7a819921c3cf9fb9ad342de1c13652870b3e179adf8e7d639046f422a4e898348a7c9e09d15f959ffb877332bc35683896ace0d72cac91cb9515d2bcace9d3ca -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUDTg4ACgkQIY77eQFFFC1TpQCgqcTIDv1YfSeP0xHjC6KjUr0X -fhUAnj2e5RSFAl1NDTORkRAELuBrwAlF -=MHw+ +iEYEAREIAAYFAlUFurQACgkQIY77eQFFFC0nIgCgow5/J88wU8VI8YjnnDB31jZA +zssAnjQMYhPgfqEjMlfs0kq/JXeETA/e +=SuFr -----END PGP SIGNATURE----- diff --git a/media-tv/kodi/files/kodi-9999-gentoo.patch b/media-tv/kodi/files/kodi-9999-gentoo.patch deleted file mode 100644 index 4aa46420e5ed..000000000000 --- a/media-tv/kodi/files/kodi-9999-gentoo.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.ac.old 2015-03-03 14:26:28.690271749 +0100 -+++ configure.ac 2015-03-03 14:27:32.283087389 +0100 -@@ -2230,7 +2230,7 @@ - # we don't compile with default upstream squish, so we use our own one - # even on non unified deps platforms - if test "$cross_compiling" != "yes"; then -- make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native -+ make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX} - export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH" - fi - PKG_CHECK_MODULES([SQUISH], [squish], ---- codegenerator.mk.old 2015-03-10 08:49:45.480631067 +0100 -+++ codegenerator.mk 2015-03-10 08:51:32.048879905 +0100 -@@ -74,7 +74,7 @@ - - $(GENERATED_JSON): $(JSON_BUILDER) - @echo Jsonbuilder: $(JSON_BUILDER) -- make -C $(INTERFACES_DIR)/json-rpc $(notdir $@) -+ $(MAKE) -C $(INTERFACES_DIR)/json-rpc $(notdir $@) - - $(JSON_BUILDER): - ifeq ($(BOOTSTRAP_FROM_DEPENDS), yes) -@@ -82,5 +82,5 @@ - @false - else - #build json builder - ".." because makefile is in the parent dir of "bin" -- make -C $(abspath $(dir $@)..) -+ $(MAKE) -C $(abspath $(dir $@)..) - endif diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index b9af03854714..83712deee165 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.7 2015/03/13 20:52:24 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.8 2015/03/15 17:00:31 tupone Exp $ EAPI="5" @@ -147,7 +147,6 @@ src_prepare() { mv configure.{in,ac} sed -i -e "s:configure.in:configure.ac:" \ bootstrap.mk || die "sed failed" - epatch "${FILESDIR}"/${P}-gentoo.patch # some dirs ship generated autotools, some dont multijob_init |