From 0d18c6dac205aa1001d10a96d670eb4eef2b6f5c Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Fri, 10 Apr 2015 09:56:49 +0300
Subject: [PATCH] rtmpdump: Update to git SHA [a107cef]. Build with
 gnutls-3.4.0, nettle-3.1

---
 mingw-w64-rtmpdump-git/0012-no-sbin.patch     | 26 +++++++++++
 .../0013-no-extra-dll.patch                   |  8 ++++
 mingw-w64-rtmpdump-git/PKGBUILD               | 46 +++++++++++--------
 3 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 mingw-w64-rtmpdump-git/0012-no-sbin.patch
 create mode 100644 mingw-w64-rtmpdump-git/0013-no-extra-dll.patch

diff --git a/mingw-w64-rtmpdump-git/0012-no-sbin.patch b/mingw-w64-rtmpdump-git/0012-no-sbin.patch
new file mode 100644
index 0000000000..3c6cf059e7
--- /dev/null
+++ b/mingw-w64-rtmpdump-git/0012-no-sbin.patch
@@ -0,0 +1,26 @@
+--- rtmpdump/Makefile.orig	2015-04-10 09:39:49.033600000 +0300
++++ rtmpdump/Makefile	2015-04-10 09:42:55.350600000 +0300
+@@ -25,11 +25,9 @@
+ LDFLAGS=-Wall $(XLDFLAGS)
+ 
+ bindir=$(prefix)/bin
+-sbindir=$(prefix)/sbin
+ mandir=$(prefix)/share/man
+ 
+ BINDIR=$(DESTDIR)$(bindir)
+-SBINDIR=$(DESTDIR)$(sbindir)
+ MANDIR=$(DESTDIR)$(mandir)
+ 
+ LIBS_posix=
+@@ -59,9 +57,9 @@
+ $(PROGS): $(LIBRTMP)
+ 
+ install:	$(PROGS)
+-	-mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
++	-mkdir -p $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man8
+ 	cp rtmpdump$(EXT) $(BINDIR)
+-	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
++	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(BINDIR)
+ 	cp rtmpdump.1 $(MANDIR)/man1
+ 	cp rtmpgw.8 $(MANDIR)/man8
+ 	@cd librtmp; $(MAKE) install
diff --git a/mingw-w64-rtmpdump-git/0013-no-extra-dll.patch b/mingw-w64-rtmpdump-git/0013-no-extra-dll.patch
new file mode 100644
index 0000000000..0574bb5638
--- /dev/null
+++ b/mingw-w64-rtmpdump-git/0013-no-extra-dll.patch
@@ -0,0 +1,8 @@
+--- rtmpdump/librtmp/Makefile.orig	2015-04-10 09:42:13.667400000 +0300
++++ rtmpdump/librtmp/Makefile	2015-04-10 09:51:38.129000000 +0300
+@@ -117,5 +117,4 @@
+ install_so:	librtmp$(SO_EXT) install_base
+ 	cp librtmp$(SO_EXT) $(SODIR)
+ 	$(INSTALL_IMPLIB)
+-	cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX)
+ 
diff --git a/mingw-w64-rtmpdump-git/PKGBUILD b/mingw-w64-rtmpdump-git/PKGBUILD
index 814b3a714e..0d6af5610d 100644
--- a/mingw-w64-rtmpdump-git/PKGBUILD
+++ b/mingw-w64-rtmpdump-git/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=rtmpdump
-
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=r494.79459a2
+pkgver=r499.a107cef
 pkgrel=1
 pkgdesc="A tool to download rtmp streams (mingw-w64)"
 arch=('any')
@@ -11,21 +10,29 @@ url="http://rtmpdump.mplayerhq.hu/"
 license=('GPL2' 'LGPL2.1')
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "git")
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-openssl")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "git")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-gmp"
+         "${MINGW_PACKAGE_PREFIX}-gnutls"
+         "${MINGW_PACKAGE_PREFIX}-nettle"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 options=('strip' 'staticlibs')
 source=("$_realname::git+git://git.ffmpeg.org/rtmpdump"
-    0001-mingw.mingw.patch
-    0002-no-fPIC.mingw.patch
-    0003-better-w32-threading.all.patch
-    0004-gnu_printf.all.patch
-    0005-fix-unused-var-warning.all.patch
-    0006-deprecated-gnutls-type.all.patch
-    0007-cast-appropriately-for-nettle.all.patch
-    0008-unused-variable-warning-fix.all.patch
-    0009-correct-cast.all.patch
-    0010-unused-variable-fix.all.patch
-    0011-fix-parallel-install.all.patch)
+        0001-mingw.mingw.patch
+        0002-no-fPIC.mingw.patch
+        0003-better-w32-threading.all.patch
+        0004-gnu_printf.all.patch
+        0005-fix-unused-var-warning.all.patch
+        0006-deprecated-gnutls-type.all.patch
+        0007-cast-appropriately-for-nettle.all.patch
+        0008-unused-variable-warning-fix.all.patch
+        0009-correct-cast.all.patch
+        0010-unused-variable-fix.all.patch
+        0011-fix-parallel-install.all.patch
+        0012-no-sbin.patch
+        0013-no-extra-dll.patch)
 md5sums=('SKIP'
          '7328df954e79584ec823b6c9fa99ae3b'
          '3db9a091da6004a3d3f6e8a19be41ba1'
@@ -37,7 +44,9 @@ md5sums=('SKIP'
          '24789e1365e8331e795faa87a3c4fd3b'
          '3e6dca173d7aee3f520e587e3b6ffbe5'
          '1c60c612bc75cf001f9819e735291c2d'
-         '79cb1025e9c84f1bcda1e0c039dbf849')
+         '79cb1025e9c84f1bcda1e0c039dbf849'
+         '89c27956be34a69ad9e6b8ab75104033'
+         '3aac220f5b416d03808a9bc49ef135f2')
 
 pkgver() {
   cd "$srcdir/$_realname"
@@ -57,6 +66,8 @@ prepare() {
   patch -p1 -i ${srcdir}/0009-correct-cast.all.patch
   patch -p1 -i ${srcdir}/0010-unused-variable-fix.all.patch
   patch -p1 -i ${srcdir}/0011-fix-parallel-install.all.patch
+  patch -p1 -i ${srcdir}/0012-no-sbin.patch
+  patch -p1 -i ${srcdir}/0013-no-extra-dll.patch
 }
 
 build() {
@@ -69,7 +80,4 @@ package() {
     cd "${srcdir}/build-${MINGW_CHOST}"
   mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
   make CC=gcc LD=ld AR=ar SYS=mingw prefix=${MINGW_PREFIX} mandir=${MINGW_PREFIX}/share/man DESTDIR="$pkgdir" install
-
-  mv ${pkgdir}${MINGW_PREFIX}/sbin/* ${pkgdir}${MINGW_PREFIX}/bin/
-  rm -r ${pkgdir}${MINGW_PREFIX}/sbin
 }