add pygame need for older games newest version from pygame

This commit is contained in:
groni
2018-05-10 14:13:10 +02:00
parent 4c2cd1b73b
commit d52b920d79
12 changed files with 518 additions and 2 deletions
@@ -0,0 +1,40 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import get
import os
#WorkDir = "pygame-%srelease" % get.srcVERSION()
docdir = "%s/%s" % (get.docDIR(), get.srcNAME())
pyversion = get.curPYTHON().replace("python", "")
arch = get.ARCH().replace("-", "_")
def fixperms(d):
for root, dirs, files in os.walk(d):
for name in dirs:
shelltools.chmod(os.path.join(root, name), 0755)
for name in files:
shelltools.chmod(os.path.join(root, name), 0644)
def setup():
for d in ["src", "lib", "docs", "examples"]:
fixperms(d)
pythonmodules.run("config.py -auto")
def build():
pythonmodules.compile()
shelltools.copy("lib/pygame_icon.bmp", "build/lib.linux-%s-%s/pygame/" % (arch, pyversion))
def install():
pythonmodules.install()
pisitools.insinto(docdir, "docs", "html")
pisitools.insinto(docdir, "examples")
@@ -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?"""):
@@ -0,0 +1,4 @@
--- pygame-1.9.1release/config_unix.py~ 2009-10-08 14:59:39.000000000 -0500
+++ pygame-1.9.1release/config_unix.py 2009-10-08 15:00:53.000000000 -0500
@@ -23,0 +24 @@
+ return 1
@@ -0,0 +1,61 @@
diff --git a/setup.py b/setup.py
index 45af61f..8ea5de5 100644
--- a/setup.py
+++ b/setup.py
@@ -183,11 +183,11 @@ for f in glob.glob(os.path.join('lib', '*')):
pygame_data_files.append(f)
#tests/fixtures
-add_datafiles(data_files, 'pygame/tests',
- ['test',
- [['fixtures',
- [['xbm_cursors',
- ['*.xbm']]]]]])
+#add_datafiles(data_files, 'pygame/tests',
+# ['test',
+# [['fixtures',
+# [['xbm_cursors',
+# ['*.xbm']]]]]])
#examples
add_datafiles(data_files, 'pygame/examples',
@@ -461,25 +461,25 @@ date_files = [(path, files) for path, files in data_files if files]
PACKAGEDATA = {
"cmdclass": cmdclass,
"packages": ['pygame', 'pygame.gp2x', 'pygame.threads',
- 'pygame.tests',
- 'pygame.tests.test_utils',
- 'pygame.tests.run_tests__tests',
- 'pygame.tests.run_tests__tests.all_ok',
- 'pygame.tests.run_tests__tests.failures1',
- 'pygame.tests.run_tests__tests.incomplete',
- 'pygame.tests.run_tests__tests.infinite_loop',
- 'pygame.tests.run_tests__tests.print_stderr',
- 'pygame.tests.run_tests__tests.print_stdout',
- 'pygame.tests.run_tests__tests.incomplete_todo',
- 'pygame.tests.run_tests__tests.exclude',
- 'pygame.tests.run_tests__tests.timeout',
- 'pygame.tests.run_tests__tests.everything',
+# 'pygame.tests',
+# 'pygame.tests.test_utils',
+# 'pygame.tests.run_tests__tests',
+# 'pygame.tests.run_tests__tests.all_ok',
+# 'pygame.tests.run_tests__tests.failures1',
+# 'pygame.tests.run_tests__tests.incomplete',
+# 'pygame.tests.run_tests__tests.infinite_loop',
+# 'pygame.tests.run_tests__tests.print_stderr',
+# 'pygame.tests.run_tests__tests.print_stdout',
+# 'pygame.tests.run_tests__tests.incomplete_todo',
+# 'pygame.tests.run_tests__tests.exclude',
+# 'pygame.tests.run_tests__tests.timeout',
+# 'pygame.tests.run_tests__tests.everything',
'pygame.docs',
'pygame.examples'],
"package_dir": {'pygame': 'lib',
'pygame.threads': 'lib/threads',
'pygame.gp2x': 'lib/gp2x',
- 'pygame.tests': 'test',
+# 'pygame.tests': 'test',
'pygame.docs': 'docs',
'pygame.examples': 'examples'},
"headers": headers,
@@ -0,0 +1,26 @@
diff --git a/config_unix.py b/config_unix.py
index c888c28..942a750 100644
--- a/config_unix.py
+++ b/config_unix.py
@@ -147,7 +147,7 @@ def main():
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
Dependency('SCRAP', '', 'libX11', ['X11']),
Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
- Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
+ Dependency('PORTTIME', 'porttime.h', 'libportmidi.so', ['portmidi']),
#Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
]
if not DEPS[0].found:
diff --git a/Setup.in b/Setup.in
index 4bb6c1c..c90174f 100644
--- a/Setup.in
+++ b/Setup.in
@@ -16,7 +16,7 @@ PNG = -lpng
JPEG = -ljpeg
SCRAP = -lX11
PORTMIDI = -lportmidi
-PORTTIME = -lporttime
+PORTTIME =
#--EndConfig
#DEBUG = -C-W -C-Wall
@@ -0,0 +1,165 @@
diff --git a/Setup.in b/Setup.in
index c90174f..2ad0252 100644
--- a/Setup.in
+++ b/Setup.in
@@ -34,7 +34,7 @@ _numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
_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
diff --git a/src/_camera.c b/src/_camera.c
index d25cf63..f354fab 100644
--- a/src/_camera.c
+++ b/src/_camera.c
@@ -22,7 +22,7 @@
* Author: Nirav Patel
*
* This module allows for use of v4l2 webcams in pygame. The code is written
- * such that adding support for v4l or vfw cameras should be possible without
+ * such that adding support for vfw cameras should be possible without
* much modification of existing functions. v4l2 functions are kept seperate
* from functions available to pygame users and generic functions like
* colorspace conversion.
@@ -160,20 +160,8 @@ PyObject* camera_start (PyCameraObject* self)
{
#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) {
diff --git a/src/camera.h b/src/camera.h
index 921ad96..f528ad8 100644
--- a/src/camera.h
+++ b/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,7 @@
#define RGB_OUT 1
#define YUV_OUT 2
#define HSV_OUT 4
-#define CAM_V4L 1
+#define CAM_V4L 1 /* deprecated. the incomplete support in pygame was removed */
#define CAM_V4L2 2
struct buffer
@@ -111,8 +110,4 @@ int v4l2_init_device (PyCameraObject* self);
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/src/camera_v4l.c b/src/camera_v4l.c
index 674bfc6..e69de29 100644
--- a/src/camera_v4l.c
+++ b/src/camera_v4l.c
@@ -1,81 +0,0 @@
-/*
- pygame - Python Game Library
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-#if defined(__unix__)
-#include "camera.h"
-
-/*
- * V4L functions
- */
-
-int v4l_open_device (PyCameraObject* self)
-{
- struct stat st;
- struct video_capability cap;
- struct video_mbuf buf;
-
- if (-1 == stat (self->device_name, &st)) {
- PyErr_Format(PyExc_SystemError, "Cannot identify '%s': %d, %s",
- self->device_name, errno, strerror (errno));
- return 0;
- }
-
- if (!S_ISCHR (st.st_mode)) {
- PyErr_Format(PyExc_SystemError, "%s is no device",self->device_name);
- return 0;
- }
-
- self->fd = open (self->device_name, O_RDWR /* required | O_NONBLOCK */, 0);
-
- if (-1 == self->fd) {
- PyErr_Format(PyExc_SystemError, "Cannot open '%s': %d, %s",
- self->device_name, errno, strerror (errno));
- return 0;
- }
-
- if(ioctl(self->fd, VIDIOCGCAP, cap) == -1) {
- PyErr_Format(PyExc_SystemError, "%s is not a V4L device",
- self->device_name);
- return 0;
- }
-
- if(!(cap.type & VID_TYPE_CAPTURE)) {
- PyErr_Format(PyExc_SystemError, "%s is not a video capture device",
- self->device_name);
- return 0;
- }
-
- if( ioctl(self->fd , VIDIOCGMBUF , buf ) == -1 ) {
- PyErr_Format(PyExc_SystemError, "%s does not support streaming i/o",
- self->device_name);
- return 0;
- }
-
- return 1;
-}
-
-int v4l_init_device(PyCameraObject* self)
-{
- return 0;
-}
-
-int v4l_start_capturing(PyCameraObject* self)
-{
- return 0;
-}
-#endif
@@ -0,0 +1,95 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>pygame</Name>
<Homepage>http://www.pygame.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2.1</License>
<IsA>library</IsA>
<Summary>Python game library</Summary>
<Description>Python bindings to sdl and other libs that facilitate game production.</Description>
<Archive sha1sum="1d72ac6262cf956d987f1b6db00606fb71d58b25" type="targz">https://github.com/pygame/pygame/archive/1.9.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>libsdl-devel</Dependency>
<Dependency>sdl-mixer-devel</Dependency>
<Dependency>sdl-ttf-devel</Dependency>
<Dependency>sdl-image-devel</Dependency>
<Dependency>smpeg-devel</Dependency>
<Dependency>python-numpy</Dependency>
<Dependency>portmidi-devel</Dependency>
<Dependency>python-setuptools</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>python-devel</Dependency>
<Dependency>freetype-devel</Dependency>
</BuildDependencies>
<!--<Patches>
<Patch>config.patch</Patch>
<Patch level="1">pygame-1.9.1-config.patch</Patch>
<Patch level="1">pygame-1.9.1-no-test-install.patch</Patch>
<Patch level="1">pygame-1.9.1-porttime.patch</Patch>
<Patch level="1">pygame-remove-v4l.patch</Patch>
</Patches>-->
</Source>
<Package>
<Name>pygame</Name>
<RuntimeDependencies>
<Dependency>libsdl</Dependency>
<Dependency>sdl-mixer</Dependency>
<Dependency>sdl-ttf</Dependency>
<Dependency>sdl-image</Dependency>
<Dependency>smpeg</Dependency>
<Dependency>python-numpy</Dependency>
<Dependency>portmidi</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libpng</Dependency>
<Dependency>python</Dependency>
<Dependency>freetype</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib</Path>
</Files>
</Package>
<Package>
<Name>pygame-doc</Name>
<RuntimeDependencies>
<Dependency release="current">pygame</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2018-05-09</Date>
<Version>1.9.3</Version>
<Comment>Rebuild and version bump</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-11-03</Date>
<Version>1.9.1</Version>
<Comment>Rebuild</Comment>
<Name>Burak Fazıl Ertürk</Name>
<Email>burakerturk@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2011-05-06</Date>
<Version>1.9.1</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,10 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>pygame</Name>
<Summary xml:lang="tr">Python oyun kütüphanesi</Summary>
<Description xml:lang="tr">Özellikle oyun programlamada kullanılan sdl ve benzeri kütüphaneler için python eklentileri</Description>
<Description xml:lang="fr">Liens (bindings) Python pour dsl et autres librairies facilitant la création de jeux.</Description>
<Description xml:lang="es">Acceso con Python a sdl y otras librerías que facilitan produccion de juegos</Description>
</Source>
</PISI>