Improve pkgver(). Update url. Cosmetic changes.

3 files changed, 11 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 071d5a20eed2..8a4c926c2c31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = xine-lib-hg
 	pkgdesc = A multimedia playback engine (mercurial version)
-	pkgver = 1.2.10.r14730.91312aae00d0
+	pkgver = 1.2.10.r211.79af5718c10d
 	pkgrel = 1
-	url = https://www.xine-project.org/
+	url = http://xine.sourceforge.net/
 	arch = x86_64
 	license = GPL
 	license = LGPL
@@ -55,7 +55,7 @@ pkgbase = xine-lib-hg
 	source = hg+http://hg.code.sf.net/p/xine/xine-lib-1.2
 	source = 010-xine-lib-hg-gcc10-fix.patch
 	sha256sums = SKIP
-	sha256sums = b5a42d16d83058e6e13adc384bf12d546f3f7072ece48b234ef415ec192a4457
+	sha256sums = 357daf6042d592556b4b23d400d622be4e165dc7d3bce8ce2ab638abf357f2e6
 
 pkgname = xine-lib-hg
 
diff --git a/010-xine-lib-hg-gcc10-fix.patch b/010-xine-lib-hg-gcc10-fix.patch
index 28a3014de445..e6d45f4b1f47 100644
--- a/010-xine-lib-hg-gcc10-fix.patch
+++ b/010-xine-lib-hg-gcc10-fix.patch
@@ -1,6 +1,5 @@
-diff -r 91312aae00d0 src/libreal/real_common.h
---- a/src/libreal/real_common.h	Sat May 09 23:18:35 2020 +0200
-+++ b/src/libreal/real_common.h	Fri May 15 01:25:51 2020 +0000
+--- a/src/libreal/real_common.h
++++ b/src/libreal/real_common.h
 @@ -75,10 +75,10 @@
  			 const char *const codec_name,
  			 const char *const codec_alternate);
diff --git a/PKGBUILD b/PKGBUILD
index 5ccf6157853f..61f4106a6335 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=xine-lib-hg
-pkgver=1.2.10.r14730.91312aae00d0
+pkgver=1.2.10.r211.79af5718c10d
 pkgrel=1
 pkgdesc='A multimedia playback engine (mercurial version)'
 arch=('x86_64')
-url='https://www.xine-project.org/'
+url='http://xine.sourceforge.net/'
 license=('GPL' 'LGPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama' 'libnsl' 'libssh2')
 makedepends=('mercurial'
@@ -36,33 +36,16 @@ conflicts=('xine-lib')
 source=('hg+http://hg.code.sf.net/p/xine/xine-lib-1.2'
         '010-xine-lib-hg-gcc10-fix.patch')
 sha256sums=('SKIP'
-            'b5a42d16d83058e6e13adc384bf12d546f3f7072ece48b234ef415ec192a4457')
+            '357daf6042d592556b4b23d400d622be4e165dc7d3bce8ce2ab638abf357f2e6')
 
 prepare() {
     patch -d xine-lib-1.2 -Np1 -i"${srcdir}/010-xine-lib-hg-gcc10-fix.patch"
 }
 
 pkgver() {
-    local _number
-    local _revision
-    local _hash
-    local _version
-    local _version_major
-    local _version_minor
-    local _version_sub
-    local _version_patch
-    _version_major="$(grep '^XINE_VERSION_MAJOR=' xine-lib-1.2/version.sh | sed 's/.*=//')"
-    _version_minor="$(grep '^XINE_VERSION_MINOR=' xine-lib-1.2/version.sh | sed 's/.*=//')"
-    _version_sub="$(  grep '^XINE_VERSION_SUB='   xine-lib-1.2/version.sh | sed 's/.*=//')"
-    _version_patch="$(grep '^XINE_VERSION_PATCH=' xine-lib-1.2/version.sh | sed 's/.*=//')"
-    _version="$_version_major"
-    for _number in "$_version_minor" "$_version_sub" "$_version_patch"
-    do
-        [ -n "$_number" ] && _version+=".${_number}"
-    done
-    _revision="$(hg -R xine-lib-1.2 identify -n)"
-    _hash="$(hg -R xine-lib-1.2 identify -i)"
-    printf '%s.r%s.%s' "$_version" "${_revision%+}" "${_hash%+}"
+    printf '%s.r%s.%s' "$(hg -R xine-lib-1.2 log -r. --template '{latesttag}')" \
+                       "$(hg -R xine-lib-1.2 log -r. --template '{latesttagdistance}')" \
+                       "$(hg -R xine-lib-1.2 log -r. --template '{node|short}')"
 }
 
 build() {