Major rewrite

2 files changed, 47 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ccc3aa861e0..b021c907b6bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = srt-git
-	pkgdesc = Secure Reliable Transport (Git version)
-	pkgver = 1.2.0.r103.7607d70
+	pkgdesc = Secure Reliable Transport - transport technology that optimizes streaming performance across unpredictable networks (git version)
+	pkgver = 1.2.3.r0.g1367914
 	pkgrel = 1
-	url = https://github.com/Haivision/srt
+	url = https://www.srtalliance.org/
 	arch = i686
 	arch = x86_64
-	license = LGPL
+	license = MPL
+	makedepends = git
 	makedepends = cmake
-	makedepends = pkgconfig
 	depends = openssl
-	provides = srt=1.2.0.r103.7607d70
-	source = git+https://github.com/Haivision/srt.git
-	md5sums = SKIP
+	provides = srt
+	provides = libsrt.so
+	conflicts = srt
+	source = srt-git::git+https://github.com/Haivision/srt.git
+	sha256sums = SKIP
 
 pkgname = srt-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d9d6b512ba7b..1cb4bfe61cba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,51 @@
-# Maintainer: Justin Kim <justin.kim@collabora.com>
+# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Contributor: Devaux Fabien <fdev31@gmail.com>
 
 pkgname=srt-git
-pkgver=1.2.0.r103.7607d70
+pkgver=1.2.3.r0.g1367914
 pkgrel=1
-pkgdesc='Secure Reliable Transport (Git version)'
+pkgdesc='Secure Reliable Transport - transport technology that optimizes streaming performance across unpredictable networks (git version)'
 arch=('i686' 'x86_64')
-license=('LGPL')
-url='https://github.com/Haivision/srt'
+url='https://www.srtalliance.org/'
+license=('MPL')
 depends=('openssl')
-makedepends=('cmake' 'pkgconfig')
-provides=('srt='$pkgver)
-
-_gitname='srt'
-
-source=('git+https://github.com/Haivision/srt.git')
-md5sums=('SKIP')
+makedepends=('git' 'cmake')
+provides=('srt' 'libsrt.so')
+conflicts=('srt')
+source=("$pkgname"::'git+https://github.com/Haivision/srt.git')
+sha256sums=('SKIP')
 
 pkgver() {
-  cd $_gitname
-  version=$(grep -m1 SRT_VERSION CMakeLists.txt | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
-  hash=$(git log --pretty=format:'%h' -n 1)
-  revision=$(git rev-list --count HEAD)
-  
-  echo $version.r$revision.$hash
+    cd "$pkgname"
+    
+    # git, tags available
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
-  cd $_gitname
-  ./configure \
-    --prefix=/usr 
-  make
+    cd "$pkgname"
+    
+    mkdir -p build
+    cd build
+    
+    cmake \
+        -DCMAKE_COLOR_MAKEFILE:BOOL='ON' \
+        -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+        -DENABLE_CXX11:BOOL='ON' \
+        -DENABLE_LOGGING:BOOL='ON' \
+        -DENABLE_PROFILE:BOOL='OFF' \
+        -DENABLE_SEPARATE_HAICRYPT:BOOL='OFF' \
+        -DENABLE_SHARED:BOOL='ON' \
+        -DENABLE_SUFLIP:BOOL='ON' \
+        -DUSE_GNUTLS:BOOL='OFF' \
+        -Wno-dev \
+        ..
+        
+    make
 }
 
 package() {
-  cd $_gitname
-  make DESTDIR="${pkgdir}" install
+    cd "${pkgname}/build"
+    
+    make DESTDIR="$pkgdir" install
 }