From b90bae2100e56f8102ca10a41e76375122922ec7 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 26 Sep 2016 10:37:31 -0400 Subject: [PATCH] rtmpdump: Update from 2.3 to 2.4 --- packages/rtmpdump/Makefile.patch | 61 ++++++++++++++++++-------------- packages/rtmpdump/build.sh | 7 ++-- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/packages/rtmpdump/Makefile.patch b/packages/rtmpdump/Makefile.patch index 4a9aa4ff1..4963785d3 100644 --- a/packages/rtmpdump/Makefile.patch +++ b/packages/rtmpdump/Makefile.patch @@ -1,19 +1,11 @@ -diff -u -r ../rtmpdump-2.3/librtmp/Makefile ./librtmp/Makefile ---- ../rtmpdump-2.3/librtmp/Makefile 2010-06-30 16:01:28.000000000 -0400 -+++ ./librtmp/Makefile 2016-08-24 09:46:18.124955620 -0400 -@@ -1,11 +1,5 @@ - VERSION=v2.3 +diff -u -r ../rtmpdump-2.4/librtmp/Makefile ./librtmp/Makefile +--- ../rtmpdump-2.4/librtmp/Makefile 2011-07-11 20:24:33.000000000 -0400 ++++ ./librtmp/Makefile 2016-09-26 10:26:17.608653918 -0400 +@@ -1,20 +1,14 @@ + VERSION=v2.4 -prefix=/usr/local - --CC=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld --AR=$(CROSS_COMPILE)ar -- - SYS=posix - CRYPTO=OPENSSL - #CRYPTO=GNUTLS -@@ -44,7 +38,7 @@ incdir=$(prefix)/include/librtmp bindir=$(prefix)/bin libdir=$(prefix)/lib @@ -22,11 +14,31 @@ diff -u -r ../rtmpdump-2.3/librtmp/Makefile ./librtmp/Makefile BINDIR=$(DESTDIR)$(bindir) INCDIR=$(DESTDIR)$(incdir) LIBDIR=$(DESTDIR)$(libdir) -diff -u -r ../rtmpdump-2.3/Makefile ./Makefile ---- ../rtmpdump-2.3/Makefile 2010-06-30 15:58:35.000000000 -0400 -+++ ./Makefile 2016-08-24 09:35:22.150906938 -0400 + MANDIR=$(DESTDIR)$(mandir) + +-CC=$(CROSS_COMPILE)gcc +-LD=$(CROSS_COMPILE)ld +-AR=$(CROSS_COMPILE)ar +- + SYS=posix + CRYPTO=OPENSSL + #CRYPTO=GNUTLS +@@ -67,8 +61,8 @@ + + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 +-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) +-LDFLAGS=$(XLDFLAGS) ++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) ++LDFLAGS+=$(XLDFLAGS) + + + OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o +diff -u -r ../rtmpdump-2.4/Makefile ./Makefile +--- ../rtmpdump-2.4/Makefile 2011-07-11 20:24:33.000000000 -0400 ++++ ./Makefile 2016-09-26 10:27:25.931636266 -0400 @@ -1,10 +1,5 @@ - VERSION=v2.3 + VERSION=v2.4 -prefix=/usr/local - @@ -36,7 +48,7 @@ diff -u -r ../rtmpdump-2.3/Makefile ./Makefile SYS=posix #SYS=mingw -@@ -20,12 +15,12 @@ +@@ -21,8 +16,8 @@ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 @@ -47,17 +59,12 @@ diff -u -r ../rtmpdump-2.3/Makefile ./Makefile bindir=$(prefix)/bin sbindir=$(prefix)/sbin --mandir=$(prefix)/man -+mandir=$(prefix)/share/man - - BINDIR=$(DESTDIR)$(bindir) - SBINDIR=$(DESTDIR)$(sbindir) -@@ -35,7 +30,7 @@ - LIBS_mingw=-lws2_32 -lwinmm -lgdi32 - LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) +@@ -38,7 +33,7 @@ + LIB_RTMP=-Llibrtmp -lrtmp + LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) -THREADLIB_posix=-lpthread +THREADLIB_posix= + THREADLIB_darwin=-lpthread THREADLIB_mingw= THREADLIB=$(THREADLIB_$(SYS)) - SLIBS=$(THREADLIB) $(LIBS) diff --git a/packages/rtmpdump/build.sh b/packages/rtmpdump/build.sh index 37f57a880..6f03fd62a 100644 --- a/packages/rtmpdump/build.sh +++ b/packages/rtmpdump/build.sh @@ -1,8 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://rtmpdump.mplayerhq.hu/ TERMUX_PKG_DESCRIPTION="Small dumper for media content streamed over the RTMP protocol" -TERMUX_PKG_VERSION=2.3 -TERMUX_PKG_SRCURL=https://rtmpdump.mplayerhq.hu/download/rtmpdump-${TERMUX_PKG_VERSION}.tgz +TERMUX_PKG_VERSION=2.4 +TERMUX_PKG_SRCURL=http://dev.gentoo.org/~hwoarang/distfiles/rtmpdump-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=51f54d37907f19bfa00219d57ec6e12d09458bb31360e8cf004883df745f094c TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_FOLDERNAME=rtmpdump-${TERMUX_PKG_VERSION} TERMUX_PKG_DEPENDS="openssl" -TERMUX_PKG_MAINTAINER="Pierre Rudloff " +TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff"