diff options
Diffstat (limited to 'python')
-rw-r--r-- | python/pygame/pygame-v4l.patch | 88 | ||||
-rw-r--r-- | python/pygame/pygame.SlackBuild | 43 | ||||
-rw-r--r-- | python/pygame/pygame.info | 12 | ||||
-rw-r--r-- | python/pygame/slack-desc | 2 |
4 files changed, 37 insertions, 108 deletions
diff --git a/python/pygame/pygame-v4l.patch b/python/pygame/pygame-v4l.patch deleted file mode 100644 index 3b5a2b9d2b..0000000000 --- a/python/pygame/pygame-v4l.patch +++ /dev/null @@ -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 ---- diff --git a/python/pygame/pygame.SlackBuild b/python/pygame/pygame.SlackBuild index e35ca2750d..b02d58b98f 100644 --- a/python/pygame/pygame.SlackBuild +++ b/python/pygame/pygame.SlackBuild @@ -1,13 +1,35 @@ #!/bin/sh +# Slackware build script for pygame + ## Written by hollywoodb (hollywoodb@fastmail.fm) # Modified by the SlackBuilds.org project # Maintained by Bojan Popovic (bocke@slackware-srbija.org), 2014-2017 # Contribution by B.Watson (yalhcru@gmail.com), 11 apr. 2017. +# Copyright 2017 Dimitris Zlatanidis Orestiada, Greece +# +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pygame -VERSION=${VERSION:-1.9.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.9.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -23,8 +45,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SRCVERSION=${VERSION}release - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then @@ -39,19 +59,16 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 -rm -rf $PRGNAM-$SRCVERSION -tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.?z* || exit 1 -cd $PRGNAM-$SRCVERSION || exit 1 +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# A patch borrowed from Arch community repo -patch -p1 < $CWD/pygame-v4l.patch + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Contributed by B.Watson (yalhcru@gmail.com). # Gets rid of the call to remove_old_files() during packaging. @@ -66,7 +83,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a WHATSNEW README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a WHATSNEW readme.rst LGPL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/pygame/pygame.info b/python/pygame/pygame.info index 5b60ed6d22..f4421dbd00 100644 --- a/python/pygame/pygame.info +++ b/python/pygame/pygame.info @@ -1,10 +1,10 @@ PRGNAM="pygame" -VERSION="1.9.1" +VERSION="1.9.3" HOMEPAGE="http://www.pygame.org/" -DOWNLOAD="http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz" -MD5SUM="1c4cdc708d17c8250a2d78ef997222fc" +DOWNLOAD="https://pypi.python.org/packages/61/06/3c25051549c252cc6fde01c8aeae90b96831370884504fe428a623316def/pygame-1.9.3.tar.gz" +MD5SUM="ac744ea6952b68d5f2b6d02a6d8e836c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="smpeg portmidi" -MAINTAINER="Bojan Popovic" -EMAIL="bocke@slackware-srbija.org" +REQUIRES="portmidi" +MAINTAINER="Dimitris Zlatanidis" +EMAIL="d.zlatanidis@gmail.com" diff --git a/python/pygame/slack-desc b/python/pygame/slack-desc index 8118b5938d..f911b71e85 100644 --- a/python/pygame/slack-desc +++ b/python/pygame/slack-desc @@ -16,4 +16,4 @@ pygame: pygame: Pygame is free. Released under the LGPL licence, you can create open pygame: source, free, freeware, shareware, and commercial games with it. pygame: -pygame: +pygame: Homepage: http://www.pygame.org/ |