public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/Kivy/files/, dev-python/Kivy/
@ 2019-12-27 18:52 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2019-12-27 18:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7c80d211d038384f741f0b5de6372a09f6dac225
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 18:52:12 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 18:52:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c80d211

dev-python/Kivy: Remove old

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-python/Kivy/Kivy-1.10.0.ebuild      |  76 ----------------------
 dev-python/Kivy/Kivy-1.9.1-r1.ebuild    |  72 ---------------------
 dev-python/Kivy/Kivy-1.9.1.ebuild       |  69 --------------------
 dev-python/Kivy/Manifest                |   2 -
 dev-python/Kivy/files/modplug-fix.patch | 109 --------------------------------
 5 files changed, 328 deletions(-)

diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild
deleted file mode 100644
index ccdd94cab72..00000000000
--- a/dev-python/Kivy/Kivy-1.10.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-PATCHES=(
-	"${FILESDIR}/modplug-fix.patch"
-)
-
-python_prepare_all() {
-# 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-# 	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/${f}/"
-		doins "${S}/examples"/* "${S}/examples"/*/*
-	fi
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild b/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
deleted file mode 100644
index de15acb2050..00000000000
--- a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/${f}/"
-		doins "${S}/examples"/* "${S}/examples"/*/*
-	fi
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/Kivy/Kivy-1.9.1.ebuild b/dev-python/Kivy/Kivy-1.9.1.ebuild
deleted file mode 100644
index 76675221370..00000000000
--- a/dev-python/Kivy/Kivy-1.9.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	use examples && EXAMPLES=( examples )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index 2956c4e2c16..5fc86976a87 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,3 +1 @@
-DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d4598957df1573e0c617ca872afa446797266f1ecd4a99da81bc7dcc40a051294d96c11e51a7fe2c505224bf0edaa42 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4
 DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642
-DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989

diff --git a/dev-python/Kivy/files/modplug-fix.patch b/dev-python/Kivy/files/modplug-fix.patch
deleted file mode 100644
index 18abe6e8f80..00000000000
--- a/dev-python/Kivy/files/modplug-fix.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 3b85f3e1c292b3f6c3f226490f52a2ab78251730 Mon Sep 17 00:00:00 2001
-From: Terje Skjaeveland <terje.skjaeveland@gmail.com>
-Date: Sun, 29 Oct 2017 12:35:46 +0100
-Subject: [PATCH] audio_sdl2: Update for mixer v2.0.2 support
-
-Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
-renamed to MIX_INIT_MID.
----
- kivy/core/audio/audio_sdl2.pyx | 45 +++++++++++++++++++++++++++++-------------
- kivy/lib/sdl2.pxi              |  4 ++--
- 2 files changed, 33 insertions(+), 16 deletions(-)
-
-diff --git a/kivy/core/audio/audio_sdl2.pyx b/kivy/core/audio/audio_sdl2.pyx
-index 2ab569fe60..c6f26be5c8 100644
---- a/kivy/core/audio/audio_sdl2.pyx
-+++ b/kivy/core/audio/audio_sdl2.pyx
-@@ -15,9 +15,23 @@ Depending the compilation of SDL2 mixer and/or installed libraries:
- * ogg since 1.9.1 (mixer needs libvorbis/libogg)
- * flac since 1.9.1 (mixer needs libflac)
- * mp3 since 1.9.1 (mixer needs libsmpeg/libmad; only use mad for GPL apps)
-+  * Since 1.10.1 + mixer 2.0.2, mpg123 can also be used
- * sequenced formats since 1.9.1 (midi, mod, s3m, etc. Mixer needs
-   libmodplug or libmikmod)
- 
-+.. Note::
-+
-+    Sequenced format support changed with mixer v2.0.2. If mixer is
-+    linked with one of libmodplug or libmikmod, format support for
-+    both libraries is assumed. This will work perfectly with formats
-+    upported by both libraries, but if you were to try to load an
-+    obscure format (like `apun` file with mikmod only), it will fail.
-+
-+    * Kivy <= 1.10.0: will fail to build with mixer >= 2.0.2
-+      will report correct format support with < 2.0.2
-+    * Kivy >= 1.10.1: will build with old and new mixer, and
-+      will "guesstimate" sequenced format support
-+
- .. Warning::
- 
-     Sequenced formats use the SDL2 Mixer music channel, you can only play
-@@ -57,8 +71,13 @@ cdef mix_init():
-         mix_is_init = -1
-         return 0
- 
-+    # In mixer 2.0.2, MIX_INIT_MODPLUG is now implied by MIX_INIT_MOD,
-+    # and MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID. In previous
-+    # versions, we requested both _MODPLUG and _MOD + _FLUIDSYNTH.
-+    # 0x20 used to be MIX_INIT_FLUIDSYNTH, now MIX_INIT_MID
-+    # 0x4  used to be MIX_INIT_MODPLUG before 2.0.2
-     want_flags = MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3
--    want_flags |= MIX_INIT_MOD | MIX_INIT_MODPLUG | MIX_INIT_FLUIDSYNTH
-+    want_flags |= MIX_INIT_MOD | 0x20 | 0x4
- 
-     mix_flags = Mix_Init(want_flags)
- 
-@@ -244,25 +263,23 @@ class MusicSDL2(Sound):
-     @staticmethod
-     def extensions():
-         mix_init()
-+        # FIXME: this should probably evolve to use the new has_music()
-+        #        interface to determine format support
- 
-         # Assume native midi support (defaults to enabled), but may use
-         # modplug, fluidsynth or timidity in reality. It may also be
-         # disabled completely, in which case loading it will fail
-         extensions = set(['mid', 'midi'])
- 
--        # libmodplug, may be incomplete
--        if mix_flags & MIX_INIT_MODPLUG:
--            extensions.update(['669', 'abc', 'amf', 'ams', 'dbm', 'dmf',
--                               'dsm', 'far', 'it', 'j2b', 'mdl', 'med',
--                               'mod', 'mt2', 'mtm', 'okt', 'pat', 'psm',
--                               'ptm', 's3m', 'stm', 'ult', 'umx', 'xm'])
--
--        # libmikmod, may be incomplete
--        if mix_flags & MIX_INIT_MOD:
--            extensions.update(['669', 'amf', 'apun', 'dsm', 'far', 'gdm',
--                               'gt2', 'it',  'med', 'mod', 'mtm', 'okt',
--                               's3m', 'stm', 'stx', 'ult', 'umx', 'uni',
--                               'xm'])
-+        # libmodplug and libmikmod, may be incomplete.
-+        # 0x4 is for mixer < 2.0.2, MIX_INIT_MODPLUG
-+        if mix_flags & (MIX_INIT_MOD | 0x4):
-+            extensions.update(['669', 'abc', 'amf', 'ams', 'apun', 'dbm',
-+                               'dmf', 'dsm', 'far', 'gdm', 'it',   'j2b',
-+                               'mdl', 'med', 'mod', 'mt2', 'mtm',  'okt',
-+                               'pat', 'psm', 'ptm', 's3m', 'stm',  'stx',
-+                               'ult', 'umx', 'uni', 'xm'])
-+
-         return list(extensions)
- 
-     def __init__(self, **kwargs):
-diff --git a/kivy/lib/sdl2.pxi b/kivy/lib/sdl2.pxi
-index 07d055c903..ad62ce8023 100644
---- a/kivy/lib/sdl2.pxi
-+++ b/kivy/lib/sdl2.pxi
-@@ -881,10 +881,10 @@ cdef extern from "SDL_mixer.h":
-     ctypedef enum MIX_InitFlags:
-         MIX_INIT_FLAC        = 0x00000001
-         MIX_INIT_MOD         = 0x00000002
--        MIX_INIT_MODPLUG     = 0x00000004
-+        MIX_INIT_MODPLUG     = 0x00000004 # Removed in mixer 2.0.2
-         MIX_INIT_MP3         = 0x00000008
-         MIX_INIT_OGG         = 0x00000010
--        MIX_INIT_FLUIDSYNTH  = 0x00000020
-+        MIX_INIT_MID         = 0x00000020 # Previously _FLUIDSYNTH
- 
-     cdef int MIX_MAX_VOLUME
- 


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/Kivy/files/, dev-python/Kivy/
@ 2018-01-03  8:31 Slawek Lis
  0 siblings, 0 replies; 3+ messages in thread
From: Slawek Lis @ 2018-01-03  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     9297efe754fb1e7e470dfe3f1081f3dacb8fee46
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 08:30:38 2018 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 08:30:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9297efe7

dev-python/Kivy: Patch fixing bug with sdl-mixer

Bug id: 636012

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-python/Kivy/Kivy-1.10.0.ebuild      |   6 +-
 dev-python/Kivy/files/modplug-fix.patch | 109 ++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild
index 8e2cb32ef0b..0a913ae26c1 100644
--- a/dev-python/Kivy/Kivy-1.10.0.ebuild
+++ b/dev-python/Kivy/Kivy-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P,,}"
 
+PATCHES=(
+	"${FILESDIR}/modplug-fix.patch"
+)
+
 python_prepare_all() {
 # 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
 # 	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die

diff --git a/dev-python/Kivy/files/modplug-fix.patch b/dev-python/Kivy/files/modplug-fix.patch
new file mode 100644
index 00000000000..18abe6e8f80
--- /dev/null
+++ b/dev-python/Kivy/files/modplug-fix.patch
@@ -0,0 +1,109 @@
+From 3b85f3e1c292b3f6c3f226490f52a2ab78251730 Mon Sep 17 00:00:00 2001
+From: Terje Skjaeveland <terje.skjaeveland@gmail.com>
+Date: Sun, 29 Oct 2017 12:35:46 +0100
+Subject: [PATCH] audio_sdl2: Update for mixer v2.0.2 support
+
+Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
+renamed to MIX_INIT_MID.
+---
+ kivy/core/audio/audio_sdl2.pyx | 45 +++++++++++++++++++++++++++++-------------
+ kivy/lib/sdl2.pxi              |  4 ++--
+ 2 files changed, 33 insertions(+), 16 deletions(-)
+
+diff --git a/kivy/core/audio/audio_sdl2.pyx b/kivy/core/audio/audio_sdl2.pyx
+index 2ab569fe60..c6f26be5c8 100644
+--- a/kivy/core/audio/audio_sdl2.pyx
++++ b/kivy/core/audio/audio_sdl2.pyx
+@@ -15,9 +15,23 @@ Depending the compilation of SDL2 mixer and/or installed libraries:
+ * ogg since 1.9.1 (mixer needs libvorbis/libogg)
+ * flac since 1.9.1 (mixer needs libflac)
+ * mp3 since 1.9.1 (mixer needs libsmpeg/libmad; only use mad for GPL apps)
++  * Since 1.10.1 + mixer 2.0.2, mpg123 can also be used
+ * sequenced formats since 1.9.1 (midi, mod, s3m, etc. Mixer needs
+   libmodplug or libmikmod)
+ 
++.. Note::
++
++    Sequenced format support changed with mixer v2.0.2. If mixer is
++    linked with one of libmodplug or libmikmod, format support for
++    both libraries is assumed. This will work perfectly with formats
++    upported by both libraries, but if you were to try to load an
++    obscure format (like `apun` file with mikmod only), it will fail.
++
++    * Kivy <= 1.10.0: will fail to build with mixer >= 2.0.2
++      will report correct format support with < 2.0.2
++    * Kivy >= 1.10.1: will build with old and new mixer, and
++      will "guesstimate" sequenced format support
++
+ .. Warning::
+ 
+     Sequenced formats use the SDL2 Mixer music channel, you can only play
+@@ -57,8 +71,13 @@ cdef mix_init():
+         mix_is_init = -1
+         return 0
+ 
++    # In mixer 2.0.2, MIX_INIT_MODPLUG is now implied by MIX_INIT_MOD,
++    # and MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID. In previous
++    # versions, we requested both _MODPLUG and _MOD + _FLUIDSYNTH.
++    # 0x20 used to be MIX_INIT_FLUIDSYNTH, now MIX_INIT_MID
++    # 0x4  used to be MIX_INIT_MODPLUG before 2.0.2
+     want_flags = MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3
+-    want_flags |= MIX_INIT_MOD | MIX_INIT_MODPLUG | MIX_INIT_FLUIDSYNTH
++    want_flags |= MIX_INIT_MOD | 0x20 | 0x4
+ 
+     mix_flags = Mix_Init(want_flags)
+ 
+@@ -244,25 +263,23 @@ class MusicSDL2(Sound):
+     @staticmethod
+     def extensions():
+         mix_init()
++        # FIXME: this should probably evolve to use the new has_music()
++        #        interface to determine format support
+ 
+         # Assume native midi support (defaults to enabled), but may use
+         # modplug, fluidsynth or timidity in reality. It may also be
+         # disabled completely, in which case loading it will fail
+         extensions = set(['mid', 'midi'])
+ 
+-        # libmodplug, may be incomplete
+-        if mix_flags & MIX_INIT_MODPLUG:
+-            extensions.update(['669', 'abc', 'amf', 'ams', 'dbm', 'dmf',
+-                               'dsm', 'far', 'it', 'j2b', 'mdl', 'med',
+-                               'mod', 'mt2', 'mtm', 'okt', 'pat', 'psm',
+-                               'ptm', 's3m', 'stm', 'ult', 'umx', 'xm'])
+-
+-        # libmikmod, may be incomplete
+-        if mix_flags & MIX_INIT_MOD:
+-            extensions.update(['669', 'amf', 'apun', 'dsm', 'far', 'gdm',
+-                               'gt2', 'it',  'med', 'mod', 'mtm', 'okt',
+-                               's3m', 'stm', 'stx', 'ult', 'umx', 'uni',
+-                               'xm'])
++        # libmodplug and libmikmod, may be incomplete.
++        # 0x4 is for mixer < 2.0.2, MIX_INIT_MODPLUG
++        if mix_flags & (MIX_INIT_MOD | 0x4):
++            extensions.update(['669', 'abc', 'amf', 'ams', 'apun', 'dbm',
++                               'dmf', 'dsm', 'far', 'gdm', 'it',   'j2b',
++                               'mdl', 'med', 'mod', 'mt2', 'mtm',  'okt',
++                               'pat', 'psm', 'ptm', 's3m', 'stm',  'stx',
++                               'ult', 'umx', 'uni', 'xm'])
++
+         return list(extensions)
+ 
+     def __init__(self, **kwargs):
+diff --git a/kivy/lib/sdl2.pxi b/kivy/lib/sdl2.pxi
+index 07d055c903..ad62ce8023 100644
+--- a/kivy/lib/sdl2.pxi
++++ b/kivy/lib/sdl2.pxi
+@@ -881,10 +881,10 @@ cdef extern from "SDL_mixer.h":
+     ctypedef enum MIX_InitFlags:
+         MIX_INIT_FLAC        = 0x00000001
+         MIX_INIT_MOD         = 0x00000002
+-        MIX_INIT_MODPLUG     = 0x00000004
++        MIX_INIT_MODPLUG     = 0x00000004 # Removed in mixer 2.0.2
+         MIX_INIT_MP3         = 0x00000008
+         MIX_INIT_OGG         = 0x00000010
+-        MIX_INIT_FLUIDSYNTH  = 0x00000020
++        MIX_INIT_MID         = 0x00000020 # Previously _FLUIDSYNTH
+ 
+     cdef int MIX_MAX_VOLUME
+ 


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/Kivy/files/, dev-python/Kivy/
@ 2017-06-06  6:25 Slawek Lis
  0 siblings, 0 replies; 3+ messages in thread
From: Slawek Lis @ 2017-06-06  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     e8734ba00183c818e6b3c32327da6e1deb40a66e
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 06:25:12 2017 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 06:25:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8734ba0

dev-python/Kivy: drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-python/Kivy/Kivy-1.9.0-r1.ebuild               |  45 --
 dev-python/Kivy/Manifest                           |   1 -
 .../files/Kivy-1.9.0-cython-0.22-backport.patch    | 713 ---------------------
 3 files changed, 759 deletions(-)

diff --git a/dev-python/Kivy/Kivy-1.9.0-r1.ebuild b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
deleted file mode 100644
index 4446bb86894..00000000000
--- a/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="http://kivy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cairo camera doc examples garden gstreamer spell"
-
-RDEPEND="
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	<=dev-python/cython-0.22[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/mesa
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cython-0.22-backport.patch )
-
-python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && DOCS=( doc/sources/. )
-	use examples && EXAMPLES=( examples )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index 3cd62f4044b..5a1d1bf21dd 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,2 +1 @@
-DIST Kivy-1.9.0.tar.gz 16178808 SHA256 b828617f858963f7873f5c81bb8824ca1dfa265e7811fce03599e2ba7200ffa0 SHA512 e0efc27f8ae070f5748570ee9224220791d32e931bbaf0bad5ddee894cf1d0f9ded5eebcc54d3b666491edaab0316923311f5e0cc7b1e46929d87ea3bec87f21 WHIRLPOOL c57c696752c88d3c8643e126180aa00b864df45bad0de4e6456143fd0f1486085a258a787ec2e4017b982004dd5a1212b11dbcb352f1f72b77591fa5fd9c934e
 DIST kivy-1.9.1.tar.gz 16363833 SHA256 29bc45be34c26a8acb1dafdd329145f997a473be344cd052659f821f6478637e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989 WHIRLPOOL f2eebf64f3abc2b63d307d8aadc87d0beb980e9bf5f85ff664e973b5c014ccb4f3fed58d24e2ca1e416e959ece1c094e34c0d75630003c89ab3a36237137042d

diff --git a/dev-python/Kivy/files/Kivy-1.9.0-cython-0.22-backport.patch b/dev-python/Kivy/files/Kivy-1.9.0-cython-0.22-backport.patch
deleted file mode 100644
index cea6fd2501d..00000000000
--- a/dev-python/Kivy/files/Kivy-1.9.0-cython-0.22-backport.patch
+++ /dev/null
@@ -1,713 +0,0 @@
-From 124fe6c7f08defb36305f6aa0bba203ab645ab8a Mon Sep 17 00:00:00 2001
-From: Alexander Taylor <alexanderjohntaylor@gmail.com>
-Date: Sat, 18 Apr 2015 17:03:03 +0100
-Subject: [PATCH] Changed 'except *' to 'except -1' for cython 0.22
-
----
- kivy/graphics/context_instructions.pxd     | 22 +++++++-------
- kivy/graphics/context_instructions.pyx     |  8 ++---
- kivy/graphics/fbo.pxd                      |  2 +-
- kivy/graphics/fbo.pyx                      |  3 +-
- kivy/graphics/gl_instructions.pyx          |  8 +++--
- kivy/graphics/instructions.pxd             | 30 +++++++++---------
- kivy/graphics/instructions.pyx             | 49 ++++++++++++++++++------------
- kivy/graphics/shader.pxd                   | 12 ++++----
- kivy/graphics/shader.pyx                   | 25 +++++++++------
- kivy/graphics/stencil_instructions.pxd     |  8 ++---
- kivy/graphics/stencil_instructions.pyx     | 14 ++++++---
- kivy/graphics/vertex_instructions_line.pxi |  9 +++---
- setup.py                                   |  8 ++---
- 13 files changed, 110 insertions(+), 88 deletions(-)
-
-diff --git a/kivy/graphics/context_instructions.pxd b/kivy/graphics/context_instructions.pxd
-index f6562b1..f8027e2 100644
---- a/kivy/graphics/context_instructions.pxd
-+++ b/kivy/graphics/context_instructions.pxd
-@@ -16,39 +16,39 @@ cdef class PopState(ContextInstruction):
-     pass
- 
- cdef class LineWidth(ContextInstruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- cdef class Color(ContextInstruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- cdef class BindTexture(ContextInstruction):
-     cdef int _index
-     cdef object _source
-     cdef Texture _texture
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- 
- cdef class LoadIdentity(ContextInstruction):
-     pass
- 
- cdef class PushMatrix(ContextInstruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- cdef class PopMatrix(ContextInstruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- cdef class ApplyContextMatrix(ContextInstruction):
-     cdef object _target_stack
-     cdef object _source_stack
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- cdef class UpdateNormalMatrix(ContextInstruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- cdef class MatrixInstruction(ContextInstruction):
-     cdef object _stack
-     cdef Matrix _matrix
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- cdef class Transform(MatrixInstruction):
-     cpdef transform(self, Matrix trans)
-@@ -61,17 +61,17 @@ cdef class Rotate(Transform):
-     cdef float _angle
-     cdef tuple _axis
-     cdef tuple _origin
--    cdef void apply(self)
-+    cdef int apply(self) except -1
-     cdef void compute(self)
- 
- cdef class Scale(Transform):
-     cdef tuple _origin
-     cdef float _x, _y, _z
--    cdef void apply(self)
-+    cdef int apply(self) except -1
-     cdef set_scale(self, double x, double y, double z)
- 
- cdef class Translate(Transform):
-     cdef double _x, _y, _z
--    cdef void apply(self)
-+    cdef int apply(self) except -1
-     cdef set_translate(self, double x, double y, double z)
- 
-diff --git a/kivy/graphics/context_instructions.pyx b/kivy/graphics/context_instructions.pyx
-index 2107a2c..189656a 100644
---- a/kivy/graphics/context_instructions.pyx
-+++ b/kivy/graphics/context_instructions.pyx
-@@ -344,7 +344,7 @@ cdef class BindTexture(ContextInstruction):
- 
-         self.index = kwargs.get('index', 0)
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef RenderContext context = self.get_context()
-         context.set_texture(self._index, self._texture)
- 
-@@ -458,7 +458,7 @@ cdef class ApplyContextMatrix(ContextInstruction):
-         self.target_stack = kwargs.get('target_stack', 'modelview_mat')
-         self.source_stack = kwargs.get('source_stack', 'modelview_mat')
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef RenderContext context = self.get_context()
-         m = context.get_state(self._target_stack)
-         m = m.multiply(context.get_state(self._source_stack))
-@@ -494,7 +494,7 @@ cdef class UpdateNormalMatrix(ContextInstruction):
- 
-     .. versionadded:: 1.6.0
-     '''
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef RenderContext context = self.get_context()
-         mvm = context.get_state('modelview_mat')
-         context.set_state('normal_mat', mvm.normal_matrix())
-@@ -509,7 +509,7 @@ cdef class MatrixInstruction(ContextInstruction):
-         self.stack = kwargs.get('stack', 'modelview_mat')
-         self._matrix = None
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         '''Apply the matrix of this instance to the
-         context model view matrix.
-         '''
-diff --git a/kivy/graphics/fbo.pxd b/kivy/graphics/fbo.pxd
-index 31b281a..2c202dd 100644
---- a/kivy/graphics/fbo.pxd
-+++ b/kivy/graphics/fbo.pxd
-@@ -24,7 +24,7 @@ cdef class Fbo(RenderContext):
- 
-     cdef void create_fbo(self)
-     cdef void delete_fbo(self)
--    cdef void apply(self)
-+    cdef int apply(self) except -1
-     cdef void raise_exception(self, str message, int status=?)
-     cdef str resolve_status(self, int status)
-     cdef void reload(self)
-diff --git a/kivy/graphics/fbo.pyx b/kivy/graphics/fbo.pyx
-index 901d600..d7f6c09 100644
---- a/kivy/graphics/fbo.pyx
-+++ b/kivy/graphics/fbo.pyx
-@@ -323,12 +323,13 @@ cdef class Fbo(RenderContext):
-         else:
-             glClear(GL_COLOR_BUFFER_BIT)
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         if self.flags & GI_NEEDS_UPDATE:
-             self.bind()
-             RenderContext.apply(self)
-             self.release()
-             self.flag_update_done()
-+        return 0
- 
-     cdef void reload(self):
-         # recreate the framebuffer, without deleting it. the deletion is not
-diff --git a/kivy/graphics/gl_instructions.pyx b/kivy/graphics/gl_instructions.pyx
-index afe3404..78b0fe5 100644
---- a/kivy/graphics/gl_instructions.pyx
-+++ b/kivy/graphics/gl_instructions.pyx
-@@ -50,8 +50,9 @@ cdef class ClearColor(Instruction):
-         self.b = b
-         self.a = a
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         glClearColor(self.r, self.g, self.b, self.a)
-+        return 0
- 
-     property rgba:
-         '''RGBA color used for the clear color, a list of 4 values in the 0-1
-@@ -136,7 +137,7 @@ cdef class ClearBuffers(Instruction):
-         self.clear_stencil = int(kwargs.get('clear_stencil', 0))
-         self.clear_depth = int(kwargs.get('clear_depth', 0))
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef GLbitfield mask = 0
-         if self.clear_color:
-             mask |= GL_COLOR_BUFFER_BIT
-@@ -145,7 +146,8 @@ cdef class ClearBuffers(Instruction):
-         if self.clear_depth:
-             mask |= GL_DEPTH_BUFFER_BIT
-         glClear(mask)
--
-+        return 0
-+        
-     property clear_color:
-         '''If True, the color buffer will be cleared.
-         '''
-diff --git a/kivy/graphics/instructions.pxd b/kivy/graphics/instructions.pxd
-index 9008aef..09b0fd6 100644
---- a/kivy/graphics/instructions.pxd
-+++ b/kivy/graphics/instructions.pxd
-@@ -26,7 +26,7 @@ cdef class Instruction(ObjectWithUid):
-     cdef object __weakref__
-     cdef object __proxy_ref
- 
--    cdef void apply(self)
-+    cdef int apply(self) except -1
-     IF DEBUG:
-         cdef int flag_update(self, int do_parent=?, list _instrs=?) except -1
-     ELSE:
-@@ -58,9 +58,9 @@ cdef class ContextInstruction(Instruction):
-     cdef list context_pop
- 
-     cdef RenderContext get_context(self)
--    cdef void set_state(self, str name, value) except *
--    cdef void push_state(self, str name) except *
--    cdef void pop_state(self, str name) except *
-+    cdef int set_state(self, str name, value) except -1
-+    cdef int push_state(self, str name) except -1
-+    cdef int pop_state(self, str name) except -1
- 
- 
- from context_instructions cimport BindTexture
-@@ -80,8 +80,8 @@ cdef class Callback(Instruction):
-     cdef Shader _shader
-     cdef object func
-     cdef int _reset_context
--    cdef void apply(self)
--    cdef void enter(self)
-+    cdef int apply(self) except -1
-+    cdef int enter(self) except -1
- 
- 
- 
-@@ -99,7 +99,7 @@ cdef class Canvas(CanvasBase):
-     cpdef add(self, Instruction c)
-     cpdef remove(self, Instruction c)
-     cpdef draw(self)
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- 
- 
- cdef class RenderContext(Canvas):
-@@ -113,14 +113,14 @@ cdef class RenderContext(Canvas):
-     cdef void set_texture(self, int index, Texture texture)
-     cdef void set_state(self, str name, value, int apply_now=?)
-     cdef get_state(self, str name)
--    cdef void set_states(self, dict states) except *
--    cdef void push_state(self, str name) except *
--    cdef void push_states(self, list names) except *
--    cdef void pop_state(self, str name) except *
--    cdef void pop_states(self, list names) except *
--    cdef void enter(self) except *
--    cdef void leave(self) except *
--    cdef void apply(self) except *
-+    cdef int set_states(self, dict states) except -1
-+    cdef int push_state(self, str name) except -1
-+    cdef int push_states(self, list names) except -1
-+    cdef int pop_state(self, str name) except -1
-+    cdef int pop_states(self, list names) except -1
-+    cdef int enter(self) except -1
-+    cdef int leave(self) except -1
-+    cdef int apply(self) except -1
-     cpdef draw(self)
-     cdef void reload(self)
- 
-diff --git a/kivy/graphics/instructions.pyx b/kivy/graphics/instructions.pyx
-index 2b5e081..5249556 100644
---- a/kivy/graphics/instructions.pyx
-+++ b/kivy/graphics/instructions.pyx
-@@ -57,8 +57,8 @@ cdef class Instruction(ObjectWithUid):
-         if self.parent:
-             self.parent.add(self)
- 
--    cdef void apply(self):
--        pass
-+    cdef int apply(self) except -1:
-+        return 0
- 
-     IF DEBUG:
-         cdef int flag_update(self, int do_parent=1, list _instrs=None) except -1:
-@@ -145,7 +145,7 @@ cdef class InstructionGroup(Instruction):
-         else:
-             self.compiler = GraphicsCompiler()
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef Instruction c
-         cdef list children
-         if self.compiler is not None:
-@@ -161,6 +161,7 @@ cdef class InstructionGroup(Instruction):
-         else:
-             for c in self.children:
-                 c.apply()
-+        return 0
- 
-     cdef void build(self):
-         self.compiled_children = self.compiler.compile(self)
-@@ -246,7 +247,7 @@ cdef class ContextInstruction(Instruction):
-         cdef RenderContext context = getActiveContext()
-         return context
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef RenderContext context = self.get_context()
-         if self.context_push:
-             context.push_states(self.context_push)
-@@ -254,20 +255,20 @@ cdef class ContextInstruction(Instruction):
-             context.set_states(self.context_state)
-         if self.context_pop:
-             context.pop_states(self.context_pop)
-+        return 0
- 
--    cdef void set_state(self, str name, value):
-+    cdef int set_state(self, str name, value) except -1:
-         self.context_state[name] = value
-         self.flag_update()
- 
--    cdef void push_state(self, str name):
-+    cdef int push_state(self, str name) except -1:
-         self.context_push.append(name)
-         self.flag_update()
- 
--    cdef void pop_state(self, str name):
-+    cdef int pop_state(self, str name) except -1:
-         self.context_pop.append(name)
-         self.flag_update()
- 
--
- cdef class VertexInstruction(Instruction):
-     '''The VertexInstruction class is the base for all graphics instructions
-     that have a direct visual representation on the canvas, such as Rectangles,
-@@ -400,11 +401,12 @@ cdef class VertexInstruction(Instruction):
-     cdef void build(self):
-         pass
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         if self.flags & GI_NEEDS_UPDATE:
-             self.build()
-             self.flag_update_done()
-         self.batch.draw()
-+        return 0
- 
- 
- cdef class Callback(Instruction):
-@@ -466,7 +468,7 @@ cdef class Callback(Instruction):
-         '''
-         self.flag_update()
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef RenderContext rcx
-         cdef Context ctx
-         cdef Shader shader
-@@ -512,9 +514,11 @@ cdef class Callback(Instruction):
-                 rcx.set_texture(index, texture)
- 
-             reset_gl_context()
-+        return 0
- 
--    cdef void enter(self):
-+    cdef int enter(self) except -1:
-         self._shader.use()
-+        return 0
- 
-     property reset_context:
-         '''Set this to True if you want to reset the OpenGL context for Kivy
-@@ -597,7 +601,7 @@ cdef class Canvas(CanvasBase):
-         '''
-         self.apply()
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef float opacity = self._opacity
-         cdef float rc_opacity
-         cdef RenderContext rc
-@@ -609,6 +613,7 @@ cdef class Canvas(CanvasBase):
-         InstructionGroup.apply(self)
-         if opacity != 1.0:
-             rc.pop_state('opacity')
-+        return 0
- 
-     cpdef add(self, Instruction c):
-         # the after group must remain the last one.
-@@ -786,29 +791,29 @@ cdef class RenderContext(Canvas):
-     cdef get_state(self, str name):
-         return self.state_stacks[name][-1]
- 
--    cdef void set_states(self, dict states):
-+    cdef int set_states(self, dict states) except -1:
-         cdef str name
-         for name, value in states.iteritems():
-             self.set_state(name, value)
- 
--    cdef void push_state(self, str name):
-+    cdef int push_state(self, str name) except -1:
-         stack = self.state_stacks[name]
-         stack.append(stack[-1])
-         self.flag_update()
- 
--    cdef void push_states(self, list names):
-+    cdef int push_states(self, list names) except -1:
-         cdef str name
-         for name in names:
-             self.push_state(name)
- 
--    cdef void pop_state(self, str name):
-+    cdef int pop_state(self, str name) except -1:
-         stack = self.state_stacks[name]
-         oldvalue = stack.pop()
-         if oldvalue != stack[-1]:
-             self.set_state(name, stack[-1])
-             self.flag_update()
- 
--    cdef void pop_states(self, list names):
-+    cdef int pop_states(self, list names) except -1:
-         cdef str name
-         for name in names:
-             self.pop_state(name)
-@@ -828,13 +833,15 @@ cdef class RenderContext(Canvas):
-         texture.bind()
-         self.flag_update()
- 
--    cdef void enter(self):
-+    cdef int enter(self) except -1:
-         self._shader.use()
-+        return 0
- 
--    cdef void leave(self):
-+    cdef int leave(self) except -1:
-         self._shader.stop()
-+        return 0
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         cdef list keys
-         if PY2:
-             keys = self.state_stacks.keys()
-@@ -857,6 +864,8 @@ cdef class RenderContext(Canvas):
-         popActiveContext()
-         self.flag_update_done()
- 
-+        return 0
-+
-     cdef void reload(self):
-         pushActiveContext(self)
-         reset_gl_context()
-diff --git a/kivy/graphics/shader.pxd b/kivy/graphics/shader.pxd
-index c418207..1058ff4 100644
---- a/kivy/graphics/shader.pxd
-+++ b/kivy/graphics/shader.pxd
-@@ -26,14 +26,14 @@ cdef class Shader:
- 
-     cdef void use(self)
-     cdef void stop(self)
--    cdef void set_uniform(self, str name, value) except *
--    cdef void upload_uniform(self, str name, value) except *
-+    cdef int set_uniform(self, str name, value) except -1
-+    cdef int upload_uniform(self, str name, value) except -1
-     cdef void upload_uniform_matrix(self, int loc, Matrix value)
-     cdef int get_uniform_loc(self, str name) except *
--    cdef void build(self) except *
--    cdef void build_vertex(self, int link=*) except *
--    cdef void build_fragment(self, int link=*) except *
--    cdef void link_program(self) except *
-+    cdef int build(self) except -1
-+    cdef int build_vertex(self, int link=*) except -1
-+    cdef int build_fragment(self, int link=*) except -1
-+    cdef int link_program(self) except -1
-     cdef int is_linked(self)
-     cdef ShaderSource compile_shader(self, str source, int shadertype)
-     cdef get_program_log(self, shader)
-diff --git a/kivy/graphics/shader.pyx b/kivy/graphics/shader.pyx
-index acda2bf..edb1c5a 100644
---- a/kivy/graphics/shader.pyx
-+++ b/kivy/graphics/shader.pyx
-@@ -230,13 +230,14 @@ cdef class Shader:
-         '''
-         glUseProgram(0)
- 
--    cdef void set_uniform(self, str name, value):
-+    cdef int set_uniform(self, str name, value) except -1:
-         if name in self.uniform_values and self.uniform_values[name] == value:
--            return
-+            return 0
-         self.uniform_values[name] = value
-         self.upload_uniform(name, value)
-+        return 0
- 
--    cdef void upload_uniform(self, str name, value):
-+    cdef int upload_uniform(self, str name, value) except -1:
-         '''Pass a uniform variable to the shader.
-         '''
-         cdef long vec_size, index, x, y
-@@ -255,7 +256,7 @@ cdef class Shader:
-         #Logger.debug('Shader: uploading uniform %s (loc=%d, value=%r)' % (name, loc, value))
-         if loc == -1:
-             #Logger.debug('Shader: -> ignored')
--            return
-+            return 0
-         #Logger.debug('Shader: -> (gl:%d) %s' % (glGetError(), str(value)))
- 
-         if val_type is Matrix:
-@@ -414,6 +415,7 @@ cdef class Shader:
-                     free(int_list)
-         else:
-             raise Exception('for <%s>, type not handled <%s>' % (name, val_type))
-+        return 0
- 
-     cdef void upload_uniform_matrix(self, int loc, Matrix value):
-         cdef GLfloat mat[16]
-@@ -421,7 +423,7 @@ cdef class Shader:
-             mat[x] = <GLfloat>value.mat[x]
-         glUniformMatrix4fv(loc, 1, False, mat)
- 
--    cdef int get_uniform_loc(self, str name):
-+    cdef int get_uniform_loc(self, str name) except *:
-         cdef bytes c_name = name.encode('utf-8')
-         cdef int loc = glGetUniformLocation(self.program, c_name)
-         self.uniform_locations[name] = loc
-@@ -462,11 +464,12 @@ cdef class Shader:
-         # save for the next run.
-         self._current_vertex_format = vertex_format
- 
--    cdef void build(self):
-+    cdef int build(self) except -1:
-         self.build_vertex()
-         self.build_fragment()
-+        return 0
- 
--    cdef void build_vertex(self, int link=1):
-+    cdef int build_vertex(self, int link=1) except -1:
-         if self.vertex_shader is not None:
-             glDetachShader(self.program, self.vertex_shader.shader)
-             self.vertex_shader = None
-@@ -475,8 +478,9 @@ cdef class Shader:
-             glAttachShader(self.program, self.vertex_shader.shader)
-         if link:
-             self.link_program()
-+        return 0
- 
--    cdef void build_fragment(self, int link=1):
-+    cdef int build_fragment(self, int link=1) except -1:
-         if self.fragment_shader is not None:
-             glDetachShader(self.program, self.fragment_shader.shader)
-             self.fragment_shader = None
-@@ -486,9 +490,9 @@ cdef class Shader:
-         if link:
-             self.link_program()
- 
--    cdef void link_program(self):
-+    cdef int link_program(self) except -1:
-         if self.vertex_shader is None or self.fragment_shader is None:
--            return
-+            return 0
- 
-         # XXX to ensure that shader is ok, read error state right now.
-         glGetError()
-@@ -503,6 +507,7 @@ cdef class Shader:
-             self._success = 0
-             raise Exception('Shader didnt link, check info log.')
-         self._success = 1
-+        return 0
- 
-     cdef int is_linked(self):
-         cdef GLint result = 0
-diff --git a/kivy/graphics/stencil_instructions.pxd b/kivy/graphics/stencil_instructions.pxd
-index 1cf556e..4d33c44 100644
---- a/kivy/graphics/stencil_instructions.pxd
-+++ b/kivy/graphics/stencil_instructions.pxd
-@@ -1,11 +1,11 @@
- from kivy.graphics.instructions cimport Instruction
- 
- cdef class StencilPush(Instruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1 
- cdef class StencilPop(Instruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- cdef class StencilUse(Instruction):
-     cdef unsigned int _op
--    cdef void apply(self)
-+    cdef int apply(self) except -1
- cdef class StencilUnUse(Instruction):
--    cdef void apply(self)
-+    cdef int apply(self) except -1
-diff --git a/kivy/graphics/stencil_instructions.pyx b/kivy/graphics/stencil_instructions.pyx
-index 469a239..67cc709 100644
---- a/kivy/graphics/stencil_instructions.pyx
-+++ b/kivy/graphics/stencil_instructions.pyx
-@@ -126,7 +126,7 @@ cdef class StencilPush(Instruction):
-     '''Push the stencil stack. See the module documentation for more
-     information.
-     '''
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         global _stencil_level, _stencil_in_push
-         if _stencil_in_push:
-             raise Exception('Cannot use StencilPush inside another '
-@@ -146,11 +146,12 @@ cdef class StencilPush(Instruction):
-         glStencilFunc(GL_ALWAYS, 0, 0)
-         glStencilOp(GL_INCR, GL_INCR, GL_INCR)
-         glColorMask(0, 0, 0, 0)
-+        return 0
- 
- cdef class StencilPop(Instruction):
-     '''Pop the stencil stack. See the module documentation for more information.
-     '''
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         global _stencil_level, _stencil_in_push
-         if _stencil_level == 0:
-             raise Exception('Too much StencilPop (stack underflow)')
-@@ -159,10 +160,11 @@ cdef class StencilPop(Instruction):
-         glColorMask(1, 1, 1, 1)
-         if _stencil_level == 0:
-             glDisable(GL_STENCIL_TEST)
--            return
-+            return 0
-         # reset for previous
-         glStencilFunc(GL_EQUAL, _stencil_level, 0xff)
-         glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP)
-+        return 0
- 
- 
- cdef class StencilUse(Instruction):
-@@ -176,12 +178,13 @@ cdef class StencilUse(Instruction):
-         else:
-             self._op = GL_EQUAL
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         global _stencil_in_push
-         _stencil_in_push = 0
-         glColorMask(1, 1, 1, 1)
-         glStencilFunc(self._op, _stencil_level, 0xff)
-         glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP)
-+        return 0
- 
-     property func_op:
-         '''Determine the stencil operation to use for glStencilFunc(). Can be
-@@ -207,7 +210,8 @@ cdef class StencilUse(Instruction):
- cdef class StencilUnUse(Instruction):
-     '''Use current stencil buffer to unset the mask.
-     '''
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         glStencilFunc(GL_ALWAYS, 0, 0)
-         glStencilOp(GL_DECR, GL_DECR, GL_DECR)
-         glColorMask(0, 0, 0, 0)
-+        return 0
-diff --git a/kivy/graphics/vertex_instructions_line.pxi b/kivy/graphics/vertex_instructions_line.pxi
-index b074a22..0c13132 100644
---- a/kivy/graphics/vertex_instructions_line.pxi
-+++ b/kivy/graphics/vertex_instructions_line.pxi
-@@ -174,10 +174,10 @@ cdef class Line(VertexInstruction):
-             self._stencil_use = StencilUse(op='lequal')
-             self._stencil_unuse = StencilUnUse()
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         if self._width == 1.:
-             VertexInstruction.apply(self)
--            return
-+            return 0
- 
-         cdef double alpha = getActiveContext()['color'][-1]
-         self._use_stencil = alpha < 1
-@@ -195,6 +195,7 @@ cdef class Line(VertexInstruction):
-             self._stencil_pop.apply()
-         else:
-             VertexInstruction.apply(self)
-+        return 0
- 
-     cdef void build_legacy(self):
-         cdef int i
-@@ -1238,9 +1239,9 @@ cdef class SmoothLine(Line):
- 
-         self.build_smooth()
- 
--    cdef void apply(self):
-+    cdef int apply(self) except -1:
-         VertexInstruction.apply(self)
--        return
-+        return 0
- 
-     cdef void build_smooth(self):
-         cdef:
-diff --git a/setup.py b/setup.py
-index 76d7c82..30cc091 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,12 +31,12 @@ def ver_equal(self, other):
- 
- MIN_CYTHON_STRING = '0.20'
- MIN_CYTHON_VERSION = LooseVersion(MIN_CYTHON_STRING)
--MAX_CYTHON_STRING = '0.21.2'
-+MAX_CYTHON_STRING = '0.22'
- MAX_CYTHON_VERSION = LooseVersion(MAX_CYTHON_STRING)
- CYTHON_UNSUPPORTED = (
--    LooseVersion('0.22'),
--    LooseVersion('0.22.beta0'),
--    LooseVersion('0.22.alpha0'),
-+    # LooseVersion('0.22'),
-+    # LooseVersion('0.22.beta0'),
-+    # LooseVersion('0.22.alpha0'),
- )
- 
- 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-12-27 18:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-27 18:52 [gentoo-commits] repo/gentoo:master commit in: dev-python/Kivy/files/, dev-python/Kivy/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2018-01-03  8:31 Slawek Lis
2017-06-06  6:25 Slawek Lis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox