fighting with python2-pysfml and sfml-git

--HG--
rename : pcr/python2-pysfml2-git/PKGBUILD => pcr/python2-pysfml2/PKGBUILD

3 files changed, 44 insertions, 14 deletions

diff --git a/pcr/python2-pysfml2-git/PKGBUILD b/pcr/python2-pysfml2-git/PKGBUILD
index 6bd8e759c..78df1e503 100644
--- a/pcr/python2-pysfml2-git/PKGBUILD
+++ b/pcr/python2-pysfml2-git/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Philippe Huerlimann <phihue@gmail.com>
+# Contributor: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=python2-pysfml2-git
-pkgver=20120804
-pkgrel=1
+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-git' 'python2')
-makedepends=('cython2' 'git')
-source=()
-md5sums=() 
+depends=('sfml' 'python2')
+makedepends=('sfml' 'cython2' 'git')
+conflicts=('python2-pysfml2-git')
 _gitroot='https://github.com/bastienleonard/pysfml2-cython.git'
 _gitname='pysfml2-cython'
 
@@ -28,8 +28,9 @@ build() {
 	msg "Starting make..."
 
 	rm -rf "$srcdir/$_gitname-build"
-	git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+	cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
 	cd "$srcdir/$_gitname-build"
+    git checkout rc-compatible
 
 	python2 setup.py build
 }
diff --git a/pcr/python2-pysfml2/PKGBUILD b/pcr/python2-pysfml2/PKGBUILD
new file mode 100644
index 000000000..e4638f4fc
--- /dev/null
+++ b/pcr/python2-pysfml2/PKGBUILD
@@ -0,0 +1,32 @@
+# 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/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD
index be243d639..f848a58c1 100644
--- a/pcr/sfml-git/PKGBUILD
+++ b/pcr/sfml-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sfml-git
 pkgver=20120805
-pkgrel=1
+pkgrel=3
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API.'
 arch=('i686' 'x86_64')
 url='http://www.sfml-dev.org/'
@@ -16,7 +16,6 @@ source=("arial.patch")
 
 _gitroot='https://github.com/LaurentGomila/SFML.git'
 _gitname='SFML'
-_gitchangeset='191730ac0d639cfdef8fae560cdbc7d7e8c67db1'
 
 build() {
   cd "$srcdir"
@@ -34,12 +33,10 @@ build() {
   msg "Starting make..."
 
   rm -rf "$srcdir/$_gitname-build"
-  cd "$srcdir"
-  git checkout $_gitchangeset >& /dev/null
   #Applying the patch
-  cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/"
-  cd "$srcdir/$_gitname/src/$_gitname/"
-  patch -p3 -i arial.patch
+  # cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/"
+  # cd "$srcdir/$_gitname/src/$_gitname/"
+  # patch -p3 -i arial.patch
 
   cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"