Apply some fixes to build Kodi, including #536402

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 46fbd30fb8f00bc66526082fa31f75430d6f89ab..a0c3f214a8e40a37d292c4651ce019df5b8c4c2c 100644 (file)
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xbmc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.215 2014/12/12 09:37:32 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.216 2015/01/18 18:14:36 grobian Exp $
+
+  18 Jan 2015; Fabian Groffen <grobian@gentoo.org> xbmc-9999.ebuild:
+  Apply some fixes to build Kodi, including #536402
 
   12 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   USE='vaapi' is now global, removing it's description from metadata

diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index d68c4105a9388c4ee69bc89b971f7d98fdb300ba..ea769fe5014f1bd1bbcc4bab5828c3e9619c437e 100644 (file)
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -33,17 +33,13 @@ EBUILD xbmc-12.3.ebuild 7248 SHA256 88df89a55b0b8356d527083bc8c09c9d4c5004e2e1b4
 EBUILD xbmc-13.0_p2.ebuild 9214 SHA256 7d3295624269e073b59c05628cb6c71f728364aa9d0715b6726458bbe0215925 SHA512 ed3998769a27774393b3a39a743bc53b655b8684001253acfa3977de7c869e1ebd3d8bcca76b9e1f1ca1f3097a105d2333394ac7f3e2fae09e3a045775ea6b0a WHIRLPOOL a31bd6b1acca03d15eb6d0cfd38595209e0aaec26a74a507e3e5495f4efa6049e0ab81a728925ba63ed08a5fdeed489e53781fd82d3c93b63193e219b6993711
 EBUILD xbmc-13.1.ebuild 9150 SHA256 a70b37e6b2053daf3eb1241a09043c675aeb66a80d8f07c947dd53219fb7c7e6 SHA512 a3fef5b26e087c71f286d541701da62bcf72a16ce356af2419f6b2c2917d7eb6342af7292fb151203861e7431a076d3170f9e9fbd929e05959afeebd466a9e56 WHIRLPOOL 16d12138b4c4001f71c3d4cc571c83986a468522f88976b0da7651080c0307472cf65f61978a7377439eb1aeebc5122e541457d492a73e7e5ad90e484ba75a74
 EBUILD xbmc-13.2.ebuild 9150 SHA256 a43671babee7466b4642a4394b2b8fbb1ad731684f9f9e19262ec0962d881cc5 SHA512 718c5c69d0a18fe85bdf176c4857075e4e46e752f64c0cb82a544607dad545c0540d4545b66593f3acbda032a31d4f2919486fa87304c937e60343aec2e445f0 WHIRLPOOL eb9312e929c41cc22599303163b87520b407918f36ad71d4628d86a3de70af082dc803fb8b50f06d43a201d055dfb0e32e36a92ae59b18b51ddef9ecdd766288
-EBUILD xbmc-9999.ebuild 9271 SHA256 442af1d7f74df8de5856cb4893489f7c0ff0456318694f39aeb66ec20cfdcbea SHA512 706affca6861ed06862ceaf647f0deeb484a9f1cef0cf6003874495a1f8cf77517e557299f49184b0231f600836702555dbbcbd17ff36b3f8bbdbd44d66fddcd WHIRLPOOL 25bb56c23d75c1c054098e45c2955e92f866e53a61db875ff72ddd6c3961d3dcb98f763a04bc7dba48223f3a10a0f8c94718e7d4522b585a6cb64c7ee9ba3108
-MISC ChangeLog 35907 SHA256 88db3c42c8baa0a565c5d19652ee0d4c7432d7316f61692a378ab1330adec10c SHA512 7411d539895318982c59db7850336ce53d8b1a23e2e7813719e5c41c2aadaba36deeb8065f53bc49e4995d70a4c2c89e568761b83bcfb101970aef4ff60d79ba WHIRLPOOL ac6591ddfd21a7c49946950d97b0a1a01fef6c6f259957fac3dbaeb10a2233d7afa1c9c4e81854d3eebdbd5d4350b0ea1b4b7a885d4fa78d03dd45e9357af759
+EBUILD xbmc-9999.ebuild 8982 SHA256 883dc545516aff025151c60b140546d6193853d03705b90221ba0265ca1c8561 SHA512 0aab401cf860ed5df9440a4dc02b7f95c064c57fdfd05070ebef48d6b9066acdc1c3f15039da35e7602717a7d243f8542fd826635b59b69d61e52fa67138340f WHIRLPOOL 84637d7eca4b005173bbfbf1f6ba9a56e2bdec6aeefe5e2acecf2e36eb82c9ae49d4a8413418ff14eb3585c61302bc8d858901563e836aa83ab4ef6a3e279544
+MISC ChangeLog 36028 SHA256 4c1371d9eec64b94de235f323390b2397e67e2d1c8afa046ac3c79b3fabffac1 SHA512 781d71f9ad5fbc18b2c05b012185196fbbe124ed57fd8740277170ac38c6b23781b7efc5b8813aad4721302435c29a5f9dd9f8f086d16923b0fede01663687a2 WHIRLPOOL 40cbbed666e704df436b83f5a4fc655cc66ece9c8c0397be046e63e3e6589697957e949abceb3381c0fe5c84efd020becc2b206ec0ed886312f74df31fb8115d
 MISC metadata.xml 1052 SHA256 b6b77bd21e644bef0a0cbb12c317862a73c7f42b93ddbc755ae33b389c4bfcb4 SHA512 9a49efe9d354d756955e08c219b847b3b7398305c82414c14f6e0d4e340c8b7548b2fd4af8ed90a767c3c1f53eb11be3b534a2b71bcc1dd98ac295e7ae3fe541 WHIRLPOOL 37ea2ca0a20055c0be670a5f438f5155866905516fff018b6584967f1c925ca8669386bbcbdffe6733c7075a1d21d704c6e08f20ccc0d34c25e4de62fd6b3f9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUirddAAoJECo/aRed92679zMH/3HwovxfqyxAOA+3WeGCaQw/
-78cYLIl/OLpmDYCZhGdQT5IWLIzxBEmhEWMgOqgGEWuQNeUXT4pVut8BFHRFFyx1
-7atHsFJc0R6CS8W57/cXHvygKCjAcAnElF3AIccl/IrtTlYt45Hx2jh+7TLM9Asr
-Brb537oyK2sHpgwbvW1e/1eTYpf3NvcJy+zbDuTW7BO0RVIpOucSNK91QBMxIle5
-fui+1/XS+HTlKC+LURB8HFKDv+Y87el94K3rtLHpIbOkgVOXpb4Yo1U1aXQ0UEuL
-6A1PbSXJohghGgPqx8eOKxFd0wpovUHjVBoohgr0DzC8efxc0s1AfgCD1esZBj0=
-=MNmJ
+iEYEAREIAAYFAlS7+BMACgkQX3X2B8XHTolAaQCfdFGQYiPxY6ZINVNvHKOwLTyA
++ToAmwdpLhSN82IEKODEhpAShUSRliUL
+=3Zdd
 -----END PGP SIGNATURE-----

diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 9d184037864a3bc47a2905e687caa2f4e50d3034..73669aa5cc4651f7750e87b88e1b363cd22b6c7e 100644 (file)
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.164 2014/08/12 04:47:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.165 2015/01/18 18:14:36 grobian Exp $
 
 EAPI="5"
 
@@ -142,6 +142,7 @@ DEPEND="${COMMON_DEPEND}
        app-arch/xz-utils
        dev-lang/swig
        dev-util/gperf
+       sys-apps/lsb-release
        X? ( x11-proto/xineramaproto )
        dev-util/cmake
        x86? ( dev-lang/nasm )
@@ -191,15 +192,6 @@ src_prepare() {
        # stuff handles this just fine already #408395
        export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
 
-       local squish #290564
-       use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-       use sse && squish="-DSQUISH_USE_SSE=1 -msse"
-       use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-       sed -i \
-               -e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-               -e "1iCXXFLAGS += ${squish}" \
-               lib/libsquish/Makefile.in || die
-
        # Fix XBMC's final version string showing as "exported"
        # instead of the SVN revision number.
        export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
@@ -302,9 +294,9 @@ src_install() {
                /usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
 
        python_domodule tools/EventClients/lib/python/xbmcclient.py
-       python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
+       python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
 }
 
 pkg_postinst() {
-       elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
+       elog "Visit http://kodi.wiki/?title=XBMC_Online_Manual"
 }