From: Mike Frysinger Date: Sun, 15 Feb 2015 19:30:32 +0000 (+0000) Subject: Switch to libsdl2 to match upstream #536602 by hal. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5eb30bdab511c09d8a5264a516e4524f65d631e;p=gentoo.git Switch to libsdl2 to match upstream #536602 by hal. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index 1b500365fc98..c9822b560aef 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.222 2015/02/15 18:24:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.223 2015/02/15 19:30:30 vapier Exp $ + + 15 Feb 2015; Mike Frysinger xbmc-9999.ebuild: + Switch to libsdl2 to match upstream #536602 by hal. 15 Feb 2015; Mike Frysinger xbmc-9999.ebuild: Drop lsb-release dep as the code already handles /etc/os-release. diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest index 4c6dc652a223..bde1cd1ddd68 100644 --- a/media-tv/xbmc/Manifest +++ b/media-tv/xbmc/Manifest @@ -34,23 +34,23 @@ EBUILD xbmc-13.0_p2.ebuild 9270 SHA256 9ecb70c2024f19560ae1ce253400cac01e1ccd850 EBUILD xbmc-13.1.ebuild 9206 SHA256 39b3038b506ea6c7b28924460e3632a7819782ee3d4a35b5fc21383135cbfe73 SHA512 9827ad167e6d5bee7682db983638186c88c978e0b09284eb9dce3c8543a43b9ae7f209662c44d3f8bbc7a097dbfd46748433873c622ca7354fbac0eb52b0277c WHIRLPOOL f6214b9e8b5d1ca7bf23d2fe5f4707fb81ec3e1cc611d5264df689ac1edbeec20170cc3a3d8ec7dbd69d80031d46833b02078b5da177e19a3095af954adb15a5 EBUILD xbmc-13.2-r1.ebuild 9205 SHA256 df7156a2a0c748039688f4a5096aa5dc9568ebc4060a4139bc2e4f640abf5b62 SHA512 bd879b71a0c33e8a461300d2863b03e227e1499ef1326a6cd197395d5cd3d1d0f7a9bafb8d0f8d103801f283dbd196865f8b993be36ca46ce5a138d645c0f0ea WHIRLPOOL 6c6766ee78f389dd31fa2ffff776cf0a27236f805be2fb4ed7c4ee8efd92143b1399fd05d083ba1e6ad3da521b065cf16e116fff29d1847a98f0d14a46401022 EBUILD xbmc-13.2.ebuild 9206 SHA256 408dc67d983a22f9252e5d2cdd10cf60d022775074f14b9e269f0ac4a93b3ac6 SHA512 76d1491e51c9571361ecd5bc7e31b5a8d17b872ca33360a65e0a5d017c971a5429ecb3439c2889185c08443ed3b08158950093fd10ee034635b693975b7bb01f WHIRLPOOL 6df1aec03b4d339075ca7cf7078f3bab2af2b8ede8dea862e8831e523158015987228798bc166e730681c019f7a837e099e2f9688e54ce8ef5748ec4acca2d78 -EBUILD xbmc-9999.ebuild 8888 SHA256 bcb47ee9a17ad6a20a89faa7104f2f8ee1c75418c702e9bc45e63a3930f18dde SHA512 2f8ad339e6957dc4518a5580afee2155d588dc788cfc294134d36a83e186a0ceb57131dddac10bd932fb98c62db87f4514673270fa27d6adf6432a913ca571e1 WHIRLPOOL 0b69d65850770a1482416e5d73485cb0281484457450659aa5b576111c9e3dfed822034e8f346ee3f21e098fce57db4889507df231e821a56673bbe3972e0dc7 -MISC ChangeLog 37020 SHA256 d82d9bd3306ab754b69262d690e39613f156b5eab06c1c1ec989644397cd4289 SHA512 56773016c4a7d1686da91890fae5c240372160bf34564e7f9c383d47c3d9eccc87713c12493aa8c4d1aa9adf7c088da9d83753ee07850c36460b5db940bec6e0 WHIRLPOOL 3aa46eaeb1f7bace216fdd6fa664cc8581039f4629aa746e3c89b60d5889f36d2f0d1d9fa8e7e7cef146f39c5e8ee8b442bdb2378ad8a7eed1eca6c52580a2f5 +EBUILD xbmc-9999.ebuild 8669 SHA256 220992832740717583986e717ec8b81b169bc6cbfb98d78aacee99d987a8a646 SHA512 b791e2c41c549fd4fa8f8a539dce8a1499c547dbe083b634b17c8e3a9a4062ee668908c8ce38431eadc0106af6069cb48c0d5e44375c5817c99d4d78f21d1eeb WHIRLPOOL 0f02b6b151efa170357ef41dfe505a30b047a52daf5f3799df3ab57b3a204ced44c2b8d0b24ea9b0349012904e78ea1bb6dce21a339ebaa0ddcf8b7fa3bdaea8 +MISC ChangeLog 37143 SHA256 566b6cd44b1ec8d23b58d9037f6631f12e72f6cd17b29e06f351c95b75f1936a SHA512 67f299a5aca857a012b897d5d887604eb6c8d08c9c1c8b93377d1f16059c841a8a17aace60d4fa871576882cc33602055f797b5fd52f3329ddbd71e203194cb3 WHIRLPOOL b088c0e84ded9beb4fdddf315569fdf5e1598612d59fd840c207709d008964523d63e4794cdde007986e0b6a87dc8d1bc5bd211b8e920c683213c25bce0c5bd2 MISC metadata.xml 1164 SHA256 f8e32d8b3a4347b197b5d1c6e983d6928b6516c437ab8fccb9d910c6f58c107f SHA512 49f19f115cf306447afa87c18724d717dc7b924b65b0fb4f5d55212b4d30650e28217bba4d848a786ecefd18622c89244b2f70e89c246372e4ce723f9932c76f WHIRLPOOL 6a905fce5cc388227f8f2ee471a198cabdd8dc203d52d21073c2a1999bbe12cb1620d693aba4468f88982a2eb3b876c912ceb710b615aeecaa92dc9bccfc7af6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU4OTXAAoJEPGu1DbS6WIARxEP/3giNNEWjaJNA70xZk0EwUh/ -f4stfe/7FVUU7SmP5qC6MxPK6MvqUhbieuRGy3WLc6NRwbKHFWdYDYUnXksMSkUE -z2cmC3MZac/7OF3eebXgQ3idkiLEd3aE1GsqsbPUVR2ih0hF/s60Oy42YWGg568F -vzLJUIdBZeVebHDpXgC9tPulZ4gWdl9TNNpfu63sgV+hzlulQfiAPT4/uLwy20VR -eGsT/L62nMcpDyRK7dm3iJIfW2wuYKykipv6djVwa2bno8AoC/0HxtHgr0QAV+Mq -PF8SJHRCFempXW5vz0Wlc/zQDnRg5idK3dSH7W9YK4ik0A5fNNSKcGTQWSswiTRy -cF2ubQ5l3sZz4qT+Dqn0iRfz/MWZ/rT2teYtQSpQxfD3r3ZDkxRB5RJxKGUVBK9z -pZvpGsWMbawaQWbQqlH3G8bvM5YxAa9R7Ze+9JpPKDAHwFxNfA1J4GkB4clNybpB -hZVqY5+C0QJ8HDZ4dLyyR16R36BmDKdz28dYaIkoXcF1HJZVh5AF/CJPCtcB43O7 -X8j5G6plx9v6bb4WcGccwOFdZRwLtGNwnJ4TIDnTOTJGy8HpYke6fg31DKulQPHz -jEIEO/vd7u9DV5PpPyL+bud80muY7Tw2fbVvHReWQpU1mREU5877a+sDZu4lltsu -sOXhVqm0J6ACorRes7nW -=nqsA +iQIcBAEBCAAGBQJU4PRsAAoJEPGu1DbS6WIAUQ0QAIICBM48oSxl4n/IpGaPA05d +xVdXk59TcMulpQMYaZyHF9qioiYNFkS0aRsK8qLKjkkhOXB3ig4pfQBjMVqlWJUJ +QOcRE1oxUk+tvHFmctdH0PWdrXT2McReG7HZeVXUoSJft486Orz1UoNgwX52iCez +0vDk1HYEcQm8qG48gVJ6vlPHK/cnClZIQiDDy5a+ycGMgr3lqi8Bb6wvj3n0O6bz +Wgja1k2FACPR+h5fuhh4RfRkOFZoMxXsNOPsuude/19LWKWRB197j795H0cTFtiu +ZF5Xb8HCRt4K3TipCEs/Ckkw09I3wuctYIpwQ98/xxLMCDFt+8gSdvg9JdDBd//q +oJPz4kmmGMUU8UTN1Gum7vFSW4LiVzN49xwbhQnoD7L5OqqD4KnnrahCBLmg7WtJ +KD0oiVk1Y+Pr/S9OZhJOehbjU/wzmjF/MFtFzMv/kzE437Q453FXrS9zQmzs5nfV +t9kurOz7ezOc4njQ/kAw3FATJZCxUZOSLPU734ynDCpO933OptGVysbl0tUQQN4i +7yEyTnKj/GwI+rJE6gqWf8nXy7QAJ2LsXvP+rmbskhZhbR2iWVdmt5CYT6x6QeGr +xFJedBVaMBCzZ1QAYfVuaQg5lqhJg6OOGMgGe9OYkW8zjP7Y4GlAoXMehHBVDOq6 +pSL3xtVq8rdRPM6Q8uAr +=gyIP -----END PGP SIGNATURE----- diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index d859aa9eca63..194b031ca588 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-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/xbmc/xbmc-9999.ebuild,v 1.170 2015/02/15 18:24:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.171 2015/02/15 19:30:30 vapier Exp $ EAPI="5" @@ -45,11 +45,10 @@ HOMEPAGE="http://xbmc.org/" LICENSE="GPL-2" SLOT="0" -IUSE="airplay alsa avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr" +IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr" REQUIRED_USE=" pvr? ( mysql ) rsxs? ( X ) - X? ( sdl ) xrandr? ( X ) " @@ -87,16 +86,9 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/libpng projectm? ( media-libs/libprojectm ) media-libs/libsamplerate - sdl? ( media-libs/libsdl[sound,opengl,video,X] ) - alsa? ( media-libs/libsdl[alsa] ) + joystick? ( media-libs/libsdl2 ) >=media-libs/taglib-1.8 media-libs/libvorbis - sdl? ( - media-libs/sdl-gfx - >=media-libs/sdl-image-1.2.10[gif,jpeg,png] - media-libs/sdl-mixer - media-libs/sdl-sound - ) media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack @@ -246,7 +238,6 @@ src_configure() { $(use_enable rsxs) \ $(use_enable rtmp) \ $(use_enable samba) \ - $(use_enable sdl) \ $(use_enable sftp ssh) \ $(use_enable usb libusb) \ $(use_enable test gtest) \