[arch-commits] Commit in python-pygame/repos (12 files)
Eric Bélanger
eric at archlinux.org
Thu Oct 4 06:29:38 UTC 2012
Date: Thursday, October 4, 2012 @ 02:29:37
Author: eric
Revision: 167958
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
python-pygame/repos/extra-i686/PKGBUILD
(from rev 167957, python-pygame/trunk/PKGBUILD)
python-pygame/repos/extra-i686/config.patch
(from rev 167957, python-pygame/trunk/config.patch)
python-pygame/repos/extra-i686/pygame-v4l.patch
(from rev 167957, python-pygame/trunk/pygame-v4l.patch)
python-pygame/repos/extra-x86_64/PKGBUILD
(from rev 167957, python-pygame/trunk/PKGBUILD)
python-pygame/repos/extra-x86_64/config.patch
(from rev 167957, python-pygame/trunk/config.patch)
python-pygame/repos/extra-x86_64/pygame-v4l.patch
(from rev 167957, python-pygame/trunk/pygame-v4l.patch)
Deleted:
python-pygame/repos/extra-i686/PKGBUILD
python-pygame/repos/extra-i686/config.patch
python-pygame/repos/extra-i686/pygame-v4l.patch
python-pygame/repos/extra-x86_64/PKGBUILD
python-pygame/repos/extra-x86_64/config.patch
python-pygame/repos/extra-x86_64/pygame-v4l.patch
-------------------------------+
extra-i686/PKGBUILD | 77 ++++++++---------
extra-i686/config.patch | 52 +++++------
extra-i686/pygame-v4l.patch | 176 ++++++++++++++++++++--------------------
extra-x86_64/PKGBUILD | 77 ++++++++---------
extra-x86_64/config.patch | 52 +++++------
extra-x86_64/pygame-v4l.patch | 176 ++++++++++++++++++++--------------------
6 files changed, 306 insertions(+), 304 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-04 06:29:20 UTC (rev 167957)
+++ extra-i686/PKGBUILD 2012-10-04 06:29:37 UTC (rev 167958)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=python-pygame
-pkgname=python2-pygame
-pkgver=1.9.1
-pkgrel=6
-pkgdesc="Python game library"
-arch=('i686' 'x86_64')
-url="http://www.pygame.org/"
-license=('LGPL')
-depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
- config.patch pygame-v4l.patch)
-sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
- '285815e28705d5a2aea53c9d952d35fddf10dd13'
- '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
-
-build() {
- cd "${srcdir}/pygame-${pkgver}release"
- patch -Np0 -i "${srcdir}/config.patch"
- patch -Np1 -i "${srcdir}/pygame-v4l.patch"
-}
-
-package_python2-pygame() {
- 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"
-
- find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
-
-# Fixing permissions
- chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
-}
Copied: python-pygame/repos/extra-i686/PKGBUILD (from rev 167957, python-pygame/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-04 06:29:37 UTC (rev 167958)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=python-pygame
+pkgname=python2-pygame
+pkgver=1.9.1
+pkgrel=7
+pkgdesc="Python game library"
+arch=('i686' 'x86_64')
+url="http://www.pygame.org/"
+license=('LGPL')
+depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
+conflicts=('python-pygame')
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
+ config.patch pygame-v4l.patch)
+sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
+ '285815e28705d5a2aea53c9d952d35fddf10dd13'
+ '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
+
+build() {
+ cd "${srcdir}/pygame-${pkgver}release"
+ patch -Np0 -i "${srcdir}/config.patch"
+ patch -Np1 -i "${srcdir}/pygame-v4l.patch"
+}
+
+package_python2-pygame() {
+ 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"
+
+ find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
+
+# Fixing permissions
+ chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
+}
Deleted: extra-i686/config.patch
===================================================================
--- extra-i686/config.patch 2012-10-04 06:29:20 UTC (rev 167957)
+++ extra-i686/config.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -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-i686/config.patch (from rev 167957, python-pygame/trunk/config.patch)
===================================================================
--- extra-i686/config.patch (rev 0)
+++ extra-i686/config.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -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?"""):
Deleted: extra-i686/pygame-v4l.patch
===================================================================
--- extra-i686/pygame-v4l.patch 2012-10-04 06:29:20 UTC (rev 167957)
+++ extra-i686/pygame-v4l.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -1,88 +0,0 @@
-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 ----
Copied: python-pygame/repos/extra-i686/pygame-v4l.patch (from rev 167957, python-pygame/trunk/pygame-v4l.patch)
===================================================================
--- extra-i686/pygame-v4l.patch (rev 0)
+++ extra-i686/pygame-v4l.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -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 ----
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-04 06:29:20 UTC (rev 167957)
+++ extra-x86_64/PKGBUILD 2012-10-04 06:29:37 UTC (rev 167958)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=python-pygame
-pkgname=python2-pygame
-pkgver=1.9.1
-pkgrel=6
-pkgdesc="Python game library"
-arch=('i686' 'x86_64')
-url="http://www.pygame.org/"
-license=('LGPL')
-depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
- config.patch pygame-v4l.patch)
-sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
- '285815e28705d5a2aea53c9d952d35fddf10dd13'
- '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
-
-build() {
- cd "${srcdir}/pygame-${pkgver}release"
- patch -Np0 -i "${srcdir}/config.patch"
- patch -Np1 -i "${srcdir}/pygame-v4l.patch"
-}
-
-package_python2-pygame() {
- 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"
-
- find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
-
-# Fixing permissions
- chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
-}
Copied: python-pygame/repos/extra-x86_64/PKGBUILD (from rev 167957, python-pygame/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-04 06:29:37 UTC (rev 167958)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=python-pygame
+pkgname=python2-pygame
+pkgver=1.9.1
+pkgrel=7
+pkgdesc="Python game library"
+arch=('i686' 'x86_64')
+url="http://www.pygame.org/"
+license=('LGPL')
+depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
+conflicts=('python-pygame')
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
+ config.patch pygame-v4l.patch)
+sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
+ '285815e28705d5a2aea53c9d952d35fddf10dd13'
+ '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
+
+build() {
+ cd "${srcdir}/pygame-${pkgver}release"
+ patch -Np0 -i "${srcdir}/config.patch"
+ patch -Np1 -i "${srcdir}/pygame-v4l.patch"
+}
+
+package_python2-pygame() {
+ 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"
+
+ find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
+
+# Fixing permissions
+ chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
+}
Deleted: extra-x86_64/config.patch
===================================================================
--- extra-x86_64/config.patch 2012-10-04 06:29:20 UTC (rev 167957)
+++ extra-x86_64/config.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -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 167957, python-pygame/trunk/config.patch)
===================================================================
--- extra-x86_64/config.patch (rev 0)
+++ extra-x86_64/config.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -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?"""):
Deleted: extra-x86_64/pygame-v4l.patch
===================================================================
--- extra-x86_64/pygame-v4l.patch 2012-10-04 06:29:20 UTC (rev 167957)
+++ extra-x86_64/pygame-v4l.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -1,88 +0,0 @@
-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 ----
Copied: python-pygame/repos/extra-x86_64/pygame-v4l.patch (from rev 167957, python-pygame/trunk/pygame-v4l.patch)
===================================================================
--- extra-x86_64/pygame-v4l.patch (rev 0)
+++ extra-x86_64/pygame-v4l.patch 2012-10-04 06:29:37 UTC (rev 167958)
@@ -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