[SCM] rtmpdump/master: Drop 03-Dont-link-explicitly-against-static-library.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Aug 17 10:03:22 UTC 2011


The following commit has been merged in the master branch:
commit cc3becb707ba2b8569b5f5c3651db5a5ba8781dc
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 17 11:58:44 2011 +0200

    Drop 03-Dont-link-explicitly-against-static-library.patch, applied upstream.

diff --git a/debian/patches/03-Dont-link-explicitly-against-static-library.patch b/debian/patches/03-Dont-link-explicitly-against-static-library.patch
deleted file mode 100644
index 1e34ce4..0000000
--- a/debian/patches/03-Dont-link-explicitly-against-static-library.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-------------------------------------------------------------------------
-r544 | hyc | 2010-07-08 12:38:33 +0200 (Thu, 08 Jul 2010) | 2 lines
-
-Don't link explicitly against static library
-
-------------------------------------------------------------------------
---- rtmpdump.orig/Makefile
-+++ rtmpdump/Makefile
-@@ -33,7 +33,7 @@ MANDIR=$(DESTDIR)$(mandir)
- 
- LIBS_posix=
- LIBS_mingw=-lws2_32 -lwinmm -lgdi32
--LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
-+LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
- 
- THREADLIB_posix=-lpthread
- THREADLIB_mingw=
-@@ -47,11 +47,13 @@ EXT_posix=
- EXT_mingw=.exe
- EXT=$(EXT_$(SYS))
- 
--all:	$(LIBRTMP) progs
-+PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck
- 
--progs:	rtmpdump rtmpgw rtmpsrv rtmpsuck
-+all:	$(LIBRTMP) $(PROGS)
- 
--install:	progs
-+$(PROGS): $(LIBRTMP)
-+
-+install:	$(PROGS)
- 	-mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
- 	cp rtmpdump$(EXT) $(BINDIR)
- 	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
-@@ -68,20 +70,17 @@ FORCE:
- $(LIBRTMP): FORCE
- 	@cd librtmp; $(MAKE) all
- 
--# note: $^ is GNU Make's equivalent to BSD $>
--# we use both since either make will ignore the one it doesn't recognize
--
--rtmpdump: rtmpdump.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
-+rtmpdump: rtmpdump.o
-+	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS)
- 
--rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
-+rtmpsrv: rtmpsrv.o thread.o
-+	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
- 
--rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
-+rtmpsuck: rtmpsuck.o thread.o
-+	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
- 
--rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
-+rtmpgw: rtmpgw.o thread.o
-+	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
- 
- rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
- rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile
diff --git a/debian/patches/series b/debian/patches/series
index d166153..cd7024e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_unbreak_makefile.diff
-03-Dont-link-explicitly-against-static-library.patch

-- 
rtmpdump packaging



More information about the pkg-multimedia-commits mailing list