diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-31 17:05:45 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-31 17:05:45 +0000 |
commit | d568b534d3577af5a7ebb3afe12a40c345689b8f (patch) | |
tree | d9e558cafcea62af615b14a9080583d103f002ab /dev-python/pygame | |
parent | ppc/ppc64 stable wrt #361003 (diff) | |
download | historical-d568b534d3577af5a7ebb3afe12a40c345689b8f.tar.gz historical-d568b534d3577af5a7ebb3afe12a40c345689b8f.tar.bz2 historical-d568b534d3577af5a7ebb3afe12a40c345689b8f.zip |
punt support for v4lv1, see ChangeLog for details
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pygame')
-rw-r--r-- | dev-python/pygame/ChangeLog | 11 | ||||
-rw-r--r-- | dev-python/pygame/Manifest | 16 | ||||
-rw-r--r-- | dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch | 63 | ||||
-rw-r--r-- | dev-python/pygame/pygame-1.9.1-r1.ebuild | 72 | ||||
-rw-r--r-- | dev-python/pygame/pygame-1.9.1.ebuild | 13 |
5 files changed, 165 insertions, 10 deletions
diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog index 0d4de9ad907b..1079014b0fc8 100644 --- a/dev-python/pygame/ChangeLog +++ b/dev-python/pygame/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pygame -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.71 2010/08/10 02:36:10 jer Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.72 2011/03/31 17:05:45 ssuominen Exp $ + +*pygame-1.9.1-r1 (31 Mar 2011) + + 31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> +pygame-1.9.1-r1.ebuild, + +files/pygame-1.9.1-linux-headers-2.6.38.patch: + Fix building with linux-headers-2.6.38 by removing support for V4L v1 wrt #359745 + by Billy DeVincentis and Martijn Schmidt. 10 Aug 2010; Jeroen Roovers <jer@gentoo.org> pygame-1.9.1.ebuild: Remove HPPA workaround (bug #289326). diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest index f8f9939cdd87..be26313daaed 100644 --- a/dev-python/pygame/Manifest +++ b/dev-python/pygame/Manifest @@ -1,5 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX config.patch 1078 RMD160 1796a9a206faeecaeb73d2b5c59ea8cd568d2a52 SHA1 285815e28705d5a2aea53c9d952d35fddf10dd13 SHA256 2192b2a7831cfe30556d4cd30aacbe9fbe93a9376271c18e94e6e44a258d9cd0 +AUX pygame-1.9.1-linux-headers-2.6.38.patch 1774 RMD160 fb52e17fa2f32f57de4f0663fc044d2a63a189b1 SHA1 854127b7067e224c4add0569dd738118be0d1a2a SHA256 01f3f98d5e2a76bc9be4202e45db4272c7c859cfed6b2a542005711fedab8eb8 DIST pygame-1.9.1release.tar.gz 2134254 RMD160 352d74d6cb025e7489e1123a7a25d1695beabafb SHA1 a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa SHA256 a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433 -EBUILD pygame-1.9.1.ebuild 1661 RMD160 8358a2d20ebffe2adcc7681fdd66d2e0e85c8a2c SHA1 91cd35930924ae55270109a5d4fc78790b7c93b5 SHA256 2f05b6ae65bea97e1da1f08691f52d7455b0010a533921426d34b766989bd071 -MISC ChangeLog 9077 RMD160 ff57da4d1eaaeffb183efa6915f5a603d1d8f9b0 SHA1 a5f8d56a88e098bc12cbdfef18cdbfdfa75486f0 SHA256 21f6b010a7eba1cf9a0067b377ade60364be05d00add2f5ab8b04e3a25986a15 +EBUILD pygame-1.9.1-r1.ebuild 1728 RMD160 96b8d306e814e304c4a39c5345df0a7a676894d1 SHA1 efbd301a1d2a1de52898afad29bfc9cf08f4d68a SHA256 1586662961cfbe329811d79593542906b1419c5ad800abd6dd73736e99fb3eb4 +EBUILD pygame-1.9.1.ebuild 1730 RMD160 87a0d85f35182b152b3e2cc06a968bfc8ced68f5 SHA1 2a5828acf82a5504deb5291bcc1df3f3b15f55be SHA256 d5aa7e05b499c97932bfb19d6626996035db9ddef1fed0990508906f02d8f2eb +MISC ChangeLog 9373 RMD160 7d4c1efb9e96257dd155b9b07eb3ee5860d9c4c3 SHA1 d42bb433fb62b398f0510c80b297ca48583aec6f SHA256 97e75169fd70ecc29064a00bc0f3ec6ad4ee7e97a0e5b1a55e715e85b24949b7 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk2UtJoACgkQXkR9YqOcLPH4rwD9HReWj7hIomuW0P52joQVCSvX +exaY6YSC+h/90dIZjCsBAKIA+BNOv28psaUHf2fKhrxR6fww1N0CSBJVPuVIx2Yo +=LJTe +-----END PGP SIGNATURE----- diff --git a/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch b/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch new file mode 100644 index 000000000000..f300c6efe157 --- /dev/null +++ b/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch @@ -0,0 +1,63 @@ +--- Setup.in ++++ Setup.in +@@ -34,7 +34,7 @@ + _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) + movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) + scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) +-_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) ++_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG) + pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) + + GFX = src/SDL_gfx/SDL_gfxPrimitives.c +--- src/_camera.c ++++ src/_camera.c +@@ -160,20 +160,8 @@ + { + #if defined(__unix__) + if (v4l2_open_device(self) == 0) { +- if (v4l_open_device(self) == 0) { +- v4l2_close_device(self); +- return NULL; +- } else { +- self->camera_type = CAM_V4L; +- if (v4l_init_device(self) == 0) { +- v4l2_close_device(self); +- return NULL; +- } +- if (v4l_start_capturing(self) == 0) { +- v4l2_close_device(self); +- return NULL; +- } +- } ++ v4l2_close_device(self); ++ return NULL; + } else { + self->camera_type = CAM_V4L2; + if (v4l2_init_device(self) == 0) { +--- src/camera.h ++++ src/camera.h +@@ -39,7 +39,6 @@ + + #include <asm/types.h> /* for videodev2.h */ + +- #include <linux/videodev.h> + #include <linux/videodev2.h> + #endif + +@@ -51,7 +50,6 @@ + #define RGB_OUT 1 + #define YUV_OUT 2 + #define HSV_OUT 4 +-#define CAM_V4L 1 + #define CAM_V4L2 2 + + struct buffer +@@ -111,8 +109,4 @@ + int v4l2_close_device (PyCameraObject* self); + int v4l2_open_device (PyCameraObject* self); + +-/* internal functions specific to v4l */ +-int v4l_open_device (PyCameraObject* self); +-int v4l_init_device(PyCameraObject* self); +-int v4l_start_capturing(PyCameraObject* self); + #endif diff --git a/dev-python/pygame/pygame-1.9.1-r1.ebuild b/dev-python/pygame/pygame-1.9.1-r1.ebuild new file mode 100644 index 000000000000..02494ff7d29b --- /dev/null +++ b/dev-python/pygame/pygame-1.9.1-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.1-r1.ebuild,v 1.1 2011/03/31 17:05:45 ssuominen Exp $ + +EAPI="2" +SUPPORT_PYTHON_ABIS="1" + +inherit distutils eutils multilib + +DESCRIPTION="python bindings to sdl and other libs that facilitate game production" +HOMEPAGE="http://www.pygame.org/" +SRC_URI="http://www.pygame.org/ftp/pygame-${PV}release.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="doc examples X" + +RDEPEND=">=media-libs/libsdl-1.2.5[X?] + >=media-libs/sdl-ttf-2.0.6 + >=media-libs/sdl-image-1.2.2[png,jpeg] + >=media-libs/sdl-mixer-1.2.4 + dev-python/numpy + >=media-libs/smpeg-0.4.4-r1" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${P}release + +DOCS="WHATSNEW" + +src_prepare() { + distutils_src_prepare + epatch \ + "${FILESDIR}"/config.patch \ + "${FILESDIR}"/${P}-linux-headers-2.6.38.patch +} + +src_configure() { + "$(PYTHON -f)" config.py -auto + sed -i -e 's:X11R6/lib:lib64:g' Setup + use X || sed -i -e 's:scrap :#scrap :' Setup +} + +src_test() { + # Skip tests that depend on DISPLAY being set. Bug #223055. + SKIP_TESTS="display_test image__save_gl_surface_test movie_test" + + local test + for test in ${SKIP_TESTS}; do + einfo "Removing test: ${test}" + rm -fr "${S}/test/${test}.py" + done + + testing() { + PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" run_tests.py + } + python_execute_function testing +} + +src_install() { + distutils_src_install + rm -fr "${D}"usr/lib*/python*/site-packages/pygame/examples + + if use doc; then + dohtml -r docs/* + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r "${S}/examples" + fi +} diff --git a/dev-python/pygame/pygame-1.9.1.ebuild b/dev-python/pygame/pygame-1.9.1.ebuild index 6879f41b89be..30410282b745 100644 --- a/dev-python/pygame/pygame-1.9.1.ebuild +++ b/dev-python/pygame/pygame-1.9.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.1.ebuild,v 1.10 2010/08/10 02:36:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.1.ebuild,v 1.11 2011/03/31 17:05:45 ssuominen Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -14,7 +14,7 @@ SRC_URI="http://www.pygame.org/ftp/pygame-${PV}release.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86 ~x86-fbsd" -IUSE="doc examples X" +IUSE="doc examples kernel_linux X" RDEPEND=">=media-libs/libsdl-1.2.5[X?] >=media-libs/sdl-ttf-2.0.6 @@ -22,15 +22,16 @@ RDEPEND=">=media-libs/libsdl-1.2.5[X?] >=media-libs/sdl-mixer-1.2.4 dev-python/numpy >=media-libs/smpeg-0.4.4-r1" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + kernel_linux? ( <sys-kernel/linux-headers-2.6.38 )" -S="${WORKDIR}/${P}release" +S=${WORKDIR}/${P}release DOCS="WHATSNEW" src_prepare() { distutils_src_prepare - epatch "${FILESDIR}/config.patch" + epatch "${FILESDIR}"/config.patch } src_configure() { |