[arch-commits] Commit in python-pygame/trunk (4 files)

[Eric Bélanger]

    Date: Tuesday, February 10, 2015 @ 06:27:31
  Author: eric
Revision: 231211

upgpkg: python-pygame 1.9.1-9

Add patch to remove debug output (close FS#43746)

Added:
  python-pygame/trunk/pygame-config.patch
  python-pygame/trunk/pygame-joystick.patch
Modified:
  python-pygame/trunk/PKGBUILD
Deleted:
  python-pygame/trunk/config.patch

-----------------------+
 PKGBUILD              |   12 +++++++-----
 config.patch          |   26 --------------------------
 pygame-config.patch   |   26 ++++++++++++++++++++++++++
 pygame-joystick.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-09 23:19:42 UTC (rev 231210)
+++ PKGBUILD	2015-02-10 05:27:31 UTC (rev 231211)
@@ -4,7 +4,7 @@
 pkgbase=python-pygame
 pkgname=python2-pygame
 pkgver=1.9.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Python game library"
 arch=('i686' 'x86_64')
 url="http://www.pygame.org/"
@@ -11,17 +11,19 @@
 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)
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz
+        pygame-config.patch pygame-v4l.patch pygame-joystick.patch)
 sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
           '285815e28705d5a2aea53c9d952d35fddf10dd13'
-          '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
+          '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070'
+          '399ef25b9bdcda7eb35f0147dffcfc4886405c36')
 
 prepare() {
   cd pygame-${pkgver}release
   find . -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
-  patch -p0 -i "${srcdir}/config.patch"
+  patch -p0 -i "${srcdir}/pygame-config.patch"
   patch -p1 -i "${srcdir}/pygame-v4l.patch"
+  patch -p1 -i "${srcdir}/pygame-joystick.patch"
 }
 
 package_python2-pygame() {

Deleted: config.patch
===================================================================
--- config.patch	2015-02-09 23:19:42 UTC (rev 231210)
+++ config.patch	2015-02-10 05:27:31 UTC (rev 231211)
@@ -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?"""):

Added: pygame-config.patch
===================================================================
--- pygame-config.patch	                        (rev 0)
+++ pygame-config.patch	2015-02-10 05:27:31 UTC (rev 231211)
@@ -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?"""):

Added: pygame-joystick.patch
===================================================================
--- pygame-joystick.patch	                        (rev 0)
+++ pygame-joystick.patch	2015-02-10 05:27:31 UTC (rev 231211)
@@ -0,0 +1,43 @@
+diff -Naur pygame-1.9.1release-orig/src/joystick.c pygame-1.9.1release/src/joystick.c
+--- pygame-1.9.1release-orig/src/joystick.c	2015-02-09 23:43:06.683066782 -0500
++++ pygame-1.9.1release/src/joystick.c	2015-02-09 23:54:40.758606974 -0500
+@@ -201,7 +201,6 @@
+     }
+ 
+     value = SDL_JoystickGetAxis (joy, axis);
+-    printf("SDL_JoystickGetAxis value:%d:\n", value);
+ 
+ 
+     return PyFloat_FromDouble (value / 32768.0);
+@@ -241,7 +240,6 @@
+     }
+ 
+     value = SDL_JoystickGetButton (joy, _index);
+-    printf("SDL_JoystickGetButton value:%d:\n", value);
+ 
+     return PyInt_FromLong (value);
+ }
+@@ -277,7 +275,6 @@
+         return RAISE (PyExc_SDLError, "Joystick not initialized");
+     }
+     value = SDL_JoystickNumBalls (joy);
+-    printf("SDL_JoystickNumBalls value:%d:\n", value);
+ 
+     if (_index < 0 || _index >= value) {
+         return RAISE (PyExc_SDLError, "Invalid joystick trackball");
+@@ -300,7 +297,6 @@
+     }
+ 
+     value = SDL_JoystickNumHats (joy);
+-    printf("SDL_JoystickNumHats value:%d:\n", value);
+ 
+     return PyInt_FromLong (value);
+ }
+@@ -327,7 +323,6 @@
+ 
+     px = py = 0;
+     value = SDL_JoystickGetHat (joy, _index);
+-    printf("SDL_JoystickGetHat value:%d:\n", value);
+ 
+     if (value & SDL_HAT_UP) {
+         py = 1;