[arch-commits] Commit in python-pygame/repos (14 files)

Eric Bélanger eric at archlinux.org
Sun Mar 18 23:45:08 EDT 2012


    Date: Sunday, March 18, 2012 @ 23:45:07
  Author: eric
Revision: 153735

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  python-pygame/repos/extra-i686/PKGBUILD
    (from rev 153734, python-pygame/trunk/PKGBUILD)
  python-pygame/repos/extra-i686/config.patch
    (from rev 153734, python-pygame/trunk/config.patch)
  python-pygame/repos/extra-i686/pygame-v4l.patch
    (from rev 153734, python-pygame/trunk/pygame-v4l.patch)
  python-pygame/repos/extra-x86_64/PKGBUILD
    (from rev 153734, python-pygame/trunk/PKGBUILD)
  python-pygame/repos/extra-x86_64/config.patch
    (from rev 153734, python-pygame/trunk/config.patch)
  python-pygame/repos/extra-x86_64/pygame-v4l.patch
    (from rev 153734, python-pygame/trunk/pygame-v4l.patch)
Deleted:
  python-pygame/repos/extra-i686/ChangeLog
  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/ChangeLog
  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/ChangeLog          |   34 -------
 extra-i686/PKGBUILD           |   77 ++++++++---------
 extra-i686/config.patch       |   52 +++++------
 extra-i686/pygame-v4l.patch   |  176 ++++++++++++++++++++--------------------
 extra-x86_64/ChangeLog        |   34 -------
 extra-x86_64/PKGBUILD         |   77 ++++++++---------
 extra-x86_64/config.patch     |   52 +++++------
 extra-x86_64/pygame-v4l.patch |  176 ++++++++++++++++++++--------------------
 8 files changed, 302 insertions(+), 376 deletions(-)

Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2012-03-19 03:44:40 UTC (rev 153734)
+++ extra-i686/ChangeLog	2012-03-19 03:45:07 UTC (rev 153735)
@@ -1,34 +0,0 @@
-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-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-03-19 03:44:40 UTC (rev 153734)
+++ extra-i686/PKGBUILD	2012-03-19 03:45:07 UTC (rev 153735)
@@ -1,40 +0,0 @@
-# $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/*
-}

Copied: python-pygame/repos/extra-i686/PKGBUILD (from rev 153734, python-pygame/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-03-19 03:45:07 UTC (rev 153735)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=python-pygame
+pkgver=1.9.1
+pkgrel=5
+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() {
+  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-03-19 03:44:40 UTC (rev 153734)
+++ extra-i686/config.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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 153734, python-pygame/trunk/config.patch)
===================================================================
--- extra-i686/config.patch	                        (rev 0)
+++ extra-i686/config.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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-03-19 03:44:40 UTC (rev 153734)
+++ extra-i686/pygame-v4l.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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 153734, python-pygame/trunk/pygame-v4l.patch)
===================================================================
--- extra-i686/pygame-v4l.patch	                        (rev 0)
+++ extra-i686/pygame-v4l.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2012-03-19 03:44:40 UTC (rev 153734)
+++ extra-x86_64/ChangeLog	2012-03-19 03:45:07 UTC (rev 153735)
@@ -1,34 +0,0 @@
-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-03-19 03:44:40 UTC (rev 153734)
+++ extra-x86_64/PKGBUILD	2012-03-19 03:45:07 UTC (rev 153735)
@@ -1,40 +0,0 @@
-# $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/*
-}

Copied: python-pygame/repos/extra-x86_64/PKGBUILD (from rev 153734, python-pygame/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-03-19 03:45:07 UTC (rev 153735)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=python-pygame
+pkgver=1.9.1
+pkgrel=5
+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() {
+  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-03-19 03:44:40 UTC (rev 153734)
+++ extra-x86_64/config.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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 153734, python-pygame/trunk/config.patch)
===================================================================
--- extra-x86_64/config.patch	                        (rev 0)
+++ extra-x86_64/config.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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-03-19 03:44:40 UTC (rev 153734)
+++ extra-x86_64/pygame-v4l.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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 153734, python-pygame/trunk/pygame-v4l.patch)
===================================================================
--- extra-x86_64/pygame-v4l.patch	                        (rev 0)
+++ extra-x86_64/pygame-v4l.patch	2012-03-19 03:45:07 UTC (rev 153735)
@@ -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