From 37e8511a73cfbb3d596a2a78c9767ffa00466990 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 4 Jun 2017 16:13:30 +0200 Subject: [PATCH] python-pygame: update to 1.9.3 - movie support has been removed and so the smpeg dependency - Python3 support --- .../python-pygame/patches/pygame-config.patch | 26 -------------- srcpkgs/python-pygame/template | 35 +++++++++++-------- srcpkgs/python3-pygame | 1 + 3 files changed, 22 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/python-pygame/patches/pygame-config.patch create mode 120000 srcpkgs/python3-pygame diff --git a/srcpkgs/python-pygame/patches/pygame-config.patch b/srcpkgs/python-pygame/patches/pygame-config.patch deleted file mode 100644 index d6777762298..00000000000 --- a/srcpkgs/python-pygame/patches/pygame-config.patch +++ /dev/null @@ -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?"""): \ No newline at end of file diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python-pygame/template index c1f61d47233..468efba646a 100644 --- a/srcpkgs/python-pygame/template +++ b/srcpkgs/python-pygame/template @@ -1,21 +1,28 @@ # Template file for 'python-pygame' pkgname=python-pygame -version=1.9.1 +version=1.9.3 revision=1 -wrksrc="pygame-${version}release" -build_style=python2-module -short_desc="Collection of python modules for writing games" +wrksrc="pygame-${version}" +build_style=python-module +pycompile_module="pygame" +hostmakedepends="python-setuptools python3-setuptools SDL_mixer-devel + SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel" +makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel + SDL_ttf-devel libjpeg-turbo-devel portmidi-devel" +short_desc="Collection of Python modules for writing games (Python2)" maintainer="Archaeme " license="LGPL-2.1" -homepage="http://www.pygame.org/" -distfiles="http://www.pygame.org/ftp/pygame-${version}release.tar.gz" -checksum="a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433" -hostmakedepends="python-devel smpeg-devel" -makedepends="python-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel smpeg-devel v4l-utils-devel" +homepage="https://www.pygame.org/" +distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz" +checksum=751021819bdc0cbe5cbd51904abb6ff9e9aee5b0e8955af02284d0e77d6c9ec2 -do_configure() { - python2 config.py -auto -} -post_configure() { - sed -i 's/linux\/videodev.h/libv4l1-videodev.h/g' src/camera.h +export PORTMIDI_INC_PORTTIME=1 + +python3-pygame_package() { + pycompile_module="pygame" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vmove usr/include/python3* + } } diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame new file mode 120000 index 00000000000..48ee583d7d4 --- /dev/null +++ b/srcpkgs/python3-pygame @@ -0,0 +1 @@ +python-pygame \ No newline at end of file