added pkgver function and small optimizations

2 files changed, 21 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49955612ed21..987a4532d4d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = acestream-proxy-git
-	pkgdesc = AceProxy new version capable of providing multiple streams of the same channel over HTTP (git version)
-	pkgver = 1.0
-	pkgrel = 5
+	pkgdesc = AceStream Proxy new version capable of providing multiple streams of the same channel over HTTP (git version)
+	pkgver = 1.1
+	pkgrel = 1
 	url = https://github.com/pepsik-kiev/HTTPAceProxy.git
 	arch = any
 	license = custom
 	depends = acestream-engine
+	depends = python>3.4
 	depends = python-gevent>=1.3.3
 	depends = python-psutil>=5.3.0
-	optdepends = ffmpeg: for stream transcoding and fine tuning yourself
+	optdepends = ffmpeg: for stream transcoding
 	provides = aceproxy
 	conflicts = aceproxy
 	backup = usr/lib/aceproxy/aceconfig.py
diff --git a/PKGBUILD b/PKGBUILD
index eb9dfa481ed9..55eaf02887f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,30 @@
 # Maintainer: Giusy Margarita <kurmikon at libero dot it>
 
 pkgname=acestream-proxy-git
-pkgver=1.0
-pkgrel=5
-pkgdesc="AceProxy new version capable of providing multiple streams of the same channel over HTTP (git version)"
+pkgver=1.1
+pkgrel=1
+pkgdesc="AceStream Proxy new version capable of providing multiple streams of the same channel over HTTP (git version)"
 arch=("any")
 url="https://github.com/pepsik-kiev/HTTPAceProxy.git"
 license=("custom")
-depends=("acestream-engine" "python-gevent>=1.3.3" "python-psutil>=5.3.0")
-optdepends=('ffmpeg: for stream transcoding and fine tuning yourself')
+depends=("acestream-engine" 
+         "python>3.4"
+         "python-gevent>=1.3.3" 
+         "python-psutil>=5.3.0")
+optdepends=('ffmpeg: for stream transcoding')
 provides=("aceproxy")
 conflicts=("aceproxy")
 backup=("usr/lib/aceproxy/aceconfig.py")
 source=("$pkgname::git+$url")
 md5sums=("SKIP")
 
+pkgver() {
+    cd "$srcdir/$pkgname"
+    
+    # Git, no tags available
+    printf "$pkgver.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 package() {
   mkdir -p "$pkgdir/usr/lib"
   mkdir -p "$pkgdir/usr/bin"
@@ -23,4 +33,5 @@ package() {
   cp -r "$srcdir/$pkgname" "$pkgdir/usr/lib/aceproxy"
 
   ln -s "/usr/lib/aceproxy/acehttp.py" "$pkgdir/usr/bin/aceproxy"
+  ln -s "/usr/lib/aceproxy/acehttp.py" "$pkgdir/usr/bin/acestreamproxy"
 }