1:2.4.r96.fa8646d-3: Switch from openssl to gnutls and removal of the pkgver() function

2 files changed, 10 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7840c1974b4d..6e5f279a1ccc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Mar  7 13:36:28 UTC 2016
+# Sat Apr 29 12:11:27 UTC 2017
 pkgbase = lib32-rtmpdump
 	pkgdesc = Tool to download rtmp streams (lib32)
 	pkgver = 2.4.r96.fa8646d
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = http://rtmpdump.mplayerhq.hu/
 	arch = x86_64
@@ -11,13 +11,13 @@ pkgbase = lib32-rtmpdump
 	license = LGPL2.1
 	makedepends = git
 	depends = lib32-glibc
-	depends = lib32-openssl
+	depends = lib32-gnutls
 	depends = lib32-zlib
 	depends = rtmpdump
 	provides = librtmp.so
 	options = !makeflags
-	source = git://git.ffmpeg.org/rtmpdump#commit=fa8646d
-	sha256sums = SKIP
+	source = git+https://git.ffmpeg.org/rtmpdump#commit=fa8646d
+	md5sums = SKIP
 
 pkgname = lib32-rtmpdump
 
diff --git a/PKGBUILD b/PKGBUILD
index 2bd354f17095..189f63dfc19b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,29 +8,22 @@ pkgname=lib32-rtmpdump
 _pkgname=rtmpdump
 epoch=1
 pkgver=2.4.r96.fa8646d
-pkgrel=2
+pkgrel=3
 pkgdesc='Tool to download rtmp streams (lib32)'
 arch=('x86_64')
 url='http://rtmpdump.mplayerhq.hu/'
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-glibc' 'lib32-openssl' 'lib32-zlib' "${_pkgname}")
+depends=('lib32-glibc' 'lib32-gnutls' 'lib32-zlib' "${_pkgname}")
 makedepends=('git')
 provides=('librtmp.so')
 options=('!makeflags')
 _commit='fa8646d'
-source=("git://git.ffmpeg.org/rtmpdump#commit=${_commit}")
-sha256sums=('SKIP')
-
-pkgver() {
-cd rtmpdump
-_ver_name='2.4'
-_ver_commit='c28f1bab7822de97353849e7787b59e50bbb1428'
-
-echo "${_ver_name}.r$(git rev-list --count ${_ver_commit}..HEAD).${_commit}"
-}
+source=("git+https://git.ffmpeg.org/rtmpdump#commit=${_commit}")
+md5sums=('SKIP')
 
 prepare() {
 cd rtmpdump
+sed -e 's/^CRYPTO=OPENSSL/#CRYPTO=OPENSSL/' -e 's/#CRYPTO=GNUTLS/CRYPTO=GNUTLS/' -i Makefile -i librtmp/Makefile
 sed -i -e 's:gcc:gcc -m32:' Makefile librtmp/Makefile
 sed -i -e 's/host_cpu\=\"\${host\%\%-\*}\"/host_cpu\="i386"/' Makefile librtmp/Makefile
 sed -i -e 's/march\=\"\${march\%\%-\*}\"/march\="i386"/' Makefile librtmp/Makefile