Update to version 2.2.0

2 files changed, 48 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75e426983a0d..d3d8ea4c869b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
-# Generated by mksrcinfo v8
-# Mon Jun  6 07:43:15 UTC 2016
 pkgbase = lib32-libsrtp
 	pkgdesc = Library for SRTP (Secure Realtime Transport Protocol) (32-bit)
-	pkgver = 1.5.4
+	pkgver = 2.2.0
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/cisco/libsrtp
 	arch = x86_64
 	license = BSD
+	checkdepends = procps-ng
+	makedepends = git
 	depends = lib32-glibc
 	depends = libsrtp
 	options = staticlibs
-	source = libsrtp-1.5.4.tar.gz::https://github.com/cisco/libsrtp/archive/v1.5.4.tar.gz
-	sha256sums = 56a7b521c25134f48faff26b0b1e3d4378a14986a2d3d7bc6fefb48987304ff0
+	source = git+https://github.com/cisco/libsrtp#commit=94ac00d5ac6409e3f6409e4a5edfcdbdaa7fdabe
+	sha256sums = SKIP
 
 pkgname = lib32-libsrtp
 
diff --git a/PKGBUILD b/PKGBUILD
index 406a3bfc0903..f873f97b4e2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: orumin <dev@orum.in>
+# Maintainer: Rodrigo Bezerra <rodrigobezerra21 at gmail dot com>
+# Contributor: orumin <dev@orum.in>
 
 _basename=libsrtp
 pkgname="lib32-$_basename"
-pkgver=1.5.4
+pkgver=2.2.0
 pkgrel=1
 epoch=1
 pkgdesc="Library for SRTP (Secure Realtime Transport Protocol) (32-bit)"
@@ -10,31 +11,56 @@ url="https://github.com/cisco/libsrtp"
 arch=('x86_64')
 license=(BSD)
 depends=('lib32-glibc' 'libsrtp')
+makedepends=('git')
+checkdepends=('procps-ng')
 options=('staticlibs')
-source=("$_basename-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha256sums=('56a7b521c25134f48faff26b0b1e3d4378a14986a2d3d7bc6fefb48987304ff0')
+_commit=94ac00d5ac6409e3f6409e4a5edfcdbdaa7fdabe  # tags/v2.2.0
+source=("git+https://github.com/cisco/libsrtp#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+    cd $_basename
+    git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
-  cd $_basename-$pkgver
-  autoreconf -fvi
+    cd $_basename
+
+    # Fixup pkgver: There are tags like v1.5.4 but also "moving" tags like v1 and v1.5
+    git tag | grep -Pv '^v\d+.\d+.\d+$' | xargs git tag -d
+
+    autoreconf -fvi
 }
 
 build() {
-  cd $_basename-$pkgver
+    cd $_basename
+
+    export CC='gcc -m32'
+    export CXX='g++ -m32'
+    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+    ./configure --prefix=/usr \
+        --build=i686-pc-linux-gnu \
+        --libdir=/usr/lib32
 
-  ./configure --prefix=/usr \
-    --build=i686-pc-linux-gnu --libdir=/usr/lib32 
-  make libsrtp.a shared_library
+    make all
+    make shared_library
+}
+
+check() {
+    cd $_basename
+
+    make runtest
 }
 
 package() {
-  cd $_basename-$pkgver
-  make DESTDIR="$pkgdir" install
+    cd $_basename
+
+    make DESTDIR="$pkgdir" install
+
+    install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
+
+    cd "$pkgdir"/usr
 
-  cd "$pkgdir"/usr
-  rm -r include
+    rm -r include
 }