[arch-commits] Commit in python-pygame/repos (8 files)
Ionut Biru
ibiru at archlinux.org
Sun Feb 5 11:54:31 UTC 2012
Date: Sunday, February 5, 2012 @ 06:54:30
Author: ibiru
Revision: 148892
db-move: moved python-pygame from [testing] to [extra] (x86_64)
Added:
python-pygame/repos/extra-x86_64/ChangeLog
(from rev 148654, python-pygame/repos/testing-x86_64/ChangeLog)
python-pygame/repos/extra-x86_64/PKGBUILD
(from rev 148654, python-pygame/repos/testing-x86_64/PKGBUILD)
python-pygame/repos/extra-x86_64/config.patch
(from rev 148654, python-pygame/repos/testing-x86_64/config.patch)
python-pygame/repos/extra-x86_64/pygame-v4l.patch
(from rev 148654, python-pygame/repos/testing-x86_64/pygame-v4l.patch)
Deleted:
python-pygame/repos/extra-x86_64/ChangeLog
python-pygame/repos/extra-x86_64/PKGBUILD
python-pygame/repos/extra-x86_64/config.patch
python-pygame/repos/testing-x86_64/
------------------+
ChangeLog | 64 ++++++++++++++++++++------------------
PKGBUILD | 78 ++++++++++++++++++++++++----------------------
config.patch | 52 +++++++++++++++----------------
pygame-v4l.patch | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 188 insertions(+), 94 deletions(-)
Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2012-02-05 11:54:28 UTC (rev 148891)
+++ extra-x86_64/ChangeLog 2012-02-05 11:54:30 UTC (rev 148892)
@@ -1,30 +0,0 @@
-2010-08-24 Eric Belanger <eric at archlinux.org>
-
- * Rebuilt for python2
-
-2009-08-06 Douglas Soares de Andrade <douglas at archlinux.org>
-
- * Updated to: 1.9.1
-
-2009-08-03 Douglas Soares de Andrade <douglas at archlinux.org>
-
- * Adding the examples folder
-
-2009-08-01 Douglas Soares de Andrade <douglas at archlinux.org>
-
- * Updated for x86_64: 1.9.0
-
-2008-08-06 Eric Belanger <eric at archlinux.org>
-
- * python-pygame 1.8.1-2
- * Fixed file permissions (close FS#11082)
-
-2008-07-31 Douglas Soares de Andrade <douglas at archlinux.org>
-
- * Updated for i686: 1.8.1
-
-2008-03-31 Eric Belanger <eric at archlinux.org>
-
- * python-pygame 1.8.0-1
- * Upstream update
- * Added ChangeLog
Copied: python-pygame/repos/extra-x86_64/ChangeLog (from rev 148654, python-pygame/repos/testing-x86_64/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2012-02-05 11:54:30 UTC (rev 148892)
@@ -0,0 +1,34 @@
+2012-01-24 Angel Velasquez <angvp at archlinux.org>
+
+ * Rebuilt against libpng 1.5
+
+2010-08-24 Eric Belanger <eric at archlinux.org>
+
+ * Rebuilt for python2
+
+2009-08-06 Douglas Soares de Andrade <douglas at archlinux.org>
+
+ * Updated to: 1.9.1
+
+2009-08-03 Douglas Soares de Andrade <douglas at archlinux.org>
+
+ * Adding the examples folder
+
+2009-08-01 Douglas Soares de Andrade <douglas at archlinux.org>
+
+ * Updated for x86_64: 1.9.0
+
+2008-08-06 Eric Belanger <eric at archlinux.org>
+
+ * python-pygame 1.8.1-2
+ * Fixed file permissions (close FS#11082)
+
+2008-07-31 Douglas Soares de Andrade <douglas at archlinux.org>
+
+ * Updated for i686: 1.8.1
+
+2008-03-31 Eric Belanger <eric at archlinux.org>
+
+ * python-pygame 1.8.0-1
+ * Upstream update
+ * Added ChangeLog
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-05 11:54:28 UTC (rev 148891)
+++ extra-x86_64/PKGBUILD 2012-02-05 11:54:30 UTC (rev 148892)
@@ -1,38 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: john(?)
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=python-pygame
-pkgver=1.9.1
-pkgrel=3
-pkgdesc="Python game library"
-arch=('i686' 'x86_64')
-url="http://www.pygame.org/"
-license=('LGPL')
-depends=('python2' 'sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
-replaces=('pygame')
-provides=('pygame')
-changelog=ChangeLog
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch')
-md5sums=('1c4cdc708d17c8250a2d78ef997222fc' 'aaa668f3cd710d8604114501ea6a6f48')
-sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa' '285815e28705d5a2aea53c9d952d35fddf10dd13')
-
-build() {
- cd "${srcdir}/pygame-${pkgver}release"
- patch -Np0 -i "${srcdir}/config.patch"
- python2 config.py -auto
-}
-
-package() {
- cd "${srcdir}/pygame-${pkgver}release"
- python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
- # Copying the examples and tests
- cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
- cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
-
- # Fixing permissions
- chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
-}
Copied: python-pygame/repos/extra-x86_64/PKGBUILD (from rev 148654, python-pygame/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-05 11:54:30 UTC (rev 148892)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: john(?)
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+pkgname=python-pygame
+pkgver=1.9.1
+pkgrel=4
+pkgdesc="Python game library"
+arch=('i686' 'x86_64')
+url="http://www.pygame.org/"
+license=('LGPL')
+depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
+makedepends=('python2' 'portmidi')
+replaces=('pygame')
+provides=('pygame')
+changelog=ChangeLog
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch'
+'pygame-v4l.patch')
+md5sums=('1c4cdc708d17c8250a2d78ef997222fc'
+ 'aaa668f3cd710d8604114501ea6a6f48'
+ '9915b63865c16519e80007909beed876')
+
+build() {
+ cd "${srcdir}/pygame-${pkgver}release"
+ patch -Np0 -i "${srcdir}/config.patch"
+ patch -Np1 -i "${srcdir}/pygame-v4l.patch"
+}
+
+package() {
+ cd "${srcdir}/pygame-${pkgver}release"
+ python2 config.py -auto
+ python2 setup.py install --root="${pkgdir}" --prefix=/usr
+ # Copying the examples and tests
+ cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
+ cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
+ # Fixing permissions
+ chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
+}
Deleted: extra-x86_64/config.patch
===================================================================
--- extra-x86_64/config.patch 2012-02-05 11:54:28 UTC (rev 148891)
+++ extra-x86_64/config.patch 2012-02-05 11:54:30 UTC (rev 148892)
@@ -1,26 +0,0 @@
-Index: config_unix.py
-===================================================================
---- config_unix.py (revision 2567)
-+++ config_unix.py (working copy)
-@@ -174,7 +174,7 @@
-
- for d in DEPS[1:]:
- if not d.found:
-- if not confirm("""
-+ if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
-Index: config_msys.py
-===================================================================
---- config_msys.py (revision 2567)
-+++ config_msys.py (working copy)
-@@ -283,7 +283,7 @@
-
- for d in DEPS[1:]:
- if not d.found:
-- if not confirm("""
-+ if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
Copied: python-pygame/repos/extra-x86_64/config.patch (from rev 148654, python-pygame/repos/testing-x86_64/config.patch)
===================================================================
--- extra-x86_64/config.patch (rev 0)
+++ extra-x86_64/config.patch 2012-02-05 11:54:30 UTC (rev 148892)
@@ -0,0 +1,26 @@
+Index: config_unix.py
+===================================================================
+--- config_unix.py (revision 2567)
++++ config_unix.py (working copy)
+@@ -174,7 +174,7 @@
+
+ for d in DEPS[1:]:
+ if not d.found:
+- if not confirm("""
++ if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
+Index: config_msys.py
+===================================================================
+--- config_msys.py (revision 2567)
++++ config_msys.py (working copy)
+@@ -283,7 +283,7 @@
+
+ for d in DEPS[1:]:
+ if not d.found:
+- if not confirm("""
++ if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
Copied: python-pygame/repos/extra-x86_64/pygame-v4l.patch (from rev 148654, python-pygame/repos/testing-x86_64/pygame-v4l.patch)
===================================================================
--- extra-x86_64/pygame-v4l.patch (rev 0)
+++ extra-x86_64/pygame-v4l.patch 2012-02-05 11:54:30 UTC (rev 148892)
@@ -0,0 +1,88 @@
+diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
+*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009
+--- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011
+***************
+*** 34,40 ****
+ _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)
+ pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+
+ GFX = src/SDL_gfx/SDL_gfxPrimitives.c
+--- 34,40 ----
+ _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 $(SDL) $(DEBUG)
+ pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+
+ GFX = src/SDL_gfx/SDL_gfxPrimitives.c
+diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
+*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009
+--- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011
+***************
+*** 160,179 ****
+ {
+ #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;
+! }
+! }
+ } else {
+ self->camera_type = CAM_V4L2;
+ if (v4l2_init_device(self) == 0) {
+--- 160,167 ----
+ {
+ #if defined(__unix__)
+ if (v4l2_open_device(self) == 0) {
+! v4l2_close_device(self);
+! return NULL;
+ } else {
+ self->camera_type = CAM_V4L2;
+ if (v4l2_init_device(self) == 0) {
+diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
+*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008
+--- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011
+***************
+*** 39,45 ****
+
+ #include <asm/types.h> /* for videodev2.h */
+
+- #include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ #endif
+
+--- 39,44 ----
+***************
+*** 51,57 ****
+ #define RGB_OUT 1
+ #define YUV_OUT 2
+ #define HSV_OUT 4
+- #define CAM_V4L 1
+ #define CAM_V4L2 2
+
+ struct buffer
+--- 50,55 ----
+***************
+*** 111,118 ****
+ 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
+--- 109,112 ----
More information about the arch-commits
mailing list