adding better bindings of SFML for python2 and python3 (yes, the version provided by Jonathan De Wachter)

--HG--
rename : pcr/python2-pysfml2/PKGBUILD => pcr/python-sfml2/PKGBUILD
rename : pcr/python2-pysfml2/PKGBUILD => pcr/python2-sfml2/PKGBUILD

6 files changed, 70 insertions, 95 deletions

diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD
new file mode 100644
index 000000000..ac6881d2e
--- /dev/null
+++ b/pcr/python-sfml2/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=python-sfml2
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="A Python 3 binding for SFML 2, written with Cython."
+arch=('i686' 'x86_64')
+url="http://openhelbreath.net/python-sfml2"
+license=('GPL3')
+depends=('sfml' 'python3')
+makedepends=('sfml' 'cython')
+conflicts=('python-sfml2')
+source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz')
+optdepends=('pyqt: To use pysfml with Qt')
+
+build() {
+        cd "$srcdir/pysfml2-$pkgver"
+	    python3 setup.py build
+}
+
+package() {
+	cd "$srcdir/pysfml2-$pkgver"
+	python3 setup.py install --root="${pkgdir}" --prefix=/usr
+
+	# Copying the examples
+    install -d -m755 "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples"
+    cp -R examples/ "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/"
+
+	# Copying the License file
+	install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1')
diff --git a/pcr/python2-pysfml2-git/PKGBUILD b/pcr/python2-pysfml2-git/PKGBUILD
deleted file mode 100644
index 78df1e503..000000000
--- a/pcr/python2-pysfml2-git/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Philippe Huerlimann <phihue@gmail.com>
-# Contributor: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=python2-pysfml2-git
-pkgver=20120812
-pkgrel=3
-pkgdesc="A Python 2 binding for SFML 2, written with Cython."
-arch=('i686' 'x86_64')
-url="http://pysfml2-cython.readthedocs.org/"
-license=('BSD')
-depends=('sfml' 'python2')
-makedepends=('sfml' 'cython2' 'git')
-conflicts=('python2-pysfml2-git')
-_gitroot='https://github.com/bastienleonard/pysfml2-cython.git'
-_gitname='pysfml2-cython'
-
-build() {
-	cd "$srcdir"
-	msg "Connecting to GIT server...."
-
-	if [ -d $_gitname ] ; then
-		cd $_gitname && git pull origin
-		msg "The local files are updated."
-	else
-		git clone $_gitroot $_gitname
-	fi
-
-	msg "GIT checkout done or server timeout"
-	msg "Starting make..."
-
-	rm -rf "$srcdir/$_gitname-build"
-	cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-	cd "$srcdir/$_gitname-build"
-    git checkout rc-compatible
-
-	python2 setup.py build
-}
-
-package() {
-	cd "$srcdir/$_gitname-build"
-	python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
-	# Copying the examples
-	cp -R examples "${pkgdir}/usr/lib/python2.7/site-packages/pysfml"
-
-	# Copying the License file
-	install -D -m644 "$srcdir/$_gitname-build/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	# Fixing permissions
-	chmod 644 "${pkgdir}"/usr/lib/python2.7/site-packages/sfml.so
-}
diff --git a/pcr/python2-pysfml2/PKGBUILD b/pcr/python2-pysfml2/PKGBUILD
deleted file mode 100644
index e4638f4fc..000000000
--- a/pcr/python2-pysfml2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=python2-pysfml2
-pkgver=0.2.1
-pkgrel=2
-pkgdesc="A Python 2 binding for SFML 2, written with Cython."
-arch=('i686' 'x86_64')
-url="http://pysfml2-cython.readthedocs.org/"
-license=('BSD')
-depends=('python2')
-makedepends=('sfml' 'cython2')
-conflicts=('python2-pysfml2' 'python2-pysfml2-git')
-source=('https://github.com/downloads/bastienleonard/pysfml2-cython/pySFML-0.2.1.tar.gz')
-
-build() {
-        cd "$srcdir/pySFML-$pkgver"
-	    python2 setup.py build
-}
-
-package() {
-	cd "$srcdir/pySFML-$pkgver"
-	python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
-	# Copying the examples
-	cp -R examples "${pkgdir}/usr/lib/python2.7/site-packages/pysfml"
-
-	# Copying the License file
-	install -D -m644 "$srcdir/pySFML-$pkgver/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	# Fixing permissions
-	chmod 644 "${pkgdir}"/usr/lib/python2.7/site-packages/sfml.so
-}
-sha256sums=('6cac3a50f67450b8879af0b82afee157bd5682c8bedb3633c7d9efb77628a4c8')
diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD
new file mode 100644
index 000000000..4832f73f4
--- /dev/null
+++ b/pcr/python2-sfml2/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=python2-sfml2
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="A Python 2 binding for SFML 2, written with Cython."
+arch=('i686' 'x86_64')
+url="http://openhelbreath.net/python-sfml2"
+license=('GPL3')
+depends=('sfml' 'python2')
+makedepends=('sfml' 'cython2')
+conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2')
+source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz')
+optdepends=('pyqt-common: To use pysfml with Qt')
+
+build() {
+        cd "$srcdir/pysfml2-$pkgver"
+	    python2 setup.py build
+}
+
+package() {
+	cd "$srcdir/pysfml2-$pkgver"
+	python2 setup.py install --root="${pkgdir}" --prefix=/usr
+
+	# Copying the examples
+    install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples"
+    install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/spacial_music"
+    install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/pyqt4"
+    install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/sound"
+    
+	cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/spacial_music"
+    cp -R examples/pyqt4 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/pyqt4"
+    cp -R examples/sound "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/sound"
+
+	# Copying the License file
+	install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1')
diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD
index f848a58c1..94f89f7e7 100644
--- a/pcr/sfml-git/PKGBUILD
+++ b/pcr/sfml-git/PKGBUILD
@@ -3,15 +3,14 @@
 
 pkgname=sfml-git
 pkgver=20120805
-pkgrel=3
+pkgrel=4
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API.'
 arch=('i686' 'x86_64')
 url='http://www.sfml-dev.org/'
 license=('zlib')
 depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
 makedepends=('git' 'mesa' 'cmake' 'doxygen')
-conflicts=('sfml')
-provides=('sfml')
+conflicts=('sfml' 'sfml-git')
 source=("arial.patch")
 
 _gitroot='https://github.com/LaurentGomila/SFML.git'
diff --git a/pcr/sfml-git/arial.patch b/pcr/sfml-git/arial.patch
deleted file mode 100644
index a9225065b..000000000
--- a/pcr/sfml-git/arial.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SFML-a/src/SFML/Graphics/CMakeLists.txt	2012-08-03 19:41:49.885910580 -0600
-+++ SFML-b/src/SFML/Graphics/CMakeLists.txt	2012-08-03 19:42:53.578898858 -0600
-@@ -4,7 +4,6 @@
- 

- # all source files

- set(SRC

--    ${SRCROOT}/Arial.hpp

-     ${INCROOT}/BlendMode.hpp

-     ${SRCROOT}/Color.cpp

-     ${INCROOT}/Color.hpp