Upstream accepted changes

Build texturepacker nostatic

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

7 files changed, 59 insertions, 20 deletions

diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog
index 5c0811b8287c..c408b79ec9aa 100644
--- a/media-tv/kodi/ChangeLog
+++ b/media-tv/kodi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2015/03/15 17:00:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.9 2015/03/19 12:48:23 tupone Exp $
+
+  19 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-14.1.ebuild,
+  kodi-9999.ebuild, +files/kodi-14.1-no-arm-flags.patch,
+  files/kodi-9999-no-arm-flags.patch, +files/kodi-9999-texturepacker.patch:
+  Upstream accepted changes
+  Build texturepacker nostatic
 
   15 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 bf01a5ccf034..b23de8954976 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -3,18 +3,20 @@ 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-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
+AUX kodi-14.1-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
+AUX kodi-9999-no-arm-flags.patch 478 SHA256 5eb086595c1d645f1f10e6cb53179d7f9732b67d3cd58f2fc5558de50eee4d68 SHA512 672ad8512939d7362bbb0933998dfc0f316bce8407c305e36aad3509336bce3b28388799e83a9de9db446a1345000343e3d051099a60240e2f8c701c118f7eee WHIRLPOOL 8868b9e74175f539fe12260c987d2531c27c5d33d0532eab526ea7f9ebd797d953c1f75686a92f43ccf582323dab3c374cbe0aaee1fdb818251a116ee774af8b
 AUX kodi-9999-nomythtv.patch 1689 SHA256 b54e52be122890affca5eb726873817bfbaa1b5da0d58231bd0c098681ce6b35 SHA512 ebd3deef88fdef0b54bb5936f9a479523297c1224595ea021af0674b9cb422f3a3bdc03c3cdf9e96f475b23e68983a62241d91cb74fd4f69b2635e6f7d4a80e4 WHIRLPOOL 0d2ad77fee3a4cce535cb25c07c481d9133c867f6de1fba5cd1dcc6f79d480f496673c223e464d90cab9602651e226792679eaa499959d7cae01b94f64a2f345
+AUX kodi-9999-texturepacker.patch 470 SHA256 0d60b8da26ce018641701bea14c91f2f5a3436f9da7d3869adc7dd085ddaf696 SHA512 e6ffb87d66aad2f355f88f8cf78839f133f5d52ae56f17fac1baa9cab0315933aecd26ac78e672986b8614cda9d0a6313e1fa5389df63c82bd9b132265a18321 WHIRLPOOL 53cef8d806aae417fe589403ef2ea49bd758d5e1a3982cf68a44d503e45cf47fae0b84c1173e5d44e4e6c5ccd1963614dc8dec84b432da5252c5b6b6afa655c5
 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 7856 SHA256 6e7e5c7a82f4440a41d0a85def95ba3a48c198e15fc7f5d4256ad910e10d07be SHA512 6c108be6691c6ef883ced6b3ab93d12fd564242f36ea06679d4bffc71c1db05fd95c7e32b6ed895c6016df48789410ce60b7ed09ceae60e86506beede729d1a3 WHIRLPOOL 9c207291162fa394f6c915b188f2d0eada4cd95de122b1df797bbc9751d9979d307ccd68599a579ed4308e276af4aebd3b93b8adb8da03463ee9a2381ecf8804
-MISC ChangeLog 1695 SHA256 5b636fa9bdba5608ab601afb17b69327774b38aab46c2b93e3f84b4687816fbd SHA512 7d0bc7dca5c5470cf58cef40574ac53106c9144baac759d6f55cd3d29ecfd234032374a6ea7fe0020b01c89279065d3098af60c1444912d7470dda4ba9460c39 WHIRLPOOL 6b09dc01dbd165474f249a9671980b508fe6e2fa951fc7f51baa1ff85560a1d3afd9222754e621b2e11f832a81edc2e9293490b7f935fa5b3d2008ddcfeb4a26
+EBUILD kodi-14.1.ebuild 7704 SHA256 411e0c0fa36a2741f62681507ac7fd1cdf33ca28a1b62a8cae559ccbac977a7d SHA512 b1d576fbccad3b7c8bbf7285d0a455afba2db5da08ef6ea0a87106372b7f065a8dd8ad1f501de34252a2104c15567f070343e93a67d8efd847e14c33fd2728ce WHIRLPOOL 0af3c3d095c618baa59acff20f886887cc1693ee1c48bbc3293608d3c4c0ebe18558fcdd9a6d29a65c2c73256f6f23a628c26ac1566eef6b465e7a0861616ec0
+EBUILD kodi-9999.ebuild 7777 SHA256 1f9f3311ff0143bb9f623b583c95ffe31108379381d542d45fca3f2ac781ac51 SHA512 a99d920ec7118d1d2688cae92f07b469ee5f1b5f60361cfd3693e52cc3f3a3db37ea0d1a3e8eb6d97e50e0fb46ecf9e3f4c4de609d86b3f792b4d176c6fb9651 WHIRLPOOL f3fd7c5a21c9f940ae3dd01449b69098435629c6e59558bbdedcc22e5dc0f71026d1d8da1f4aac8f650e0e04f9449d12e61138e4ce913bfdfd2ea61e754d303c
+MISC ChangeLog 1956 SHA256 732105cae110618121987b66e0aeee85d0633bb6c3029f1562f1901550845009 SHA512 a788e2a3ab0ba454e9dafb6975a7cfe0e868249cc67058bf5846cb4e124db2799021145e55f16ca4542781450f8fc10686dfd01a498d76e3d11cfaea0afc6deb WHIRLPOOL fdc6d354edb0ff2c9d956092e9dbbbda47e221e0c423f2a087000351d0b9490470ab646c6488655c63b8ef3cf80413dc5dde4a0570494bb5226dbcdf97b0bece
 MISC metadata.xml 1234 SHA256 5fb643446f2efcf3a164c14c438bd9a6d58f060da69aac7669e1d9ce6e7541a8 SHA512 4cf23d3684a6c7c2affb0dc7218bdc6d8b7ae1d7e029f25898f8932ce21be53df6bacb19259b28e5126b02f0cc4af4145a0c37a11a79c4238e6238bfc752f098 WHIRLPOOL 7a819921c3cf9fb9ad342de1c13652870b3e179adf8e7d639046f422a4e898348a7c9e09d15f959ffb877332bc35683896ace0d72cac91cb9515d2bcace9d3ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFurQACgkQIY77eQFFFC0nIgCgow5/J88wU8VI8YjnnDB31jZA
-zssAnjQMYhPgfqEjMlfs0kq/JXeETA/e
-=SuFr
+iEYEAREIAAYFAlUKxbgACgkQIY77eQFFFC1TGwCg4E/LS2K8nZNoKjFMgnwALI1x
+RZQAnjzeoLKMaxD4DTbr8WMgpR8HThUz
+=qen6
 -----END PGP SIGNATURE-----
diff --git a/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch b/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch
new file mode 100644
index 000000000000..82a738356ff8
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/400617
+
+do not force any particular ABI or FPU or SIMD compiler flags for arm
+targets.  let the toolchain and user CFLAGS control that.
+
+--- a/configure.in
++++ b/configure.in
+@@ -571,7 +571,7 @@
+ elif test "$target_platform" = "target_raspberry_pi"; then
+   ARCH="arm"
+   use_arch="arm"
+-elif test "$use_arch" = "arm"; then
++elif false; then
+   CFLAGS="$CFLAGS -mno-apcs-stack-check"
+   CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
+   FFMPEG_EXTRACFLAGS=""
diff --git a/media-tv/kodi/files/kodi-9999-no-arm-flags.patch b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch
index 82a738356ff8..64c1cfbc8fe2 100644
--- a/media-tv/kodi/files/kodi-9999-no-arm-flags.patch
+++ b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch
@@ -3,8 +3,8 @@ http://bugs.gentoo.org/400617
 do not force any particular ABI or FPU or SIMD compiler flags for arm
 targets.  let the toolchain and user CFLAGS control that.
 
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -571,7 +571,7 @@
  elif test "$target_platform" = "target_raspberry_pi"; then
    ARCH="arm"
diff --git a/media-tv/kodi/files/kodi-9999-texturepacker.patch b/media-tv/kodi/files/kodi-9999-texturepacker.patch
new file mode 100644
index 000000000000..fe3dcdcf7a87
--- /dev/null
+++ b/media-tv/kodi/files/kodi-9999-texturepacker.patch
@@ -0,0 +1,17 @@
+--- tools/depends/native/TexturePacker/Makefile.old	2015-03-17 22:29:18.880029509 +0100
++++ tools/depends/native/TexturePacker/Makefile	2015-03-17 22:29:41.459671679 +0100
+@@ -9,14 +9,10 @@
+ 
+ ifeq ($(NATIVEPLATFORM),)
+   PLATFORM = native
+-  EXTRA_CONFIGURE = --enable-static
+ else
+   PLATFORM = $(NATIVEPLATFORM)
+ endif
+ 
+-ifeq ($(NATIVE_OS), linux)
+-  EXTRA_CONFIGURE = --enable-static
+-endif
+ ifeq ($(NATIVE_OS), android)
+   EXTRA_CONFIGURE = --enable-static
+ endif
diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index d16d16c47a92..4b1107ddfd0d 100644
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.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-14.1.ebuild,v 1.3 2015/02/28 18:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild,v 1.4 2015/03/19 12:48:23 tupone Exp $
 
 EAPI="5"
 
@@ -142,7 +142,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617
 	epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 83712deee165..429b36e5fa6d 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.8 2015/03/15 17:00:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.9 2015/03/19 12:48:23 tupone Exp $
 
 EAPI="5"
 
@@ -33,7 +33,7 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs raspberry-pi rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs raspberry-pi rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
 REQUIRED_USE="
 	rsxs? ( X )
 	xrandr? ( X )
@@ -59,7 +59,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	media-fonts/corefonts
 	media-fonts/roboto
-	media-libs/alsa-lib
+	alsa? ( media-libs/alsa-lib )
 	media-libs/flac
 	media-libs/fontconfig
 	media-libs/freetype
@@ -142,11 +142,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	mv xbmc/visualizations/Goom/goom2k4-0/configure.{in,ac}
-	mv configure.{in,ac}
-	sed -i -e "s:configure.in:configure.ac:" \
-		bootstrap.mk || die "sed failed"
+	epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617
+	epatch "${FILESDIR}"/${P}-texturepacker.patch
 
 	# some dirs ship generated autotools, some dont
 	multijob_init
@@ -204,6 +201,7 @@ src_configure() {
 		--disable-ccache \
 		--disable-optimizations \
 		--with-ffmpeg=shared \
+		$(use_enable alsa) \
 		$(use_enable airplay) \
 		$(use_enable avahi) \
 		$(use_enable bluray libbluray) \