aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorponce <matteo.bernardini@sns.it>2010-09-20 20:31:52 -0400
committerRobby Workman <rworkman@slackbuilds.org>2010-09-21 22:09:43 -0500
commit232f73a605fb7944dbbc7f4fcbd541e883436e00 (patch)
tree164c879563268645917b77c19cb149a690c32ec3
parent365a1a2efda6a824f4d1002516a57586646f01fd (diff)
multimedia/rtmpdump: Updated for version 2.3.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--multimedia/rtmpdump/librtmp-makefile.patch12
-rw-r--r--multimedia/rtmpdump/rtmpdump-makefiles.patch48
-rw-r--r--multimedia/rtmpdump/rtmpdump.SlackBuild6
-rw-r--r--multimedia/rtmpdump/rtmpdump.info12
4 files changed, 21 insertions, 57 deletions
diff --git a/multimedia/rtmpdump/librtmp-makefile.patch b/multimedia/rtmpdump/librtmp-makefile.patch
new file mode 100644
index 0000000000000..93955fe8fbc46
--- /dev/null
+++ b/multimedia/rtmpdump/librtmp-makefile.patch
@@ -0,0 +1,12 @@
+diff -Naur rtmpdump-2.3.orig/librtmp/Makefile rtmpdump-2.3/librtmp/Makefile
+--- rtmpdump-2.3.orig/librtmp/Makefile 2010-06-30 22:01:28.000000000 +0200
++++ rtmpdump-2.3/librtmp/Makefile 2010-09-14 04:35:48.967060986 +0200
+@@ -52,7 +52,7 @@
+
+ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
+
+-all: librtmp.a $(SO_LIB)
++all: librtmp.a $(SO_LIB) librtmp.pc
+
+ clean:
+ rm -f *.o *.a *.so *.$(SO_EXT)
diff --git a/multimedia/rtmpdump/rtmpdump-makefiles.patch b/multimedia/rtmpdump/rtmpdump-makefiles.patch
deleted file mode 100644
index a1bdb7761c24b..0000000000000
--- a/multimedia/rtmpdump/rtmpdump-makefiles.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur rtmpdump-2.2e.orig/Makefile rtmpdump-2.2e/Makefile
---- rtmpdump-2.2e.orig/Makefile 2010-05-29 09:42:20.000000000 +0200
-+++ rtmpdump-2.2e/Makefile 2010-06-14 21:22:21.904425447 +0200
-@@ -57,7 +57,7 @@
- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
- cp rtmpdump.1 $(MANDIR)/man1
- cp rtmpgw.8 $(MANDIR)/man8
-- @cd librtmp; $(MAKE) install $(MAKEFLAGS)
-+ @cd librtmp; $(MAKE) install
-
- clean:
- rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
-diff -Naur rtmpdump-2.2e.orig/librtmp/Makefile rtmpdump-2.2e/librtmp/Makefile
---- rtmpdump-2.2e.orig/librtmp/Makefile 2010-05-29 09:42:20.000000000 +0200
-+++ rtmpdump-2.2e/librtmp/Makefile 2010-06-14 21:23:12.932433342 +0200
-@@ -28,7 +28,7 @@
- LIBDIR=$(DESTDIR)$(libdir)
- MANDIR=$(DESTDIR)$(mandir)
-
--all: librtmp.a
-+all: librtmp.a librtmp.so librtmp.pc
-
- clean:
- rm -f *.o *.a
-@@ -36,6 +36,9 @@
- librtmp.a: rtmp.o log.o amf.o hashswf.o parseurl.o
- $(AR) rs $@ $?
-
-+librtmp.so: rtmp.o log.o amf.o hashswf.o parseurl.o
-+ $(CC) -shared -Wl,-soname,librtmp.so.2 -o librtmp.so.2.2 *.o
-+
- log.o: log.c log.h Makefile
- rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile
- amf.o: amf.c amf.h bytes.h log.h Makefile
-@@ -46,9 +49,12 @@
- sed -e "s;@prefix@;$(prefix);" -e "s;@VERSION@;$(VERSION);" \
- -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@
-
--install: librtmp.a librtmp.pc
-+install: librtmp.a librtmp.so librtmp.pc
- -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
- cp amf.h http.h log.h rtmp.h $(INCDIR)
- cp librtmp.a $(LIBDIR)
-+ ln -s librtmp.so.2.2 librtmp.so.2
-+ ln -s librtmp.so.2.2 librtmp.so
-+ cp -a librtmp.s* $(LIBDIR)
- cp librtmp.pc $(LIBDIR)/pkgconfig
- cp librtmp.3 $(MANDIR)/man3
diff --git a/multimedia/rtmpdump/rtmpdump.SlackBuild b/multimedia/rtmpdump/rtmpdump.SlackBuild
index ff7ad468648a2..3872f74ed009e 100644
--- a/multimedia/rtmpdump/rtmpdump.SlackBuild
+++ b/multimedia/rtmpdump/rtmpdump.SlackBuild
@@ -8,7 +8,7 @@
# Modified by SlackBuilds.org
PRGNAM=rtmpdump
-VERSION=${VERSION:-2.2e}
+VERSION=${VERSION:-2.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -45,7 +45,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -55,7 +55,7 @@ find . \
-exec chmod 644 {} \;
# patch makefiles for shared library install
-patch -p1 < $CWD/rtmpdump-makefiles.patch
+patch -p1 < $CWD/librtmp-makefile.patch
XCFLAGS="$SLKCFLAGS" \
make \
diff --git a/multimedia/rtmpdump/rtmpdump.info b/multimedia/rtmpdump/rtmpdump.info
index be3b792f703ff..3d05b54ac43d7 100644
--- a/multimedia/rtmpdump/rtmpdump.info
+++ b/multimedia/rtmpdump/rtmpdump.info
@@ -1,10 +1,10 @@
PRGNAM="rtmpdump"
-VERSION="2.2e"
+VERSION="2.3"
HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-DOWNLOAD="http://rtmpdump.mplayerhq.hu/download/rtmpdump-2.2e.tar.gz"
-MD5SUM="10681c2fe41194a97d508d0e6bbfe74f"
+DOWNLOAD="http://rtmpdump.mplayerhq.hu/download/rtmpdump-2.3.tgz"
+MD5SUM="eb961f31cd55f0acf5aad1a7b900ef59"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="matteo.bernardini {at} sns.it"
-APPROVED="pprkut"
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@sns.it"
+APPROVED="dsomero"