commit freerdp-git 1.2.0.beta1.android9.r1957.gd277346-1

2 files changed, 16 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9346063af886..e6c6192f2d57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freerdp-git
 	pkgdesc = Free RDP client - git checkout
-	pkgver = 1.2.0.beta1.r1514.gb7e2430
+	pkgver = 1.2.0.beta1.android9.r1957.gd277346
 	pkgrel = 1
 	url = http://www.freerdp.com/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index de467d991b2e..f06995c142c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=freerdp-git
 pkgdesc='Free RDP client - git checkout'
-pkgver=1.2.0.beta1.r1514.gb7e2430
+pkgver=1.2.0.beta1.android9.r1957.gd277346
 pkgrel=1
 depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
          'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv')
@@ -20,12 +20,24 @@ pkgver() {
 	cd freerdp/
 
 	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
-		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
+		printf '%s.r%s.g%s' \
+			"$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \
+			"$(git rev-list --count ${GITTAG}..)" \
+			"$(git log -1 --format='%h')"
 	else
-		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
+		printf '0.r%s.g%s' \
+			"$(git rev-list --count master)" \
+			"$(git log -1 --format='%h')"
 	fi
 }
 
+prepare() {
+	cd freerdp/
+
+	# fix build aginst recent gstreamer
+	git cherry-pick -n bea27fd9
+}
+
 build() {
 	cd freerdp/