upgpkg: mingw-w64-rtmpdump 1:2.4.r96.fa8646d-3

2 files changed, 29 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d544b84ad84..c555a10d78c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 # Generated by mksrcinfo v8
-# Sun Jan 24 15:06:03 UTC 2016
+# Fri Apr 14 09:28:33 UTC 2017
 pkgbase = mingw-w64-rtmpdump
 	pkgdesc = Tool to download rtmp streams (mingw-w64)
 	pkgver = 2.4.r96.fa8646d
-	pkgrel = 1
-	url = http://rtmpdump.mplayerhq.hu/
+	pkgrel = 3
+	url = https://rtmpdump.mplayerhq.hu/
 	arch = any
 	license = GPL2
 	license = LGPL2.1
 	makedepends = mingw-w64-gcc
 	makedepends = git
 	depends = mingw-w64-crt
-	depends = mingw-w64-openssl
+	depends = mingw-w64-gnutls
 	options = !strip
 	options = !buildflags
 	options = !makeflags
 	options = staticlibs
-	source = git://git.ffmpeg.org/rtmpdump#commit=fa8646d
+	source = git+https://git.ffmpeg.org/rtmpdump#commit=fa8646d
 	sha256sums = SKIP
 
 pkgname = mingw-w64-rtmpdump
diff --git a/PKGBUILD b/PKGBUILD
index a2523bff3577..3b1df9896d64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 pkgname=mingw-w64-rtmpdump
 pkgver=2.4.r96.fa8646d
-pkgrel=1
+pkgrel=3
 pkgdesc="Tool to download rtmp streams (mingw-w64)"
 arch=('any')
-url="http://rtmpdump.mplayerhq.hu/"
+url="https://rtmpdump.mplayerhq.hu/"
 license=('GPL2' 'LGPL2.1')
-depends=('mingw-w64-crt' 'mingw-w64-openssl')
+depends=('mingw-w64-crt' 'mingw-w64-gnutls')
 options=('!strip' '!buildflags' '!makeflags' 'staticlibs')
 makedepends=('mingw-w64-gcc' 'git')
 _commit='fa8646d'
-source=("git://git.ffmpeg.org/rtmpdump#commit=${_commit}")
+source=("git+https://git.ffmpeg.org/rtmpdump#commit=${_commit}")
 sha256sums=('SKIP')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -26,8 +26,15 @@ pkgver() {
 build() {
   for _arch in ${_architectures}; do
     cp -r ${srcdir}/rtmpdump ${srcdir}/build-${_arch} && cd ${srcdir}/build-${_arch}
+
+    sed -e 's/^CRYPTO=OPENSSL/#CRYPTO=OPENSSL/' -e 's/#CRYPTO=GNUTLS/CRYPTO=GNUTLS/' -i Makefile -i librtmp/Makefile
+
     unset LDFLAGS CPPFLAGS
-    make CC=${_arch}-gcc LD=${_arch}-ld AR=${_arch}-ar SYS=mingw
+    make \
+      CC=${_arch}-gcc \
+      LD=${_arch}-ld \
+      AR=${_arch}-ar \
+      SYS=mingw
   done
 }
 
@@ -35,13 +42,22 @@ package() {
   for _arch in ${_architectures}; do
     cd ${srcdir}/build-${_arch}
     unset LDFLAGS CPPFLAGS
-    make CC=${_arch}-gcc LD=${_arch}-ld AR=${_arch}-ar SYS=mingw prefix=/usr/${_arch} mandir=/usr/${_arch}/share/man DESTDIR="$pkgdir" install
+    make \
+      CC=${_arch}-gcc \
+      LD=${_arch}-ld \
+      AR=${_arch}-ar \
+      SYS=mingw \
+      prefix=/usr/${_arch} \
+      sbindir=/usr/${_arch}/bin \
+      mandir=/usr/${_arch}/share/man \
+      DESTDIR="$pkgdir" \
+      install
 
+    ${_arch}-strip -s ${pkgdir}/usr/${_arch}/bin/*.exe
     ${_arch}-strip --strip-unneeded ${pkgdir}/usr/${_arch}/bin/*.dll
     ${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/*.a
 
-    rm ${pkgdir}/usr/${_arch}/bin/*.exe
-    rm -r ${pkgdir}/usr/${_arch}/{sbin,share}
+    rm -r ${pkgdir}/usr/${_arch}/share
   done
 }
 # vim: ts=2 sw=2 et: