From: Slawek Lis Date: Thu, 1 Jan 2015 21:23:17 +0000 (+0000) Subject: Fixed #534114 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ace47d354a9669ac81e13bd78cafaf942675425b;p=gentoo.git Fixed #534114 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x55265D89 --- diff --git a/dev-python/Kivy/ChangeLog b/dev-python/Kivy/ChangeLog index 467a86998b00..1b44fe2c23a1 100644 --- a/dev-python/Kivy/ChangeLog +++ b/dev-python/Kivy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/Kivy -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.4 2014/08/10 21:06:30 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.5 2015/01/01 21:23:06 slis Exp $ + + 01 Jan 2015; Sławek Lis +files/cython-fixes.patch, + Kivy-1.8.0.ebuild: + Fixed #534114 10 Aug 2014; Sergei Trofimovich Kivy-1.8.0.ebuild: QA: drop trailing '.' from DESCRIPTION diff --git a/dev-python/Kivy/Kivy-1.8.0.ebuild b/dev-python/Kivy/Kivy-1.8.0.ebuild index ee6e00421c33..685b514733d0 100644 --- a/dev-python/Kivy/Kivy-1.8.0.ebuild +++ b/dev-python/Kivy/Kivy-1.8.0.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/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.4 2014/08/10 21:06:30 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.5 2015/01/01 21:23:06 slis Exp $ EAPI="5" @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_1,3_3,3_4} ) inherit distutils-r1 -DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications" +DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications." HOMEPAGE="http://kivy.org/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" @@ -19,7 +19,7 @@ IUSE="cairo camera doc examples garden gstreamer spell" DEPEND="dev-python/cython garden? ( dev-python/kivy-garden ) - gstreamer? ( dev-python/gst-python:0.10 ) + gstreamer? ( dev-python/gst-python ) cairo? ( dev-python/pycairo ) spell? ( dev-python/pyenchant ) dev-python/pygame @@ -31,6 +31,7 @@ RDEPEND="${DEPEND}" src_prepare() { sed -e '/data_files=/d' -i "${S}/setup.py" + epatch "${FILESDIR}/cython-fixes.patch" } src_install() { diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest index 019c993d83fb..361772ddb64d 100644 --- a/dev-python/Kivy/Manifest +++ b/dev-python/Kivy/Manifest @@ -1,14 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX cython-fixes.patch 1667 SHA256 f22281bbda72fd21daa80f9669c7105225a2dafb940d51f21138cd91a3582dbc SHA512 630ca8349da7ad2fd8c980e1ceca30a448f4895068aa05d58310893f6139314929d56433f54dc8aca8fa12fa2c6b95f84076c492cd6637dacd1af4be2816775c WHIRLPOOL 31e7a7947d4b81fdd0a2dd77a7bc4631621e2997761766f6387064e58bd30a2a73e8025a7ffbd72110ca364140120fc743de3ce901c93d437ea3561731084258 DIST Kivy-1.8.0.tar.gz 14655888 SHA256 1bb5add88132c902ed746e7624034ecaab49e61f3fbbfde231604e887e6fb324 SHA512 e7057b008cceec9513961ddc3d4aaef2aa1a10de9c2de09ad82bd90ca88300047374e5f8c982cb018712fb0465c03208108c3110887ef383c00a45ee9e5bc81d WHIRLPOOL a6530edebcae34aede981c2f0db37a26a9378e148a073dc1396096b4db04ebdef0f6d96de4222383a5e2d84858bdf10383611751f9bf5ae625eafc67d1cf702f -EBUILD Kivy-1.8.0.ebuild 1080 SHA256 c48b3765d0642d2cbec24a1f7497f61457e8d11b9467d545e0485c5ff8ce7ae0 SHA512 360a6f0da8ae1dd26c0a8f24975281cfbeb4dc07eb2959141321706d57ee6a1e856586d0a94b2f3742399143a508aa3a048cd2ba62d24f26e44a3db19d49fd55 WHIRLPOOL 828a54ef809ca04abf95ff05e65bd02a9d9f5c05a5e9be93f2edad570ad1ec5c4ffe1920909bacd5ac3beda487319a877874e881f02d0453e4dd578dc51c7efe -MISC ChangeLog 671 SHA256 ec67d73b0f8c8ac16ddb4367a55b7be4b2485330d0b0b169e891f713055ac8fc SHA512 755aef3e3a22443464ed0ae4488929ca2a8a08b3a59bb5a428c41281516130e6e6e1beb0b600be5633c21c8becb19db6dfa040ca11cde49362d1472e9e306f76 WHIRLPOOL e25d003f651e0f1e9be1a859ecf9e88dad159269777d102ea47e451ce95e9fc3c6d5294c184284ba0ead76e44a9843237a3ffca79965907b76ce2b620656cbcf +EBUILD Kivy-1.8.0.ebuild 1115 SHA256 9c56df2b9a3b6274c5684c36fad14855a2b2dd1a6090579d74ac0170596203c5 SHA512 b105d41e8e56670c209ed8dd20efe9298a47b00d8578f104405d4bbb6eb3090f3ee3eb039fb9249f22d7e2f43f5aed2db43341fe5e13a56bc813b7ea5cf5b939 WHIRLPOOL 93c891b497f34f487ac5f1c89f7279ffb42d12c0b8152878628d95e03a0db2e75e51335a85b2b9010892ba8e662bbe21929d94481123dddcec2139464321aac5 +MISC ChangeLog 779 SHA256 968628d7e84b7e7eadc3f7eda6b83b51d4300c3225b9d4b2a16e1b57b4d619cf SHA512 5f64f4bdb5bd1bbeafb66a0198d787ea539941751752eea39d38a69f5f1d97dc80ba77d55c9acf160eb9bfdb7c67879bd114c1ee5bb4bd101a2094c84bdceedf WHIRLPOOL 1c2f5963e912dc1723c316543792ae500f40fc87f76f972152db9434dd607b51e26927383120f75a95bbb2f0a3d36d533fba9e80d5c319dfae8e126ee43fb044 MISC metadata.xml 405 SHA256 f7bc0de1629637f683bc13a5716633fd891b94b99110272fa9a8325c7a4e15af SHA512 85b396edb91f819561f3b6a67baf37ff7593ff1f9947b1d93b32e80004c4d3689a279b40f60c60b1641ef64d659ae9929932a0753456185ff835140cdcc13d60 WHIRLPOOL 49f41ebe8dad13c6a74b1433657768f22dd74e6804ed35cd8ada9e0bb285d72606a1162322a02f6ee834b78de73eb3d7e8b57d08328a3de7fa5b4d93d4bb6197 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPn3tcACgkQcaHudmEf86rj1QCfaqkZOVCRoTkbx/jInilmRlWP -LJ4An34KY3aanRsPACFITt/UENVrFR6W -=F3wn +iQEcBAEBCAAGBQJUpbokAAoJEO1RxJ84ipLkPscH/ReeRz/qyVCnf4h1Ey2asCFR +Zv8Iqrc1KJvE+fBW2Qf7DEwuuGkYBkyFGFPUk7V5cR+jTMHqr2leryUjkD6rCkfC +OWznfgTK7tj374Tr/rG/Bdkar/I5XzrA7/1GoKdDfQ06E60kc63mUMTYAwxtUjQR +CdUNjdOpjbVica+n9myNHW1Jo2BUm8wHteIed0HNONLtNYjC8FpH1ZZohIdZ3ejh +PBqc4bt/l6kEpOpjIxIwi9oTwtOt1XjrRD3G0Ho83c3Qft+Ea90EaNVemtmaYiRW +ipezR91rz1CXMckrYDFkvpTJ4Dc9dnd51lXdEZ1qcCkjrrSxhh5a1IU6IKemiWA= +=i8DR -----END PGP SIGNATURE----- diff --git a/dev-python/Kivy/files/cython-fixes.patch b/dev-python/Kivy/files/cython-fixes.patch new file mode 100644 index 000000000000..b9eca4c5d5da --- /dev/null +++ b/dev-python/Kivy/files/cython-fixes.patch @@ -0,0 +1,42 @@ +--- kivy/lib/gstplayer/_gstplayer.pyx.orig 2014-01-29 17:45:32.000000000 +0100 ++++ kivy/lib/gstplayer/_gstplayer.pyx 2015-01-01 21:24:55.480191418 +0100 +@@ -207,7 +207,7 @@ + self.eos_cb() + + def load(self): +- cdef char *c_uri ++ cdef bytes py_uri + + # if already loaded before, clean everything. + if self.pipeline != NULL: +@@ -256,8 +256,8 @@ + + # configure playbin + g_object_set_int(self.pipeline, 'async-handling', 1) +- c_uri = self.uri.encode('utf-8') +- g_object_set_void(self.playbin, 'uri', c_uri) ++ py_uri = self.uri.encode('utf-8') ++ g_object_set_void(self.playbin, 'uri', py_uri) + + # attach the callback + # NOTE no need to create a weakref here, as we manage to grab/release +--- kivy/graphics/shader.pyx.orig 2014-01-20 03:49:50.000000000 +0100 ++++ kivy/graphics/shader.pyx 2015-01-01 21:25:01.446858150 +0100 +@@ -421,6 +421,7 @@ + cdef void bind_vertex_format(self, VertexFormat vertex_format): + cdef unsigned int i + cdef vertex_attr_t *attr ++ cdef bytes name + + # if the current vertex format used in the shader is the current one, do + # nothing. +@@ -445,7 +446,8 @@ + attr = &vertex_format.vattr[i] + if attr.per_vertex == 0: + continue +- attr.index = glGetAttribLocation(self.program, attr.name) ++ name = attr.name ++ attr.index = glGetAttribLocation(self.program, name) + glEnableVertexAttribArray(attr.index) + + # save for the next run.